conson-xp 1.7.0__py3-none-any.whl → 1.9.0__py3-none-any.whl

{conson_xp-1.7.0.dist-info → conson_xp-1.9.0.dist-info}/METADATA

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

{conson_xp-1.7.0.dist-info → conson_xp-1.9.0.dist-info}/RECORD

@@ -1,14 +1,14 @@
-conson_xp-1.7.0.dist-info/METADATA,sha256=zJcFXnX0j-cYc8sCjdUkPuDsGp0-ji8KCGwE79oxZNQ,9274
-conson_xp-1.7.0.dist-info/WHEEL,sha256=9P2ygRxDrTJz3gsagc0Z96ukrxjr-LFBGOgv3AuKlCA,90
-conson_xp-1.7.0.dist-info/entry_points.txt,sha256=1OcdIcDM1hz3ljCXgybaPUh1IOFEwkaTgLIW9u9zGeg,50
-conson_xp-1.7.0.dist-info/licenses/LICENSE,sha256=rxj6woMM-r3YCyGq_UHFtbh7kHTAJgrccH6O-33IDE4,1419
-xp/__init__.py,sha256=IyP3xj9rnVfGLnpDwGvX8oBbLbm-WT5Qx42Tf8OD9I4,180
+conson_xp-1.9.0.dist-info/METADATA,sha256=usy0aEumo7eEblOFryKcZJMRf2sbegjsd6rBUdyuMfw,9274
+conson_xp-1.9.0.dist-info/WHEEL,sha256=9P2ygRxDrTJz3gsagc0Z96ukrxjr-LFBGOgv3AuKlCA,90
+conson_xp-1.9.0.dist-info/entry_points.txt,sha256=1OcdIcDM1hz3ljCXgybaPUh1IOFEwkaTgLIW9u9zGeg,50
+conson_xp-1.9.0.dist-info/licenses/LICENSE,sha256=rxj6woMM-r3YCyGq_UHFtbh7kHTAJgrccH6O-33IDE4,1419
+xp/__init__.py,sha256=L0H6Mwrze8ZJt6uirLh_Crx5go9rdWWiCFZ91ox0TII,180
 xp/cli/__init__.py,sha256=QjnKB1KaI2aIyKlzrnvCwfbBuUj8HNgwNMvNJVQofbI,81
 xp/cli/__main__.py,sha256=l2iKwMdat5rTGd3JWs-uGksnYYDDffp_Npz05QdKEeU,117
 xp/cli/commands/__init__.py,sha256=02CbZoKmNX-fn5etX4Hdgg2lUt1MsLFPYx2VkXZyFJ8,4394
 xp/cli/commands/conbus/__init__.py,sha256=gE3K5OEoXkkZX8UOc2v3nreQQzwkOQi7n0VZ-Z2juXA,495
 xp/cli/commands/conbus/conbus.py,sha256=OTebWu-V-_1tOq2nWExPLtDuAeqy7fB7ltUqzHfgcY8,2705
-xp/cli/commands/conbus/conbus_actiontable_commands.py,sha256=H73-iHpsYRiOMl1hDILl2TaBdH3_It770bBZVZUcLyc,1978
+xp/cli/commands/conbus/conbus_actiontable_commands.py,sha256=iyF3WVLKz4haA_79IP2Yp4y_WFB8aJ5DTH-pTbCfBTk,2252
 xp/cli/commands/conbus/conbus_autoreport_commands.py,sha256=oZgyUUFNsb4yf2WO81l2w1PrasNwdC__QwxNkJ2jCaU,3794
 xp/cli/commands/conbus/conbus_blink_commands.py,sha256=UK-Ey4K0FvaPQ96U0gyMid236RlBmUhPNRes9y0SlkM,4848
 xp/cli/commands/conbus/conbus_config_commands.py,sha256=BugIbgNX6_s4MySGvI6tWZkwguciajHUX2Xz8XBux7k,716
