conson-xp 2.0.0__tar.gz → 2.0.2__tar.gz

{conson_xp-2.0.0 → conson_xp-2.0.2}/PKG-INFO

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

{conson_xp-2.0.0 → conson_xp-2.0.2}/pyproject.toml

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

{conson_xp-2.0.0 → conson_xp-2.0.2}/src/xp/__init__.py

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

{conson_xp-2.0.0 → conson_xp-2.0.2}/src/xp/cli/main.py

@@ -24,17 +24,36 @@ from xp.utils.logging import LoggerService
     cls=HelpColorsGroup, help_headers_color="yellow", help_options_color="green"
 )
 @click.version_option()
+@click.option(
+    "--cli-config",
+    "-c",
+    default="cli.yml",
+    help="Path to the CLI configuration file (default: cli.yml)",
+    type=click.Path(exists=False),
+)
+@click.option(
+    "--log-config",
+    "-l",
+    default="logger.yml",
+    help="Path to the logger configuration file (default: logger.yml)",
+    type=click.Path(exists=False),
+)
 @click.pass_context
-def cli(ctx: click.Context) -> None:
+def cli(ctx: click.Context, cli_config: str, log_config: str) -> None:
     """
     XP CLI tool for remote console bus operations.
 
     Args:
         ctx: Click context object for passing state between commands.
+        cli_config: Path to the CLI configuration file.
+        log_config: Path to the logger configuration file.
     """
-    container = ServiceContainer()
-    logger_config = container.get_container().resolve(LoggerService)
-    logger_config.setup()
+    container = ServiceContainer(
+        client_config_path=cli_config,
+        logger_config_path=log_config,
+    )
+    logger_service = container.get_container().resolve(LoggerService)
+    logger_service.setup()
 
     # Initialize the service container and store it in the context
     ctx.ensure_object(dict)

{conson_xp-2.0.0 → conson_xp-2.0.2}/src/xp/models/conbus/conbus_client_config.py

@@ -15,11 +15,13 @@ class ClientConfig(BaseModel):
         ip: IP address of the Conbus server.
         port: Port number for the connection.
         timeout: Connection timeout in seconds.
+        queue_delay_max: Max delay between queued telegrams in centiseconds (default 40 = 0.40s).
     """
 
     ip: str = "192.168.1.100"
     port: int = 10001
     timeout: float = 0.1
+    queue_delay_max: int = 40
 
 
 class ConbusClientConfig(BaseModel):

{conson_xp-2.0.0 → conson_xp-2.0.2}/src/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
 
 

{conson_xp-2.0.0 → conson_xp-2.0.2}/src/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
             )
 

{conson_xp-2.0.0 → conson_xp-2.0.2}/src/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")

{conson_xp-2.0.0 → conson_xp-2.0.2}/src/xp/services/protocol/conbus_event_protocol.py

@@ -513,7 +513,7 @@ class ConbusEventProtocol(protocol.Protocol, protocol.ClientFactory):
         self.logger.debug("Queue manager: event loop")
         telegram = self.telegram_queue.get_nowait()
         self.sendFrame(telegram)
-        later = randint(10, 80) / 100
+        later = randint(5, self.cli_config.queue_delay_max) / 100
         self.call_later(later, self.process_telegram_queue)
 
     def set_event_loop(self, event_loop: asyncio.AbstractEventLoop) -> None:

{conson_xp-2.0.0 → conson_xp-2.0.2}/src/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:
         """

{conson_xp-2.0.0 → conson_xp-2.0.2}/src/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()

{conson_xp-2.0.0 → conson_xp-2.0.2}/tests/unit/test_services/test_actiontable_serializer.py

@@ -398,7 +398,7 @@ class TestActionTableSerializerPadding:
         assert result[0] == 0x02  # CP20 (value=2) in BCD
         assert result[1] == 0x01  # link_number
         assert result[2] == 0x02  # module_input
-        assert result[3] == 0x0B  # output (3) | command (1 << 3)
+        assert result[3] == 0x0A  # output 0-indexed: (3-1) | (ON << 3) = 2 | 8 = 10
         assert result[4] == 0x04  # parameter
 
         # Rest should be padding
@@ -414,3 +414,113 @@ class TestActionTableSerializerPadding:
         # Should still be 480 bytes, all zeros
         assert len(result) == 480
         assert result == b"\x00" * 480
