conson-xp 1.35.0__tar.gz → 1.37.0__tar.gz

{conson_xp-1.35.0 → conson_xp-1.37.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: conson-xp
-Version: 1.35.0
+Version: 1.37.0
 Summary: XP Protocol Communication Tools
 Author-Email: ldvchosal <ldvchosal@github.com>
 License: MIT License

{conson_xp-1.35.0 → conson_xp-1.37.0}/pyproject.toml

@@ -22,7 +22,7 @@ dependencies = [
 ]
 requires-python = ">=3.11"
 readme = "README.md"
-version = "1.35.0"
+version = "1.37.0"
 
 [project.license]
 file = "LICENSE"

{conson_xp-1.35.0 → conson_xp-1.37.0}/src/xp/__init__.py

@@ -3,7 +3,7 @@
 conson-xp package.
 """
 
-__version__ = "1.35.0"
+__version__ = "1.37.0"
 __manufacturer__ = "salchichon"
 __model__ = "xp.cli"
 __serial__ = "2025.09.23.000"

{conson_xp-1.35.0 → conson_xp-1.37.0}/src/xp/cli/commands/conbus/conbus_actiontable_commands.py

@@ -57,7 +57,7 @@ def conbus_download_actiontable(ctx: Context, serial_number: str) -> None:
         Args:
             progress: Progress message string.
         """
-        click.echo(progress)
+        click.echo(progress, nl=False)
 
     def on_finish(result: tuple) -> None:
         """Handle successful completion of action table download.

{conson_xp-1.35.0 → conson_xp-1.37.0}/src/xp/cli/commands/conbus/conbus_autoreport_commands.py

@@ -57,8 +57,11 @@ def get_autoreport_command(ctx: Context, serial_number: str) -> None:
     with service:
         service.on_finish.connect(on_finish)
         service.query_datapoint(
-            serial_number=serial_number, datapoint_type=DataPointType.AUTO_REPORT_STATUS
+            serial_number=serial_number,
+            datapoint_type=DataPointType.AUTO_REPORT_STATUS,
+            timeout_seconds=1.0,
         )
+        service.start_reactor()
 
 
 @conbus_autoreport.command("set", short_help="Set auto report status for a module")
@@ -104,6 +107,6 @@ def set_autoreport_command(ctx: Context, serial_number: str, status: str) -> Non
             serial_number=serial_number,
             datapoint_type=DataPointType.AUTO_REPORT_STATUS,
             data_value=data_value,
-            timeout_seconds=0.5,
+            timeout_seconds=1.0,
         )
         service.start_reactor()

{conson_xp-1.35.0 → conson_xp-1.37.0}/src/xp/cli/commands/conbus/conbus_lightlevel_commands.py

@@ -200,6 +200,7 @@ def xp_lightlevel_get(
         result["output_number"] = output_number
         result["lightlevel_level"] = lightlevel_level
         click.echo(json.dumps(result, indent=2))
+        service.stop_reactor()
 
     with service:
         service.on_finish.connect(on_finish)
@@ -208,3 +209,4 @@ def xp_lightlevel_get(
             datapoint_type=DataPointType.MODULE_LIGHT_LEVEL,
             timeout_seconds=0.5,
         )
+        service.start_reactor()

{conson_xp-1.35.0 → conson_xp-1.37.0}/src/xp/cli/commands/conbus/conbus_linknumber_commands.py

@@ -93,6 +93,7 @@ def get_linknumber_command(ctx: click.Context, serial_number: str) -> None:
         result = service_response.to_dict()
         result["linknumber_value"] = linknumber_value
         click.echo(json.dumps(result, indent=2))
+        service.stop_reactor()
 
     with service:
         service.on_finish.connect(on_finish)
@@ -101,3 +102,4 @@ def get_linknumber_command(ctx: click.Context, serial_number: str) -> None:
             datapoint_type=DataPointType.LINK_NUMBER,
             timeout_seconds=0.5,
         )
+        service.start_reactor()

{conson_xp-1.35.0 → conson_xp-1.37.0}/src/xp/cli/commands/conbus/conbus_modulenumber_commands.py

@@ -95,6 +95,7 @@ def get_modulenumber_command(ctx: click.Context, serial_number: str) -> None:
         result = service_response.to_dict()
         result["modulenumber_value"] = modulenumber_value
         click.echo(json.dumps(result, indent=2))
+        service.stop_reactor()
 
     with service:
         service.on_finish.connect(on_finish)
@@ -103,3 +104,4 @@ def get_modulenumber_command(ctx: click.Context, serial_number: str) -> None:
             datapoint_type=DataPointType.MODULE_NUMBER,
             timeout_seconds=0.5,
         )
+        service.start_reactor()

{conson_xp-1.35.0 → conson_xp-1.37.0}/src/xp/cli/commands/conbus/conbus_output_commands.py

@@ -121,6 +121,7 @@ def xp_output_status(ctx: click.Context, serial_number: str) -> None:
             response: Datapoint response object.
         """
         click.echo(json.dumps(response.to_dict(), indent=2))
+        service.stop_reactor()
 
     with service:
         service.on_finish.connect(on_finish)
@@ -128,6 +129,7 @@ def xp_output_status(ctx: click.Context, serial_number: str) -> None:
             serial_number=serial_number,
             datapoint_type=DataPointType.MODULE_OUTPUT_STATE,
         )