@@ -74,7 +74,7 @@ xp/models/conbus/conbus_writeconfig.py,sha256=z8fdJeFLyGJW7UMHcHxGrHIMS6gG1D3aXe
 xp/models/homekit/__init__.py,sha256=5HDSOClCu0ArK3IICn3_LDMMLBAzLjBxUUSF73bxSSk,34
 xp/models/homekit/homekit_accessory.py,sha256=NsHFhskuxIdJpF9-MvXHtjkLYvNHmSGFOy0GmQv3PY4,1038
 xp/models/homekit/homekit_config.py,sha256=Y1WwrbISRtJOkKVBnXQULb3vAOzcOdt95hBAI8cM_MU,2771
-xp/models/homekit/homekit_conson_config.py,sha256=S8DbFVV6qL99M8sQlvY4nbb5JC-CeSKdxOJ5WyJ8pnI,1972
+xp/models/homekit/homekit_conson_config.py,sha256=NML644Ij7abstMbud-TUPcxraGY4vQwKrkJOwftv2pM,2603
 xp/models/log_entry.py,sha256=kPcYuAirCXugfL3YkOK9cQVlkNWxG_8a4AVuhsykHL0,4355
 xp/models/protocol/__init__.py,sha256=TJ_CJKchA-xgQiv5vCo_ndBBZjrcaTmjT74bR0T-5Cw,38
 xp/models/protocol/conbus_protocol.py,sha256=tSnI5pxBTP_f1DUzEM3XbyjK7vsqwm0gpzHIH1gTg8E,8854
@@ -84,13 +84,13 @@ xp/models/telegram/action_type.py,sha256=vkw_chTgmsadksGXvZ9D_qYGpjOwCw-OgbEi8Bm
 xp/models/telegram/datapoint_type.py,sha256=clmgqCsTNKuHmWN6ol2Hwj_71I10f36Oq-S5D5ZA9a8,2942
 xp/models/telegram/event_telegram.py,sha256=FCCfyZXQEUPB6Uo1m7B9nvFCJ0Ipv2CApmImAZo_Xa4,4689
 xp/models/telegram/event_type.py,sha256=VZhaDpey7KYWnmwN-gstj-r4Vd5hiGdzQuRazUdixB8,333
-xp/models/telegram/input_action_type.py,sha256=jELnLL10CilKp19r1-IUn4v3pHXvIGefChC6ln3nJOM,1874
+xp/models/telegram/input_action_type.py,sha256=_0D6U6WslUcA1imht7ZQ5t8EAvkqyk7c2IfmNqZAAR0,1868
 xp/models/telegram/input_type.py,sha256=X3AcKKMNHswNZs5xgT_AnxeKQpSx_U7ctGnr6AYqNoU,491
 xp/models/telegram/module_type.py,sha256=TdrcQC3UcdESzyUmS9PaVeJuF5VxH1WUtDWdf4QRA50,5223
 xp/models/telegram/module_type_code.py,sha256=bg8Zi58yKs5DDnEF0bGnZ9vvpqzmIZzd1k9Wu4ufB-Y,8177
 xp/models/telegram/output_telegram.py,sha256=vTSdeAGk7va89pZ8-oh0cna98N3T6if-6UcrstWsN6s,3473
 xp/models/telegram/reply_telegram.py,sha256=oqNwDvaOhFTPuXL0fP9Ca3rbcKepDhRz9kIneKCk6n0,10376
-xp/models/telegram/system_function.py,sha256=Iv9u4sYCPnMcvlpbBrNNxu0NpUOFsi5kPgT2vrelbVw,3266
+xp/models/telegram/system_function.py,sha256=ZiY5preq_teO10R6489ZOaYjkJsYFpHZ5_tJpGM6E-Y,4794
 xp/models/telegram/system_telegram.py,sha256=9FNQ4Mf47mRK7wGrTg2GzziVsrEWCE5ZkZp5kA7K3w0,3218
 xp/models/telegram/telegram.py,sha256=IJUxHX6ftLcET9C1pjvLhUO5Db5JO6W7rUItzdEW30I,842
 xp/models/telegram/telegram_type.py,sha256=GhqKP63oNMyh2tIvCPcsC5RFp4s4JjhmEqCLCC-8XMk,423
