conson-xp 2.0.1__py3-none-any.whl → 2.0.2__py3-none-any.whl

{conson_xp-2.0.1.dist-info → conson_xp-2.0.2.dist-info}/METADATA

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

{conson_xp-2.0.1.dist-info → conson_xp-2.0.2.dist-info}/RECORD

@@ -1,8 +1,8 @@
-conson_xp-2.0.1.dist-info/METADATA,sha256=tjqY8FAUMgkHQOaEMyu0EPYq-T1JRLs5wD7Tqu2lBJA,11319
-conson_xp-2.0.1.dist-info/WHEEL,sha256=tsUv_t7BDeJeRHaSrczbGeuK-TtDpGsWi_JfpzD255I,90
-conson_xp-2.0.1.dist-info/entry_points.txt,sha256=1OcdIcDM1hz3ljCXgybaPUh1IOFEwkaTgLIW9u9zGeg,50
-conson_xp-2.0.1.dist-info/licenses/LICENSE,sha256=rxj6woMM-r3YCyGq_UHFtbh7kHTAJgrccH6O-33IDE4,1419
-xp/__init__.py,sha256=w2LWS-22VYMQH5ujXhsjjaQ9D1sDkzAfiiYv3VkLl9M,181
+conson_xp-2.0.2.dist-info/METADATA,sha256=9UzUpaHd8pegRLDFIPEzaMHr2L3ziBK7QhA2EYqSJ28,11319
+conson_xp-2.0.2.dist-info/WHEEL,sha256=tsUv_t7BDeJeRHaSrczbGeuK-TtDpGsWi_JfpzD255I,90
+conson_xp-2.0.2.dist-info/entry_points.txt,sha256=1OcdIcDM1hz3ljCXgybaPUh1IOFEwkaTgLIW9u9zGeg,50
+conson_xp-2.0.2.dist-info/licenses/LICENSE,sha256=rxj6woMM-r3YCyGq_UHFtbh7kHTAJgrccH6O-33IDE4,1419
+xp/__init__.py,sha256=qQYrRExAxcFFDY2HISDUiyYNIaz1ywu0tBMS6dAtJ9I,181
 xp/cli/__init__.py,sha256=QjnKB1KaI2aIyKlzrnvCwfbBuUj8HNgwNMvNJVQofbI,81
 xp/cli/__main__.py,sha256=l2iKwMdat5rTGd3JWs-uGksnYYDDffp_Npz05QdKEeU,117
 xp/cli/commands/__init__.py,sha256=9TGP3uTxAU-s-kVChvQ-Fn3-HVYj-QpeQ05Is-20HRo,4788
@@ -81,7 +81,7 @@ xp/models/config/__init__.py,sha256=gEZnX9eE3DjFtLtF32riEjJQLypqQRbyPauBI4Cowbs,
 xp/models/config/conson_module_config.py,sha256=t1G0LnNNMnjs3ahhz4-Z_5SlEv2FCrcRq13OmvZ2pvA,3009
 xp/models/homekit/__init__.py,sha256=5HDSOClCu0ArK3IICn3_LDMMLBAzLjBxUUSF73bxSSk,34
 xp/models/homekit/homekit_accessory.py,sha256=ANjDWlFxeNTstl7lKdmf6vMOC0wc005vpiD6awRcptA,1052
-xp/models/homekit/homekit_config.py,sha256=pgZOnocue60LjV8ce46MyJ3mo5CqLix6TmT64qxPOks,3267
+xp/models/homekit/homekit_config.py,sha256=YOhODQpURg_1OU0i-4qMglU4E37feNKKtY1uuZRXSoY,3759
 xp/models/log_entry.py,sha256=tAiNwouCP2d4jKiHJY9a-2iAi8LWTpG-TZsOPDIstlA,4423
 xp/models/protocol/__init__.py,sha256=TJ_CJKchA-xgQiv5vCo_ndBBZjrcaTmjT74bR0T-5Cw,38
 xp/models/protocol/conbus_protocol.py,sha256=gFaXK1VY74aVQhMH69Dr-dTDbDuQDQGs8vKmXqK_te8,9318