+        service.start_reactor()
 
 
 @conbus_output.command("state")
@@ -156,6 +158,7 @@ def xp_module_state(ctx: click.Context, serial_number: str) -> None:
             response: Datapoint response object.
         """
         click.echo(json.dumps(response.to_dict(), indent=2))
+        service.stop_reactor()
 
     with service:
         service.on_finish.connect(on_finish)
@@ -163,3 +166,4 @@ def xp_module_state(ctx: click.Context, serial_number: str) -> None:
             serial_number=serial_number,
             datapoint_type=DataPointType.MODULE_STATE,
         )
+        service.start_reactor()

{conson_xp-1.35.0 → conson_xp-1.37.0}/src/xp/models/telegram/datapoint_type.py

@@ -30,6 +30,36 @@ class DataPointType(str, Enum):
         SW_TOP_VERSION: Software top version.
         VOLTAGE: Voltage data point.
         AUTO_REPORT_STATUS: Auto report status.
+
+    Sample telegram datapoint request:
+       <S0020044966F02D30FL>
+
+    Sample telegram datapoint reply:
+       <R0020044966F02D00XP24FH>
+       <R0020044966F02D01XP24FG>
+       <R0020044966F02D02XP24_V0.34.03GI>
+       <R0020044966F02D030020044966FB>
+       <R0020044966F02D0406FL>
+       <R0020044966F02D050007FL>
+       <R0020044966F02D0601FO>
+       <R0020044966F02D0707FJ>
+       <R0020044966F02D08MIFF>
+       <R0020044966F02D09OFFBP>
+       <R0020044966F02D1000FI>
+       <R0020044966F02D11xxxx0000FJ>
+       <R0020044966F02D12xxxx0000FK>
+       <R0020044966F02D1500:000[%],01:000[%],02:000[%],03:000[%]HB>
+       <R0020044966F02D1600:000[H],01:000[H],02:000[H],03:000[H]HC>
+       <R0020044966F02D1700:00000[NA],01:00000[NA],02:00000[NA],03:00000[NA]HD>
+       <R0020044966F02D18+28,5§CIM>
+       <R0020044966F02D19??FB>
+       <R0020044966F02D20??FL>
+       <R0020044966F02D21PPFK>
+       <R0020044966F02D22PLLKMDINEM>
+       <R0020044966F02D23AAFI>
+       <R0020044966F02D24AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFP>
+       <R0020044966F02D25AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFO>
+       <R0020044966F02D26??FN>
     """
 
     MODULE_TYPE = "00"  # Module type (XP24, XP33, ..)

{conson_xp-1.35.0 → conson_xp-1.37.0}/src/xp/services/conbus/actiontable/msactiontable_service.py