@@ -98,15 +98,15 @@ xp/models/telegram/timeparam_type.py,sha256=Ar8xvSfPmOAgR2g2Je0FgvP01SL7bPvZn5_H
 xp/models/write_config_type.py,sha256=T2RaO52RpzoJ4782uMHE-fX7Ymx3CaIQAEwByydXq1M,881
 xp/services/__init__.py,sha256=W9YZyrkh7vm--ZHhAXNQiOYQs5yhhmUHXP5I0Lf1XBg,782
 xp/services/actiontable/__init__.py,sha256=z6js4EuJ6xKHaseTEhuEvKo1tr9K1XyQiruReJtBiPY,26
-xp/services/actiontable/actiontable_serializer.py,sha256=x45-8d5Ba9l3hX2TFC5nqKv-g_244g-VTWhXvVXL8Jg,5159
+xp/services/actiontable/actiontable_serializer.py,sha256=ZDIbFG5BlLbSo5O0as119oiNx1IdPLSCNBdQdOlT4V4,5446
 xp/services/actiontable/msactiontable_serializer.py,sha256=RRL6TZ1gpSQw81kAiw2BV3jTqm4fCJC0pWIcO26Cmos,174
 xp/services/actiontable/msactiontable_xp20_serializer.py,sha256=3Lz6t3uRYhoeMRhjDAO1XuWPJzH-ML13t05UQLFUW-s,6057
 xp/services/actiontable/msactiontable_xp24_serializer.py,sha256=zdKzcrKqD41POqj_1c4B4why_Jp9mNXncajsnXXBtPw,4215
 xp/services/actiontable/msactiontable_xp33_serializer.py,sha256=xoZBA38pBSUPA9nn7HgaH1ZM5sR2heQbJ6JVlPVbzUY,8400
 xp/services/conbus/__init__.py,sha256=Hi35sMKu9o6LpYoi2tQDaQoMb8M5sOt_-LUTxxaCU_0,28
 xp/services/conbus/actiontable/__init__.py,sha256=oD6vRk_Ye-eZ9s_hldAgtRJFu4mfAnODqpkJUGHHszk,40
-xp/services/conbus/actiontable/actiontable_service.py,sha256=uy-BFCsjDoe1ZuZy9cTwRSIfMSxznLEN-iMtTsPW3EI,5626
-xp/services/conbus/actiontable/msactiontable_service.py,sha256=yeMJRHVJe2s_-MquOdZDDym3g7135J3CzhxfEa6Qmkc,8357
+xp/services/conbus/actiontable/actiontable_service.py,sha256=z8rfQehfPOJ_LfGL3rVMaZAJYkeDRYrh1pd2r1dFZwQ,5978
+xp/services/conbus/actiontable/msactiontable_service.py,sha256=K0TiYL8g4ac8BS1tqS0UAIYJigOlNhxVLIb8ZFybnVE,8393
 xp/services/conbus/conbus_blink_all_service.py,sha256=OaEg4b8AEiEruHSkZ5jDtaoI81vwwxLq4KWXO7zBdD0,6582
 xp/services/conbus/conbus_blink_service.py,sha256=x9uM-sLnIEV8wSNsvJgo08E042g-Hh2ZF3rXkz-k_9s,5824
 xp/services/conbus/conbus_custom_service.py,sha256=4aneYdPObiZOGxPFYg5Wr70cl_xFxlQIdJBPQSa0enI,5826
@@ -164,4 +164,4 @@ xp/utils/dependencies.py,sha256=1XDwIg3OsmLvOazMQ3qaktcsitYW8E400RxihNWgyt0,1889
 xp/utils/event_helper.py,sha256=W-A_xmoXlpWZBbJH6qdaN50o3-XrwFsDgvAGMJDiAgo,1001
 xp/utils/serialization.py,sha256=RWHHk86feaB4ZP7rjE4qOWK0900yg2joUBDkP76gfOY,4618
 xp/utils/time_utils.py,sha256=dEyViDlAG9GWU-J3D_YVa-sGma6yiyyMTgN4h2x3PY4,3781
-conson_xp-1.7.0.dist-info/RECORD,,
+conson_xp-1.9.0.dist-info/RECORD,,

xp/__init__.py

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

xp/cli/commands/conbus/conbus_actiontable_commands.py