@@ -112,7 +112,7 @@ xp/models/term/telegram_display.py,sha256=tXWeEtoIBSnScjha3ZHV9UPICmtBF2bkoLVIjQ
 xp/models/write_config_type.py,sha256=IqgguaHgKvz4Qt-WaSVu3J2VaXgtS-br9Yp8q_xkIkY,895
 xp/services/__init__.py,sha256=W9YZyrkh7vm--ZHhAXNQiOYQs5yhhmUHXP5I0Lf1XBg,782
 xp/services/actiontable/__init__.py,sha256=z6js4EuJ6xKHaseTEhuEvKo1tr9K1XyQiruReJtBiPY,26
-xp/services/actiontable/actiontable_serializer.py,sha256=AZpqxfq8-o7FGGtseW52MS6z647x3Ucc1RjR3GLUb20,8335
+xp/services/actiontable/actiontable_serializer.py,sha256=GTpC9_bOdxqQl7cVhpEH9aGusZNRn5WcahwPc2XUWaY,8393
 xp/services/actiontable/download_state_machine.py,sha256=lqNYN9LGGK2KiVUsmvyRfryWRB4-NOfsp7-9GrFubK4,9978
 xp/services/actiontable/msactiontable_serializer.py,sha256=RRL6TZ1gpSQw81kAiw2BV3jTqm4fCJC0pWIcO26Cmos,174
 xp/services/actiontable/msactiontable_xp20_serializer.py,sha256=5K6FxgbV2F4brumNaOH6M8qPyCxIfaqCGOPIYDmFdnk,6998
@@ -124,7 +124,7 @@ xp/services/conbus/actiontable/__init__.py,sha256=oD6vRk_Ye-eZ9s_hldAgtRJFu4mfAn
 xp/services/conbus/actiontable/actiontable_download_service.py,sha256=41Hr1753IBpUeHQqO57uS7qxOB0rJt8qCpznzKlUPOM,15028
 xp/services/conbus/actiontable/actiontable_list_service.py,sha256=oTDSpBkp-MJeaF5bhRnwkSy3na55xqQ4e2ykJzbMCUo,3236
 xp/services/conbus/actiontable/actiontable_show_service.py,sha256=WISY2VsmSlceGa5_9lpFO-gs5TnTjv6YidQksUjCapk,3058
-xp/services/conbus/actiontable/actiontable_upload_service.py,sha256=FaQzOSg8s2zUL5xz9qZY9fvzrdDosc3CoxkVDvNg2SU,13252
+xp/services/conbus/actiontable/actiontable_upload_service.py,sha256=bIAN3Ca3BHTPtZYfPijAgsWP91k-uNFAW7-i-LoTE4I,13553
 xp/services/conbus/conbus_blink_all_service.py,sha256=toDIZDXBGBYnEishcdnJrVzkmfPi7g5nCDXuyA_wFCs,8536
 xp/services/conbus/conbus_blink_service.py,sha256=ggLuzeq_UsgCoxRxg2bsNs9p8Lw_shjsj-niRzb5dKk,7953
 xp/services/conbus/conbus_custom_service.py,sha256=9OIRC2CG_rN96vbv_EZXf7BrX_abhqi5MZx0Se8fEhU,7826
@@ -167,11 +167,11 @@ xp/services/telegram/telegram_service.py,sha256=jPu0Xrh3IpvqPLyuQT5Vf8HHw00vBing
 xp/services/telegram/telegram_version_service.py,sha256=oXnZ_K7OQ7xD-GEj3zDYp52KlkqVuHpO4bf7gMlC_w4,10574
 xp/services/term/__init__.py,sha256=BIeOK042bMR-0l6MA80wdW5VuHlpWOXtRER9IG5ilQA,245
 xp/services/term/homekit_accessory_driver.py,sha256=jHhHHOOvzdDjuYys1cUZHcH2uwZy_Y6o5aGAQqXGAVg,5935
-xp/services/term/homekit_service.py,sha256=h1wAguhUG9f8cdolFKsp-V-iZV5x52Wm0L7syKoK6Qs,25183
+xp/services/term/homekit_service.py,sha256=8aEsmC-EwKTxf0Hxp0aFBdo4doUvhVHeVwfuuc1ttWw,28925
 xp/services/term/protocol_monitor_service.py,sha256=5YBI0Nu7B7gMhaTbUhL6k9LSRfnCIj6CwrCYHiMHavA,10067
 xp/services/term/state_monitor_service.py,sha256=EK9tNBfamAIV0z0EMsXDYWC-rXv6l6k_bHsC8xyEFSo,17116
 xp/term/__init__.py,sha256=Xg2DhBeI3xQJLfc7_BPWI1por-rUXemyer5OtOt9Cus,51
