conson-xp 1.35.0__py3-none-any.whl → 1.36.0__py3-none-any.whl

{conson_xp-1.35.0.dist-info → conson_xp-1.36.0.dist-info}/METADATA

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

{conson_xp-1.35.0.dist-info → conson_xp-1.36.0.dist-info}/RECORD

@@ -1,8 +1,8 @@
-conson_xp-1.35.0.dist-info/METADATA,sha256=-Lw1Rw_5jRvY22Z8moRh9N31dx9EuzV7qQ8oZeW_7Og,11246
-conson_xp-1.35.0.dist-info/WHEEL,sha256=tsUv_t7BDeJeRHaSrczbGeuK-TtDpGsWi_JfpzD255I,90
-conson_xp-1.35.0.dist-info/entry_points.txt,sha256=1OcdIcDM1hz3ljCXgybaPUh1IOFEwkaTgLIW9u9zGeg,50
-conson_xp-1.35.0.dist-info/licenses/LICENSE,sha256=rxj6woMM-r3YCyGq_UHFtbh7kHTAJgrccH6O-33IDE4,1419
-xp/__init__.py,sha256=UiuNf-HRLrftHgahYFnTtw0rkyT8zacWREPahcTjY3Q,181
+conson_xp-1.36.0.dist-info/METADATA,sha256=yAI8M5UPAq9YeW27pMskQLgX_CehBjANMIhDqaEm1JQ,11246
+conson_xp-1.36.0.dist-info/WHEEL,sha256=tsUv_t7BDeJeRHaSrczbGeuK-TtDpGsWi_JfpzD255I,90
+conson_xp-1.36.0.dist-info/entry_points.txt,sha256=1OcdIcDM1hz3ljCXgybaPUh1IOFEwkaTgLIW9u9zGeg,50
+conson_xp-1.36.0.dist-info/licenses/LICENSE,sha256=rxj6woMM-r3YCyGq_UHFtbh7kHTAJgrccH6O-33IDE4,1419
+xp/__init__.py,sha256=5SwVHk5WNEf2f5aDU_P09Qax6p3E4JqdZGNWOOqOQq4,181
 xp/cli/__init__.py,sha256=QjnKB1KaI2aIyKlzrnvCwfbBuUj8HNgwNMvNJVQofbI,81
 xp/cli/__main__.py,sha256=l2iKwMdat5rTGd3JWs-uGksnYYDDffp_Npz05QdKEeU,117
 xp/cli/commands/__init__.py,sha256=noh8fdZAWq-ihJEboP8WugbIgq4LJ3jUWMRA7720xWE,4909
@@ -185,7 +185,7 @@ xp/services/telegram/telegram_service.py,sha256=XrP1CPi0ckxoKBaNwLA6lo-TogWxXgmX
 xp/services/telegram/telegram_version_service.py,sha256=M5HdOTsLdcwo122FP-jW6R740ktLrtKf2TiMDVz23h8,10528
 xp/services/term/__init__.py,sha256=BIeOK042bMR-0l6MA80wdW5VuHlpWOXtRER9IG5ilQA,245
 xp/services/term/protocol_monitor_service.py,sha256=PhEzLNzWf1XieQw94ua-hJu9ccwrAzhdxSZGe4kHghs,9945
-xp/services/term/state_monitor_service.py,sha256=PgwCH8nce1RODV33aJefiX3on-pSGEgP_4FDAoU5Trc,16218
+xp/services/term/state_monitor_service.py,sha256=PYKiPO4Zijc-DApRECTIChnbdsOFT3Ndc1MsBglekts,16961
 xp/term/__init__.py,sha256=Xg2DhBeI3xQJLfc7_BPWI1por-rUXemyer5OtOt9Cus,51
 xp/term/protocol.py,sha256=oLJAExvIaOSpy75A5TaYB_7R9skTTtNtPx8hiJLdy_U,3425
 xp/term/protocol.tcss,sha256=r_KfxrbpycGHLVXqZc6INBBcUJME0hLrAZkF1oqnab4,2126
@@ -193,7 +193,7 @@ xp/term/state.py,sha256=sR7I6t4gJSkO2YS3TwonAnGPR_f43coCk4xKdWETus0,3233
 xp/term/state.tcss,sha256=Njp7fc16cCunLq7hi5RvXjPi4jSCGi5aPDnusb9dq1Y,1401
 xp/term/widgets/__init__.py,sha256=ftWmN_fmjxy2E8Qfm-YSRmzKfgL0KTBCTpgvYWCPbUY,274
 xp/term/widgets/help_menu.py,sha256=w2NjwiC_s16St0rigZ9ef9S0V9Y4v0J5eCVCHAdRKF4,1789
-xp/term/widgets/modules_list.py,sha256=DD0PUnY4gv05hkCVxThWULHg1ZNNY8xr1XFaZrv9kS4,7666
+xp/term/widgets/modules_list.py,sha256=cZlrHhse9onSZGBeJe9tuByWCk-928bsmUBGNeXiF2I,7745
 xp/term/widgets/protocol_log.py,sha256=CJUpckWj7GC1kVqixDadteyGnI4aHyzd4kkH-pSbzno,2600
 xp/term/widgets/status_footer.py,sha256=bxrcqKzJ9V0aPSn_WwraVpJz7NxBUh3yIjA3fwv5nVA,3256
 xp/utils/__init__.py,sha256=_avMF_UOkfR3tNeDIPqQ5odmbq5raKkaq1rZ9Cn1CJs,332
@@ -204,4 +204,4 @@ xp/utils/logging.py,sha256=rZDXwlBrYK8A6MPq5StsMNpgsRowzJXM6fvROPwJdGM,3750
 xp/utils/serialization.py,sha256=RWHHk86feaB4ZP7rjE4qOWK0900yg2joUBDkP76gfOY,4618
 xp/utils/state_machine.py,sha256=Oe2sLwCh9z_vr1tF6X0ZRGTeuckRQAGzmef7xc9CNdc,2413
 xp/utils/time_utils.py,sha256=dEyViDlAG9GWU-J3D_YVa-sGma6yiyyMTgN4h2x3PY4,3781
-conson_xp-1.35.0.dist-info/RECORD,,
+conson_xp-1.36.0.dist-info/RECORD,,

xp/__init__.py

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

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)

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"),