@@ -182,7 +182,6 @@ class MsActionTableService:
         """
         self.logger.debug(f"Failed: {message}")
         self.on_error.emit(message)
-        self.on_finish.emit(None)
 
     def succeed(
         self,

{conson_xp-1.35.0 → conson_xp-1.37.0}/src/xp/services/conbus/conbus_datapoint_service.py

@@ -165,7 +165,7 @@ class ConbusDatapointService:
         self,
         serial_number: str,
         datapoint_type: DataPointType,
-        timeout_seconds: Optional[float] = None,
+        timeout_seconds: float = 1.0,
     ) -> None:
         """Query a specific datapoint from a module.
 

{conson_xp-1.35.0 → conson_xp-1.37.0}/src/xp/services/protocol/conbus_event_protocol.py

@@ -320,9 +320,13 @@ class ConbusEventProtocol(protocol.Protocol, protocol.ClientFactory):
 
     def stop_reactor(self) -> None:
         """Stop the reactor if it's running."""
-        if self._reactor.running:
-            self.logger.info("Stopping reactor")
-            self._reactor.stop()
+        try:
+            if self._reactor.running:
+                self.logger.info("Stopping reactor")
+                self._reactor.stop()
+        except Exception as e:
+            # Reactor might have already stopped or not been started via run()
+            self.logger.debug(f"Reactor stop failed (likely already stopped): {e}")
 
     def connect(self) -> None:
         """Connect to TCP server.

{conson_xp-1.35.0 → conson_xp-1.37.0}/src/xp/services/term/state_monitor_service.py

@@ -321,7 +321,7 @@ class StateMonitorService:
 
         Args:
             module_state: Module state to update.
-            output_number: Output number (0-3 for XP24).
+            output_number: Output number (0-3 for XP24, 0-2 for XP33 modules).
             output_state: True for ON, False for OFF.
         """
         # Parse existing outputs string "0 1 0 0" → [0, 1, 0, 0]