-xp/term/homekit.py,sha256=A9l9zK6KSBx_Cc8I_AZhAWdQjZYnTGLxkln6CzFn3-Q,8935
+xp/term/homekit.py,sha256=HJH3dZQsdp5rqcuV4EWJbytk7glCyDmj27614nRbIyI,9909
 xp/term/homekit.tcss,sha256=A1f5-V3mvxAMZK_ERq8lLjNcOWH0U5tblIBbeL3OYYM,1382
 xp/term/protocol.py,sha256=6MX3mduLei-AgLGaIe8lfOSu4Hi0y3KGePFFM2ssstc,3475
 xp/term/protocol.tcss,sha256=r_KfxrbpycGHLVXqZc6INBBcUJME0hLrAZkF1oqnab4,2126
@@ -191,4 +191,4 @@ xp/utils/logging.py,sha256=wJ1d-yg97NiZUrt2F8iDMcmnHVwC-PErcI-7dpyiRDc,3777
 xp/utils/serialization.py,sha256=TS1OwpTOemSvXsCGw3js4JkYYFEqkzrPe8V9QYQefdw,4684
 xp/utils/state_machine.py,sha256=W9AY4ntRZnFeHAa5d43hm37j53uJPlqkRvWTPiBhJ_0,2464
 xp/utils/time_utils.py,sha256=K17godWpL18VEypbTlvNOEDG6R3huYnf29yjkcnwRpU,3796
-conson_xp-2.0.1.dist-info/RECORD,,
+conson_xp-2.0.2.dist-info/RECORD,,

xp/__init__.py

@@ -4,7 +4,7 @@ XP CLI tool for remote console bus operations.
 conson-xp package.
 """
 
-__version__ = "2.0.1"
+__version__ = "2.0.2"
 __manufacturer__ = "salchichon"
 __model__ = "xp.cli"
 __serial__ = "2025.09.23.000"

xp/models/homekit/homekit_config.py

@@ -66,6 +66,10 @@ class HomekitAccessoryConfig(BaseModel):
         on_action: on code for the accessory.
         off_action: off code for the accessory.
         toggle_action: Optional toggle action code for the accessory.
+        dimup_action: Optional dim up action code for the dimmable accessory.
+        dimdown_action: Optional dim down action code for the dimmable accessory.
+        levelup_action: Optional level up action code for the dimmable accessory.
+        leveldown_action: Optional level down action code for the dimmable accessory.
         hap_accessory: Optional HAP accessory identifier.
     """
 
@@ -78,6 +82,10 @@ class HomekitAccessoryConfig(BaseModel):
     on_action: str
     off_action: str
     toggle_action: Optional[str] = None
+    dimup_action: Optional[str] = None
+    dimdown_action: Optional[str] = None
+    levelup_action: Optional[str] = None
+    leveldown_action: Optional[str] = None
     hap_accessory: Optional[int] = None
 
 

xp/services/actiontable/actiontable_serializer.py

@@ -65,8 +65,8 @@ class ActionTableSerializer(ActionTableSerializerProtocol):
             link_number = de_bcd(data[i + 1])
             module_input = de_bcd(data[i + 2])
 
-            # Extract output and command from byte 3
-            module_output = lower3(data[i + 3])
+            # Extract output (0-indexed in wire format, convert to 1-indexed) and command
+            module_output = lower3(data[i + 3]) + 1
             command_raw = upper5(data[i + 3])
 
             parameter_raw = byte_to_unsigned(data[i + 4])
@@ -125,8 +125,8 @@ class ActionTableSerializer(ActionTableSerializerProtocol):
             link_byte = to_bcd(entry.link_number)
             input_byte = to_bcd(entry.module_input)
 