@@ -1,7 +1,7 @@
 """ActionTable CLI commands."""
 
 import json
-from dataclasses import asdict
+from typing import Any
 
 import click
 from click import Context
@@ -40,15 +40,22 @@ def conbus_download_actiontable(ctx: Context, serial_number: str) -> None:
         """
         click.echo(progress)
 
-    def on_finish(actiontable: ActionTable) -> None:
+    def on_finish(
+        _actiontable: ActionTable,
+        actiontable_dict: dict[str, Any],
+        actiontable_short: list[str],
+    ) -> None:
         """Handle successful completion of action table download.
 
         Args:
-            actiontable: Downloaded action table object.
+            _actiontable: Downloaded action table object.
+            actiontable_dict: Dictionary representation of action table.
+            actiontable_short: List of textual format strings.
         """
         output = {
             "serial_number": serial_number,
-            "actiontable": asdict(actiontable),
+            "actiontable_short": actiontable_short,
+            "actiontable": actiontable_dict,
         }
         click.echo(json.dumps(output, indent=2, default=str))
 

xp/models/homekit/homekit_conson_config.py

@@ -22,6 +22,8 @@ class ConsonModuleConfig(BaseModel):
         conbus_port: Optional Conbus port number.
         sw_version: Optional software version.
         hw_version: Optional hardware version.
+        action_table: Optional action table configuration.
+        auto_report_status: Optional auto report status.
     """
 
     name: str
@@ -35,6 +37,8 @@ class ConsonModuleConfig(BaseModel):
     conbus_port: Optional[int] = None
     sw_version: Optional[str] = None
     hw_version: Optional[str] = None
+    action_table: Optional[List[str]] = None
+    auto_report_status: Optional[str] = None
 
 
 class ConsonModuleListConfig(BaseModel):
@@ -66,3 +70,17 @@ class ConsonModuleListConfig(BaseModel):
         with Path(file_path).open("r") as file:
             data = yaml.safe_load(file)
         return cls(root=data)
+
+    def find_module(self, serial_number: str) -> Optional[ConsonModuleConfig]:
+        """Find a module by serial number.
+
+        Args:
+            serial_number: Module serial number to search for.
+
+        Returns:
+            ConsonModuleConfig if found, None otherwise.
+        """
+        for module in self.root:
+            if module.serial_number == serial_number:
+                return module
+        return None

xp/models/telegram/input_action_type.py

@@ -1,9 +1,9 @@
 """Input action types for XP24 module based on Feature-Action-Table.md."""
 
-from enum import IntEnum
+from enum import Enum
 
 
-class InputActionType(IntEnum):
+class InputActionType(Enum):
     """Input action types for XP24 module (based on Feature-Action-Table.md).
 
     Attributes:

xp/models/telegram/system_function.py

@@ -15,35 +15,65 @@ class SystemFunction(str, Enum):
         WRITE_CONFIG: Write configuration.
         BLINK: Blink LED function.
         UNBLINK: Unblink LED function.
-        DOWNLOAD_MSACTIONTABLE: Download module specific action table.
+        UPLOAD_FIRMWARE_START: Start upload firmware.
+        UPLOAD_FIRMWARE_STOP: Stop upload firmware.
+        UPLOAD_FIRMWARE: Upload firmware.
+        UPLOAD_ACTIONTABLE: Upload ActionTable to module.
         DOWNLOAD_ACTIONTABLE: Download ActionTable.
+        UPLOAD_MSACTIONTABLE: Upload module specific action table to module.
+        DOWNLOAD_MSACTIONTABLE: Download module specific action table.
+        TELEGRAM_WRITE_START: Start writing telegram.
+        TELEGRAM_READ_START: Start reading telegram.
         EOF: End of msactiontable response.
+        TELEGRAM: Module specific telegram response.
         MSACTIONTABLE: Module specific action table response.
         ACTIONTABLE: Module specific action table response.
         ACK: Acknowledge response.
         NAK: Not acknowledge response.
+        UPLOAD_TOP_FIRMWARE_START: Start upload firmware (TOP).
+        UPLOAD_TOP_FIRMWARE_STOP: Stop upload firmware (TOP).
+        UPLOAD_TOP_FIRMWARE: Upload firmware (TOP).
+        ROTATE_ENABLE: Enable rotate.
+        ROTATE_DISABLE: Disable rotate.
         UNKNOWN_26: Used after discover, unknown purpose.
         ACTION: Action function.
     """
 