@@ -340,8 +340,9 @@ class StateMonitorService:
     def _handle_event_telegram(self, event: TelegramReceivedEvent) -> None:
         """Handle event telegram for output state changes.
 
-        Processes XP24 output event telegrams to update module state in real-time.
-        Output events use input_number field with values 80-83 to represent outputs 0-3.
+        Processes XP24 and XP33 output event telegrams to update module state in real-time.
+        - XP24 output events use input_number 80-83 to represent outputs 0-3.
+        - XP33 output events use input_number 0-2 to represent channels 0-2.
 
         Args:
             event: Telegram received event containing event telegram.
@@ -352,17 +353,37 @@ class StateMonitorService:
             self.logger.debug("Failed to parse event telegram")
             return
 
-        # Only process XP24 output events
-        if event_telegram.module_type != ModuleTypeCode.XP24.value:
-            self.logger.debug(
-                f"Ignoring event from module type {event_telegram.module_type}"
-            )
-            return
+        # Determine output number based on module type
+        output_number = None
+
+        if event_telegram.module_type == ModuleTypeCode.XP24.value:
+            # XP24 uses input_number 80-83 for outputs 0-3
+            if 80 <= event_telegram.input_number <= 83:
+                output_number = event_telegram.input_number - 80
+            else:
+                self.logger.debug(
+                    f"Ignoring XP24 input event I{event_telegram.input_number:02d}"
+                )
+                return
 
-        # Validate output number range (80-83 for XP24 outputs 0-3)
-        if not (80 <= event_telegram.input_number <= 83):
+        elif event_telegram.module_type in (
+            ModuleTypeCode.XP33.value,
+            ModuleTypeCode.XP33LR.value,
+            ModuleTypeCode.XP33LED.value,
+        ):
+            # XP33 modules use input_number 0-2 for channels 0-2
+            if 80 <= event_telegram.input_number <= 82:
+                output_number = event_telegram.input_number - 80
+            else:
+                self.logger.debug(
+                    f"Ignoring XP33 input event I{event_telegram.input_number:02d}"
+                )
+                return
+
+        else:
+            # Ignore events from other module types
             self.logger.debug(
-                f"Ignoring input event I{event_telegram.input_number:02d}"
+                f"Ignoring event from module type {event_telegram.module_type}"
             )
             return
 
@@ -374,9 +395,8 @@ class StateMonitorService:
             )
             return
 
-        # Convert input_number to output_number (80→0, 81→1, 82→2, 83→3)
-        output_number = event_telegram.input_number - 80
-        output_state = event_telegram.is_button_press  # M=True, B=False
+        # Determine output state (M=True/ON, B=False/OFF)
+        output_state = event_telegram.is_button_press
 
         # Update output state
         self._update_output_bit(module_state, output_number, output_state)

{conson_xp-1.35.0 → conson_xp-1.37.0}/src/xp/term/widgets/modules_list.py

@@ -111,7 +111,9 @@ class ModulesListWidget(Static):
             # Update existing row
             row_key = self._row_keys[serial_number]
             self.table.update_cell(
-                row_key, "outputs", self._format_outputs(module_state.outputs)
+                row_key,
+                "outputs",
+                Text(self._format_outputs(module_state.outputs), justify="right"),
             )
             self.table.update_cell(
                 row_key,
@@ -144,7 +146,7 @@ class ModulesListWidget(Static):
             Text(str(module_state.link_number), justify="right"),
             module_state.serial_number,
             module_state.module_type,
-            self._format_outputs(module_state.outputs),
+            Text(self._format_outputs(module_state.outputs), justify="right"),
             Text(self._format_report(module_state.auto_report), justify="center"),
             module_state.error_status,
             Text(self._format_last_update(module_state.last_update), justify="center"),

{conson_xp-1.35.0 → conson_xp-1.37.0}/tests/unit/test_services/test_state_monitor_service.py

@@ -84,6 +84,22 @@ class TestStateMonitorService:
                     link_number=5,
                     auto_report_status="NN",
                 ),
+                ConsonModuleConfig(
+                    name="A03",
+                    serial_number="1111111111",
+                    module_type="XP33LR",
+                    module_type_code=30,
+                    link_number=3,
+                    auto_report_status="PP",
+                ),
+                ConsonModuleConfig(
+                    name="A04",
+                    serial_number="2222222222",
+                    module_type="XP33LED",
+                    module_type_code=35,
+                    link_number=4,
+                    auto_report_status="PP",
+                ),
             ]
         )
 
@@ -107,7 +123,7 @@ class TestStateMonitorService:
 
     def test_initialization(self, service):
         """Test service initializes module states from config."""
-        assert len(service.module_states) == 2
+        assert len(service.module_states) == 4
 
         # Check first module (XP24)
         xp24_state = next(m for m in service.module_states if m.name == "A01")
@@ -123,6 +139,20 @@ class TestStateMonitorService:
         assert xp130_state.link_number == 5
         assert xp130_state.auto_report is False
 
+        # Check third module (XP33LR)
+        xp33lr_state = next(m for m in service.module_states if m.name == "A03")
+        assert xp33lr_state.serial_number == "1111111111"
+        assert xp33lr_state.module_type == "XP33LR"
+        assert xp33lr_state.link_number == 3
+        assert xp33lr_state.auto_report is True
+
+        # Check fourth module (XP33LED)
+        xp33led_state = next(m for m in service.module_states if m.name == "A04")
+        assert xp33led_state.serial_number == "2222222222"
+        assert xp33led_state.module_type == "XP33LED"
+        assert xp33led_state.link_number == 4
+        assert xp33led_state.auto_report is True
+
     def test_find_module_by_link_found(self, service):
         """Test _find_module_by_link returns module when found."""
         module = service._find_module_by_link(9)
@@ -362,3 +392,122 @@ class TestStateMonitorService:
 
         # Verify parse_reply_telegram was called
         mock_telegram_service.parse_reply_telegram.assert_called_once()
+
+    def test_handle_event_telegram_xp33lr_channel_on(
+        self, service, mock_telegram_service, mock_protocol
+    ):
+        """Test _handle_event_telegram processes XP33LR channel ON event."""
+        # Mock event telegram for XP33LR L03 channel 0 ON
+        event_telegram = EventTelegram(
+            raw_telegram="<E30L03I80MAE>",
+            checksum="AE",
+            checksum_validated=True,
+            event_telegram_type="E",
+            module_type=30,  # XP33LR
+            link_number=3,
+            input_number=80,  # Channel 0 (I80)
+            event_type=EventType.BUTTON_PRESS,
+        )
+        mock_telegram_service.parse_event_telegram.return_value = event_telegram
+
+        # Setup module initial state
+        module = service._find_module_by_link(3)
+        module.outputs = "0 0 0"
+
+        # Mock signal to verify emission
+        signal_handler = Mock()
+        service.on_module_state_changed.connect(signal_handler)
+
+        # Create event
+        event = self._make_event(mock_protocol, "<E30L03I80MAE>", "E")
+
+        # Process event
+        service._handle_event_telegram(event)
+
+        # Verify output updated
+        assert module.outputs == "1 0 0"
+        assert module.last_update is not None
+        signal_handler.assert_called_once()
+
+    def test_handle_event_telegram_xp33lr_channel_off(
+        self, service, mock_telegram_service, mock_protocol
+    ):
+        """Test _handle_event_telegram processes XP33LR channel OFF event."""
+        # Mock event telegram for XP33LR L03 channel 1 OFF
+        event_telegram = EventTelegram(
+            raw_telegram="<E30L03I81BAE>",
+            checksum="AE",
+            checksum_validated=True,
+            event_telegram_type="E",
+            module_type=30,  # XP33LR
+            link_number=3,
+            input_number=81,  # Channel 1 (I81)
+            event_type=EventType.BUTTON_RELEASE,
+        )
+        mock_telegram_service.parse_event_telegram.return_value = event_telegram
+
+        module = service._find_module_by_link(3)
+        module.outputs = "1 1 1"
+
+        event = self._make_event(mock_protocol, "<E30L03I81BAE>", "E")
+
+        service._handle_event_telegram(event)
+        assert module.outputs == "1 0 1"
+
+    def test_handle_event_telegram_xp33led_channel_on(
+        self, service, mock_telegram_service, mock_protocol
+    ):
+        """Test _handle_event_telegram processes XP33LED channel ON event."""
+        # Mock event telegram for XP33LED L04 channel 2 ON
+        event_telegram = EventTelegram(
+            raw_telegram="<E35L04I82MAE>",
+            checksum="AE",
+            checksum_validated=True,
+            event_telegram_type="E",
+            module_type=35,  # XP33LED
+            link_number=4,
+            input_number=82,  # Channel 2 (I82)
+            event_type=EventType.BUTTON_PRESS,
+        )
+        mock_telegram_service.parse_event_telegram.return_value = event_telegram
+
+        # Setup module initial state
+        module = service._find_module_by_link(4)
+        module.outputs = "0 0 0"
+
+        # Create event
+        event = self._make_event(mock_protocol, "<E35L04I82MAE>", "E")
+
+        # Process event
+        service._handle_event_telegram(event)
+
+        # Verify output updated
+        assert module.outputs == "0 0 1"
+        assert module.last_update is not None
+
+    def test_handle_event_telegram_xp33_ignores_invalid_channel(
+        self, service, mock_telegram_service, mock_protocol
+    ):
+        """Test _handle_event_telegram ignores XP33 events for invalid channels."""
+        # Mock event telegram for XP33LR with invalid channel number
+        event_telegram = EventTelegram(
+            raw_telegram="<E30L03I05MAE>",
+            checksum="AE",
+            checksum_validated=True,
+            event_telegram_type="E",
+            module_type=30,  # XP33LR
+            link_number=3,
+            input_number=5,  # Invalid channel (only 0-2 valid)
+            event_type=EventType.BUTTON_PRESS,
+        )
+        mock_telegram_service.parse_event_telegram.return_value = event_telegram
+
+        module = service._find_module_by_link(3)
+        module.outputs = "0 0 0"
+
+        event = self._make_event(mock_protocol, "<E30L03I05MAE>", "E")
+
+        service._handle_event_telegram(event)
+
+        # Output should not change
+        assert module.outputs == "0 0 0"

{conson_xp-1.35.0 → conson_xp-1.37.0}/tests/unit/test_services/test_xp24_action_table_service.py

@@ -291,7 +291,6 @@ class TestMsActionTableService:
         service.failed("Connection timeout")
 
         mock_error.assert_called_once_with("Connection timeout")
-        mock_finish.assert_called_once_with(None)
 
     def test_start_method_xp24(self, service):
         """Test start method with xp24 module type."""