-            # Combine output (lower 3 bits) and command (upper 5 bits)
-            output_command_byte = (entry.module_output & 0x07) | (
+            # Combine output (lower 3 bits, 0-indexed) and command (upper 5 bits)
+            output_command_byte = ((entry.module_output - 1) & 0x07) | (
                 (entry.command.value & 0x1F) << 3
             )
 

xp/services/conbus/actiontable/actiontable_upload_service.py

@@ -81,6 +81,7 @@ class ActionTableUploadService:
         # Upload state
         self.upload_data_chunks: list[str] = []
         self.current_chunk_index: int = 0
+        self._eof_sent: bool = False
 
         # Set up logging
         self.logger = logging.getLogger(__name__)
@@ -173,7 +174,7 @@ class ActionTableUploadService:
                 )
                 self.current_chunk_index += 1
                 self.on_progress.emit(".")
-            else:
+            elif not self._eof_sent:
                 # All chunks sent, send EOF
                 self.logger.debug("All chunks sent, sending EOF")
                 self.conbus_protocol.send_telegram(
@@ -182,7 +183,13 @@ class ActionTableUploadService:
                     system_function=SystemFunction.EOF,
                     data_value="00",
                 )
+                self.on_progress.emit("END")
+                self.logger.debug("EOF sent, waiting for last ACK")
+                self._eof_sent = True
+            else:
+                self.logger.debug("Last ACK received, closing connection")
                 self.on_finish.emit(True)
+
         elif reply_telegram.system_function == SystemFunction.NAK:
             self.logger.debug("Received NAK during upload")
             self.failed("Upload failed: NAK received")

xp/services/term/homekit_service.py

@@ -81,6 +81,9 @@ class HomekitService:
         # Set up HomeKit callback
         self._accessory_driver.set_callback(self._on_homekit_set)
 
+        # Track active level action: (accessory_id, action_type) or None
+        self._active_level_action: Optional[tuple[str, str]] = None
+
         # Connect to protocol signals
         self._connect_signals()
 
@@ -421,12 +424,15 @@ class HomekitService:
         Returns:
             True if command was sent, False otherwise.
         """
+        config = self._find_accessory_config_by_id(accessory_id)
         state = self._accessory_states.get(accessory_id)
-        if not state:
+        if not config or not state or not config.dimup_action:
+            self.logger.warning(f"No config for accessory {accessory_id}")
             return False
-        # TODO: Implement dimmer control
-        self.on_status_message.emit(f"Dimmer+ {state.accessory_name} (not implemented)")
-        return False
+
+        self.send_action(config.dimup_action)
+        self.on_status_message.emit(f"Dim+ {state.accessory_name}")
+        return True
 
     def decrease_dimmer(self, accessory_id: str) -> bool:
         """