+
+    def test_to_encoded_string_cp20_link4_input0_output1_on(self):
+        """
+        Test encoding CP20 4 0 > 1 ON produces expected BCD string.
+
+        ActionTable: CP20 4 0 > 1 ON;
+        Serialized BCD (first 8 chars): ACAEAAAI
+        """
+        action_table = ActionTable(
+            entries=[
+                ActionTableEntry(
+                    module_type=ModuleTypeCode.CP20,
+                    link_number=4,
+                    module_input=0,
+                    module_output=1,
+                    command=InputActionType.ON,
+                    parameter=TimeParam.NONE,
+                    inverted=False,
+                )
+            ]
+        )
+
+        encoded_string = ActionTableSerializer.to_encoded_string(action_table)
+
+        # First 8 characters (4 bytes in BCD, high-nibble first):
+        # AC = 0x02 (CP20, value=2)
+        # AE = 0x04 (link_number=4)
+        # AA = 0x00 (module_input=0)
+        # AI = 0x08 (output 0-indexed: (1-1) | (ON<<3) = 0 | 8 = 8)
+        assert encoded_string[:8] == "ACAEAAAI"
+
+    def test_from_encoded_string_cp20_link4_input0_output1_on(self):
+        """
+        Test decoding BCD string ACAEAAAI produces expected ActionTable.
+
+        Serialized BCD: ACAEAAAI (+ padding)
+        ActionTable: CP20 4 0 > 1 ON;
+        """
+        # Build full 960-char encoded string (96 entries × 5 bytes × 2 nibbles)
+        # First entry: ACAEAAAI, rest is padding (AA = 0x00)
+        encoded_string = "ACAEAAAI" + "AA" * 476
+
+        action_table = ActionTableSerializer.from_encoded_string(encoded_string)
+
+        # Should have exactly 1 entry (padding entries with NOMOD are filtered out)
+        assert len(action_table.entries) == 1
+
+        entry = action_table.entries[0]
+        assert entry.module_type == ModuleTypeCode.CP20
+        assert entry.link_number == 4
+        assert entry.module_input == 0
+        assert entry.module_output == 1  # 0-indexed in wire format, converted to 1
+        assert entry.command == InputActionType.ON
+        assert entry.parameter == TimeParam.NONE
+        assert entry.inverted is False
+
+    def test_to_encoded_string_cp20_link13_input9_output1_levelinc(self):
+        """
+        Test encoding CP20 13 9 > 1 LEVELINC produces expected BCD string.
+
+        ActionTable: CP20 13 9 > 1 LEVELINC;
+        Serialized BCD (first 8 chars): ACBDAJEI
+        """
+        action_table = ActionTable(
+            entries=[
+                ActionTableEntry(
+                    module_type=ModuleTypeCode.CP20,
+                    link_number=13,
+                    module_input=9,
+                    module_output=1,
+                    command=InputActionType.LEVELINC,
+                    parameter=TimeParam.NONE,
+                    inverted=False,
+                )
+            ]
+        )
+
+        encoded_string = ActionTableSerializer.to_encoded_string(action_table)
+
+        # First 8 characters (4 bytes in BCD, high-nibble first):
+        # AC = 0x02 (CP20, value=2)
+        # BD = 0x13 (link_number=13 in BCD)
+        # AJ = 0x09 (module_input=9)
+        # EI = 0x48 (output 0-indexed: (1-1) | (LEVELINC<<3) = 0 | 72 = 0x48)
+        assert encoded_string[:8] == "ACBDAJEI"
+
+    def test_from_encoded_string_cp20_link13_input9_output1_levelinc(self):
+        """
+        Test decoding BCD string ACBDAJEIAA produces expected ActionTable.
+
+        Serialized BCD: ACBDAJEIAA (+ padding)
+        ActionTable: CP20 13 9 > 1 LEVELINC;
+        """
+        # Build full 960-char encoded string (96 entries × 5 bytes × 2 nibbles)
+        # First entry: ACBDAJEIAA, rest is padding (AA = 0x00)
+        encoded_string = "ACBDAJEIAA" + "AA" * 475
+
+        action_table = ActionTableSerializer.from_encoded_string(encoded_string)
+
+        # Should have exactly 1 entry (padding entries with NOMOD are filtered out)
+        assert len(action_table.entries) == 1
+
+        entry = action_table.entries[0]
+        assert entry.module_type == ModuleTypeCode.CP20
+        assert entry.link_number == 13
+        assert entry.module_input == 9
+        assert entry.module_output == 1  # 0-indexed in wire format, converted to 1
+        assert entry.command == InputActionType.LEVELINC
+        assert entry.parameter == TimeParam.NONE
+        assert entry.inverted is False

{conson_xp-2.0.0 → conson_xp-2.0.2}/tests/unit/test_services/test_actiontable_upload_service.py

@@ -408,6 +408,7 @@ class TestActionTableUploadChunkPrefix:
         mock_reply = Mock()
         mock_reply.system_function = SystemFunction.ACK
 
+        # First ACK after all chunks sent triggers EOF
         service._handle_upload_response(mock_reply)
 
         # Should send EOF
@@ -418,6 +419,9 @@ class TestActionTableUploadChunkPrefix:
             data_value="00",
         )
 
+        # Second ACK (after EOF) triggers finish signal
+        service._handle_upload_response(mock_reply)
+
         # Should call finish signal with True
         mock_finish.assert_called_once_with(True)
 
@@ -580,11 +584,11 @@ class TestActionTableUploadFullSequence:
         # Simulate connection made
         service.connection_made()
 
-        # Simulate ACK responses for each chunk + final ACK to trigger EOF
+        # Simulate ACK responses for each chunk + ACK to trigger EOF + ACK after EOF
         mock_ack = Mock()
         mock_ack.system_function = SystemFunction.ACK
 
-        for _ in range(16):  # 15 chunks + 1 final ACK to trigger EOF
+        for _ in range(17):  # 15 chunks + 1 ACK to trigger EOF + 1 ACK after EOF
             service._handle_upload_response(mock_ack)
 
         # Verify: Exactly 17 telegrams sent (1 UPLOAD_ACTIONTABLE + 15 ACTIONTABLE + 1 EOF)