-    NONE = "00"  # Undefined
-    DISCOVERY = "01"  # Discover function
-    READ_DATAPOINT = "02"  # Read datapoint
-    READ_CONFIG = "03"  # Read configuration
-    WRITE_CONFIG = "04"  # Write configuration
-    BLINK = "05"  # Blink LED function
-    UNBLINK = "06"  # Unblink LED function
-    DOWNLOAD_MSACTIONTABLE = (
-        "13"  # Download the module specific action table (MsActionTable)
-    )
-    DOWNLOAD_ACTIONTABLE = "11D"  # Download ActionTable
-    EOF = "16"  # End of msactiontable response
-    MSACTIONTABLE = "17"  # module specific action table (MsActionTable) response
-    ACTIONTABLE = "17"  # module specific action table (MsActionTable) response
-    ACK = "18"  # Acknowledge response
-    NAK = "19"  # Not acknowledge response
-    UNKNOWN_26 = "26"  # Used after discover, but don't know what it is
-    ACTION = "27"  # Action function
+    NONE = "00"  # F00D Undefined
+    DISCOVERY = "01"  # F01D Discover function
+    READ_DATAPOINT = "02"  # F02D Read datapoint
+    READ_CONFIG = "03"  # F03D Read configuration
+    WRITE_CONFIG = "04"  # F04D Write configuration
+    BLINK = "05"  # F05D Blink LED function
+    UNBLINK = "06"  # F06D Unblink LED function
+
+    UPLOAD_FIRMWARE_START = "07"  # F07D Start Upload firmware
+    UPLOAD_FIRMWARE_STOP = "08"  # F08D Stop Upload firmware
+    UPLOAD_FIRMWARE = "09"  # F09D Upload firmware
+
+    UPLOAD_ACTIONTABLE = "10"  # F10D Upload ActionTable
+    DOWNLOAD_ACTIONTABLE = "11"  # F11D Download ActionTable
+    UPLOAD_MSACTIONTABLE = "12"  # F12D Upload MsActionTable to module
+    DOWNLOAD_MSACTIONTABLE = "13"  # F13D Download MsActionTable
+
+    TELEGRAM_WRITE_START = "14"  # F14D Start writing telegram
+    TELEGRAM_READ_START = "15"  # F15D Start reading telegram
+    EOF = "16"  # F16D End of msactiontable response
+    TELEGRAM = "17"  # F17D module specific Telegram response
+    MSACTIONTABLE = "17"  # F17D module specific ms action table (Telegram) response
+    ACTIONTABLE = "17"  # F17D module specific action table (Telegram) response
+    ACK = "18"  # F18D Acknowledge / continue response
+    NAK = "19"  # F19D Not acknowledge response
+
+    UPLOAD_TOP_FIRMWARE_START = "20"  # F20D Start Upload firmware (TOP)
+    UPLOAD_TOP_FIRMWARE_STOP = "21"  # F21D Stop Upload firmware (TOP)
+    UPLOAD_TOP_FIRMWARE = "22"  # F22D Upload firmware (TOP)
+
+    ROTATE_ENABLE = "23"  # F23D Enable rotate
+    ROTATE_DISABLE = "24"  # F24D Disable rotate
+
+    UNKNOWN_26 = "26"  # F26D Used after discover, but don't know what it is
+    ACTION = "27"  # F27D Action function
 
     def get_description(self) -> str:
         """Get the description of the SystemFunction.

xp/services/actiontable/actiontable_serializer.py

@@ -141,29 +141,38 @@ class ActionTableSerializer:
         return ActionTableSerializer.from_data(data)
 
     @staticmethod
-    def format_decoded_output(action_table: ActionTable) -> str:
+    def format_decoded_output(action_table: ActionTable) -> list[str]:
         """Format ActionTable as human-readable decoded output.
 
         Args:
             action_table: ActionTable to format
 
         Returns:
-            Human-readable string representation
+            List of human-readable string representations
         """
         lines = []
         for entry in action_table.entries:
-            # Format: CP20 0 0 > 1 OFF;
+            # Format: CP20 0 0 > 1 OFF [param];
             module_type = entry.module_type.name
             link = entry.link_number
             input_num = entry.module_input
             output = entry.module_output
             command = entry.command.name
 
-            # Add prefix for special commands
+            # Add prefix for inverted commands
             if entry.inverted:
                 command = f"~{command}"
 
-            line = f"{module_type} {link} {input_num} > {output} {command};"
+            # Build base line
+            line = f"{module_type} {link} {input_num} > {output} {command}"
+
+            # Add parameter if present and non-zero
+            if entry.parameter is not None and entry.parameter.value != 0:
+                line += f" {entry.parameter.value}"
+
+            # Add semicolon terminator
+            line += ";"
+
             lines.append(line)
 
-        return "\n".join(lines)
+        return lines

xp/services/conbus/actiontable/actiontable_service.py

@@ -1,7 +1,8 @@
 """Service for downloading ActionTable via Conbus protocol."""
 
 import logging
-from typing import Callable, Optional
+from dataclasses import asdict
+from typing import Any, Callable, Dict, Optional
 
 from twisted.internet.posixbase import PosixReactorBase
 
@@ -44,14 +45,19 @@ class ActionTableService(ConbusProtocol):
         self.serial_number: str = ""
         self.progress_callback: Optional[Callable[[str], None]] = None
         self.error_callback: Optional[Callable[[str], None]] = None
-        self.finish_callback: Optional[Callable[[ActionTable], None]] = None
+        self.finish_callback: Optional[
+            Callable[[ActionTable, Dict[str, Any], list[str]], None]
+        ] = None
+
         self.actiontable_data: list[str] = []
         # Set up logging
         self.logger = logging.getLogger(__name__)
 
     def connection_established(self) -> None:
         """Handle connection established event."""
-        self.logger.debug("Connection established, sending discover telegram")
+        self.logger.debug(
+            "Connection established, sending download actiontable telegram"
+        )
         self.send_telegram(
             telegram_type=TelegramType.SYSTEM,
             serial_number=self.serial_number,
@@ -82,7 +88,9 @@ class ActionTableService(ConbusProtocol):
             self.logger.debug("Not a reply response")
             return
 
-        reply_telegram = self.telegram_service.parse_reply_telegram(telegram_received)
+        reply_telegram = self.telegram_service.parse_reply_telegram(
+            telegram_received.frame
+        )
         if reply_telegram.system_function not in (
             SystemFunction.ACTIONTABLE,
             SystemFunction.EOF,
@@ -109,8 +117,10 @@ class ActionTableService(ConbusProtocol):
             all_data = "".join(self.actiontable_data)
             # Deserialize from received data
             actiontable = self.serializer.from_encoded_string(all_data)
+            actiontable_dict = asdict(actiontable)
+            actiontable_short = self.serializer.format_decoded_output(actiontable)
             if self.finish_callback:
-                self.finish_callback(actiontable)
+                self.finish_callback(actiontable, actiontable_dict, actiontable_short)
 
     def failed(self, message: str) -> None:
         """Handle failed connection event.
@@ -127,7 +137,7 @@ class ActionTableService(ConbusProtocol):
         serial_number: str,
         progress_callback: Callable[[str], None],
         error_callback: Callable[[str], None],
-        finish_callback: Callable[[ActionTable], None],
+        finish_callback: Callable[[ActionTable, Dict[str, Any], list[str]], None],
         timeout_seconds: Optional[float] = None,
     ) -> None:
         """Run reactor in dedicated thread with its own event loop.

xp/services/conbus/actiontable/msactiontable_service.py

@@ -84,7 +84,9 @@ class MsActionTableService(ConbusProtocol):
 
     def connection_established(self) -> None:
         """Handle connection established event."""
-        self.logger.debug("Connection established, sending discover telegram")
+        self.logger.debug(
+            "Connection established, sending download msactiontable telegram"
+        )
         self.send_telegram(
             telegram_type=TelegramType.SYSTEM,
             serial_number=self.serial_number,