@@ -438,12 +444,103 @@ class HomekitService:
         Returns:
             True if command was sent, False otherwise.
         """
+        config = self._find_accessory_config_by_id(accessory_id)
         state = self._accessory_states.get(accessory_id)
-        if not state:
+        if not config or not state or not config.dimdown_action:
+            self.logger.warning(f"No config for accessory {accessory_id}")
             return False
-        # TODO: Implement dimmer control
-        self.on_status_message.emit(f"Dimmer- {state.accessory_name} (not implemented)")
-        return False
+
+        self.send_action(config.dimdown_action)
+        self.on_status_message.emit(f"Dim- {state.accessory_name}")
+        return True
+
+    def levelup_selected(self, accessory_id: str) -> bool:
+        """
+        Increase level for accessory (toggle Make/Break).
+
+        First press sends Make (M), second press sends Break (B).
+
+        Args:
+            accessory_id: Accessory ID (e.g., "A12_1").
+
+        Returns:
+            True if command was sent, False otherwise.
+        """
+        config = self._find_accessory_config_by_id(accessory_id)
+        state = self._accessory_states.get(accessory_id)
+        if not config or not state or not config.levelup_action:
+            self.logger.warning(f"No config for accessory {accessory_id}")
+            return False
+
+        return self._send_level_action(
+            accessory_id, "levelup", config.levelup_action, state.accessory_name
+        )
+
+    def leveldown_selected(self, accessory_id: str) -> bool:
+        """
+        Decrease level for accessory (toggle Make/Break).
+
+        First press sends Make (M), second press sends Break (B).
+
+        Args:
+            accessory_id: Accessory ID (e.g., "A12_1").
+
+        Returns:
+            True if command was sent, False otherwise.
+        """
+        config = self._find_accessory_config_by_id(accessory_id)
+        state = self._accessory_states.get(accessory_id)
+        if not config or not state or not config.leveldown_action:
+            self.logger.warning(f"No config for accessory {accessory_id}")
+            return False
+
+        return self._send_level_action(
+            accessory_id, "leveldown", config.leveldown_action, state.accessory_name
+        )
+
+    def _send_level_action(
+        self, accessory_id: str, action_type: str, action: str, name: str
+    ) -> bool:
+        """
+        Send level action with Make/Break toggle.
+
+        Args:
+            accessory_id: Accessory ID.
+            action_type: "levelup" or "leveldown".
+            action: Action code (e.g., "E02L13I15").
+            name: Accessory name for status message.
+
+        Returns:
+            True if command was sent.
+        """
+        current = self._active_level_action
+
+        # If same action is active, send Break and clear
+        if current and current[0] == accessory_id and current[1] == action_type:
+            self._conbus_protocol.send_raw_telegram(f"{action}B")
+            self._active_level_action = None
+            direction = "+" if action_type == "levelup" else "-"
+            self.on_status_message.emit(f"Level{direction} {name} [B]")
+            return True
+
+        # If different action is active, send Break for it first
+        if current:
+            old_config = self._find_accessory_config_by_id(current[0])
+            if old_config:
+                old_action = (
+                    old_config.levelup_action
+                    if current[1] == "levelup"
+                    else old_config.leveldown_action
+                )
+                if old_action:
+                    self._conbus_protocol.send_raw_telegram(f"{old_action}B")
+
+        # Send Make for new action
+        self._conbus_protocol.send_raw_telegram(f"{action}M")
+        self._active_level_action = (accessory_id, action_type)
+        direction = "+" if action_type == "levelup" else "-"
+        self.on_status_message.emit(f"Level{direction} {name} [M]")
+        return True
 
     def refresh_all(self) -> None:
         """

xp/term/homekit.py

@@ -41,6 +41,8 @@ class HomekitApp(App[None]):
         ("minus", "turn_off_selected", "Off"),
         ("plus", "dim_up", "Dim+"),
         ("quotation_mark", "dim_down", "Dim-"),
+        ("asterisk", "level_up", "Level+"),
+        ("ç", "level_down", "Level-"),
     ]
 
     def __init__(self, homekit_service: HomekitService) -> None:
@@ -106,12 +108,17 @@ class HomekitApp(App[None]):
         - - : Turn OFF
         - + : Dim up
         - " : Dim down
+        - * : Level up
+        - ç : Level down
 
         Args:
             event: Key press event.
         """
         key = event.key
 
+        # Debug: show received key
+        self.homekit_service.on_status_message.emit(f"Key: {key}")
+
         # Selection keys (a-z0-9)
         if len(key) == 1 and (("a" <= key <= "z") or ("0" <= key <= "9")):
             accessory_id = self.homekit_service.select_accessory(key)
@@ -140,6 +147,12 @@ class HomekitApp(App[None]):
         elif key in ("quotation_mark", '"'):
             self.homekit_service.decrease_dimmer(self.selected_accessory_id)
             event.prevent_default()
+        elif key in ("asterisk", "star", "*"):
+            self.homekit_service.levelup_selected(self.selected_accessory_id)
+            event.prevent_default()
+        elif key in ("cedille", "ç"):
+            self.homekit_service.leveldown_selected(self.selected_accessory_id)
+            event.prevent_default()
 
     def _select_row(self, action_key: str) -> None:
         """
@@ -243,6 +256,16 @@ class HomekitApp(App[None]):
         if self.selected_accessory_id:
             self.homekit_service.decrease_dimmer(self.selected_accessory_id)
 
+    def action_level_up(self) -> None:
+        """Increase level on selected accessory."""
+        if self.selected_accessory_id:
+            self.homekit_service.levelup_selected(self.selected_accessory_id)
+
+    def action_level_down(self) -> None:
+        """Decrease level on selected accessory."""
+        if self.selected_accessory_id:
+            self.homekit_service.leveldown_selected(self.selected_accessory_id)
+
     async def on_unmount(self) -> None:
         """Stop AccessoryDriver and clean up service when app unmounts."""
         await self.homekit_service.stop()