conson-xp 1.49.0__py3-none-any.whl → 1.50.0__py3-none-any.whl

{conson_xp-1.49.0.dist-info → conson_xp-1.50.0.dist-info}/METADATA

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

{conson_xp-1.49.0.dist-info → conson_xp-1.50.0.dist-info}/RECORD

@@ -1,14 +1,14 @@
-conson_xp-1.49.0.dist-info/METADATA,sha256=TynMPgKlwxBap1KLaYahYSNDF4YOS_iO1kNhUFR78io,11403
-conson_xp-1.49.0.dist-info/WHEEL,sha256=tsUv_t7BDeJeRHaSrczbGeuK-TtDpGsWi_JfpzD255I,90
-conson_xp-1.49.0.dist-info/entry_points.txt,sha256=1OcdIcDM1hz3ljCXgybaPUh1IOFEwkaTgLIW9u9zGeg,50
-conson_xp-1.49.0.dist-info/licenses/LICENSE,sha256=rxj6woMM-r3YCyGq_UHFtbh7kHTAJgrccH6O-33IDE4,1419
-xp/__init__.py,sha256=KJJ4ZcIuwzCmqcxnfXWmH4RNucpuxrNrvbjN0cEnmaw,182
+conson_xp-1.50.0.dist-info/METADATA,sha256=9CLWQiRR8QJj0Ne3zXyV2XzXqkmv3uL7NfVaGkaogHk,11403
+conson_xp-1.50.0.dist-info/WHEEL,sha256=tsUv_t7BDeJeRHaSrczbGeuK-TtDpGsWi_JfpzD255I,90
+conson_xp-1.50.0.dist-info/entry_points.txt,sha256=1OcdIcDM1hz3ljCXgybaPUh1IOFEwkaTgLIW9u9zGeg,50
+conson_xp-1.50.0.dist-info/licenses/LICENSE,sha256=rxj6woMM-r3YCyGq_UHFtbh7kHTAJgrccH6O-33IDE4,1419
+xp/__init__.py,sha256=W-aER6IUlDyRVKHOLg5oh4E-KxDbSmRYOT9XO1035Ac,182
 xp/cli/__init__.py,sha256=QjnKB1KaI2aIyKlzrnvCwfbBuUj8HNgwNMvNJVQofbI,81
 xp/cli/__main__.py,sha256=l2iKwMdat5rTGd3JWs-uGksnYYDDffp_Npz05QdKEeU,117
 xp/cli/commands/__init__.py,sha256=G7A1KFRSV0CEeDTqr_khu-K9_sc01CTI2KSfkFcaBRM,4949
 xp/cli/commands/conbus/__init__.py,sha256=HYaX2__XxwD3Xaw4CzflvL8CwoUa4yR6wOyH8wwyofM,535
 xp/cli/commands/conbus/conbus.py,sha256=GpWq1QS3mKfQFG77nTED-_hsvcnXb3ZIrC6DhfyhzBE,3538
-xp/cli/commands/conbus/conbus_actiontable_commands.py,sha256=9kLP-ISIDWXVUtELCjTAs0JIT3DNGcYGBRnZEo-tp3g,7743
+xp/cli/commands/conbus/conbus_actiontable_commands.py,sha256=EpyLG_6RxhIQY4BWxDXTyo8yzpBwbHfZDOgmRl--R5w,7378
 xp/cli/commands/conbus/conbus_autoreport_commands.py,sha256=dO3rxgII_xZVhbkxlMqTJCarrUveQCs_7-qf4li0UkQ,3962
 xp/cli/commands/conbus/conbus_blink_commands.py,sha256=1zLiXV8Nn4XSDI-z7F3f2RN2IO-yxeMkGQ1PCknAkWY,5398
 xp/cli/commands/conbus/conbus_config_commands.py,sha256=jeZi7J973DrDCyP59Qrvk6tonduj97KnV4fq9zbei2k,721
@@ -20,7 +20,7 @@ xp/cli/commands/conbus/conbus_export_commands.py,sha256=-fA4vzQF3XsDvRD4BjbE7KRq
 xp/cli/commands/conbus/conbus_lightlevel_commands.py,sha256=WH4ZQHxSbquPlAqd0uRxq8VR-sO4_AnfseMqaoPoGoA,7092
 xp/cli/commands/conbus/conbus_linknumber_commands.py,sha256=3bkik8nHXY89XfzeUnKWmvKA70r4qJJ79j8FfLL4sL0,3556
 xp/cli/commands/conbus/conbus_modulenumber_commands.py,sha256=fOIO0f85iDJBfGnRCEN8zK6j4i43uuF_9YKQc_nQ39A,3628
-xp/cli/commands/conbus/conbus_msactiontable_commands.py,sha256=cTH6reU7oyqlOah-0-MWI2aWDlSJ-hnSf_0_aWk97uI,10419
+xp/cli/commands/conbus/conbus_msactiontable_commands.py,sha256=oMHfrxDR9yj0Pvx92ZHnwYU3CZqwNNvfAfEoLuo_jhQ,11585
 xp/cli/commands/conbus/conbus_output_commands.py,sha256=XMEMb5tM0ul7lwhwoo4QRgWprXZ31qswXBno8KCeFMo,5342
 xp/cli/commands/conbus/conbus_raw_commands.py,sha256=o1dVZqiRw7J3_8Bge7DJucFyAqt7GNP-Azf-f3ir3SU,2019
 xp/cli/commands/conbus/conbus_receive_commands.py,sha256=LdxoOUdM5atkC8fFlp-GK7HQ7oxTnjrSFDx-lQ3nme0,1925
@@ -54,11 +54,10 @@ xp/cli/utils/formatters.py,sha256=SN_kUkL4M7csay8eftnxoIPS_VvQDlqZueARNElyZZs,98
 xp/cli/utils/module_type_choice.py,sha256=Hs0VFrssKWWGqfqBtSJPP7DDCzLyv-BfyeNIPC1WxyU,1672
 xp/cli/utils/serial_number_type.py,sha256=-6MlAAPbpqaGx1Ds3vPPT3PU9hYJG4_C2SmytXV3VyI,1480
 xp/cli/utils/system_function_choice.py,sha256=3YZrTtBHCw_f6KqqT41wJUiiPBVLAQufyPnrMkesdd0,1637
-xp/cli/utils/xp_module_type.py,sha256=rCafAi8k0BNRqtQryoai2WW4zr51lCEY-VRS7asW7VA,1485
 xp/models/__init__.py,sha256=lROqr559DGd8WpJJUtfPT95VERCwMZHpBDEc96QSxQ0,1312
 xp/models/actiontable/__init__.py,sha256=6kVq1rTOlpc24sZxGGVWkY48tqR42YWHLQHqakWqlPc,43
 xp/models/actiontable/actiontable.py,sha256=IAV3KhA5B4jNOHFvVQmhJQV3vbX7EOug2UNAJuTslvk,1258
-xp/models/actiontable/actiontable_type.py,sha256=wfJXnXMz9IeU4RIM21BfXqAzJJ9I1Ak7cEPyJ8c6j94,610
+xp/models/actiontable/actiontable_type.py,sha256=HjQ9Z-akdhMJaVx6fgyjqqFCAdFwQp0vO1YmSznlW1M,887
 xp/models/actiontable/msactiontable_xp20.py,sha256=E2JQpZzWuAb_ZdFApzx80tqfF1qFjiO4zp-PtrRBYeQ,5034
 xp/models/actiontable/msactiontable_xp24.py,sha256=WNtUmJVizyUs0RmG9EQW21tgiUB9ofqVQxrzEVpOjdk,9423
 xp/models/actiontable/msactiontable_xp33.py,sha256=nM4v7jICY3woXV50ji02rBbMxAu6CNjydoh9QNAMsF4,11859
@@ -127,7 +126,7 @@ xp/services/conbus/actiontable/__init__.py,sha256=oD6vRk_Ye-eZ9s_hldAgtRJFu4mfAn
 xp/services/conbus/actiontable/actiontable_download_service.py,sha256=ZTQCC1D9TLmyDu3b5GAO4VxUVGSr6HuqZI9fxHB1qW8,14992
 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=4crX4OZeTLYC_9ZjhV1Cqqc-WOhhBlXDmEHToLS6N9g,9772
+xp/services/conbus/actiontable/actiontable_upload_service.py,sha256=FaQzOSg8s2zUL5xz9qZY9fvzrdDosc3CoxkVDvNg2SU,13252
 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
@@ -141,8 +140,6 @@ xp/services/conbus/conbus_output_service.py,sha256=e57bRkLgPnJuB8hkllNh0kgGkjPt9
 xp/services/conbus/conbus_raw_service.py,sha256=OQuV521VOQraf2PGF2B9868vh7sDgmfc19YebrkZnyw,5844
 xp/services/conbus/conbus_receive_service.py,sha256=TFf3W65brGsy6QZICpIs0Xy9bgqyL1vgQuhS_eHuIZs,5416
 xp/services/conbus/conbus_scan_service.py,sha256=_Ka0OUDNYhDgZIR49Q0P5GTxJq6RcAAX2DVqEDdtb5U,6888
-xp/services/conbus/msactiontable/__init__.py,sha256=rDYzumPSfcTjDADHxjE7bXQoeWtZTDGaYzFTYdVl_9g,42
-xp/services/conbus/msactiontable/msactiontable_upload_service.py,sha256=LB9pv0VOUDmyTHKUcY894fmBAqINO7qpM8mW1E3s8aU,12423
 xp/services/conbus/write_config_service.py,sha256=BCfmLNPRDpwSwRMRYJvx2FXA8IZsdgmyeTXIYvmb4ys,9004
 xp/services/homekit/__init__.py,sha256=xAMKmln_AmEFdOOJGKWYi96seRlKDQpKx3-hm7XbdIo,36
 xp/services/homekit/homekit_cache_service.py,sha256=z1TB6icEqd1paoilVTewuFL0lXVCQbvrOJkJvvQECJY,11060
@@ -200,10 +197,10 @@ xp/term/widgets/protocol_log.py,sha256=E68QmSMpOFrvrPTo_gOQVfyiDqY5c_y8fkNKnQw6V
 xp/term/widgets/status_footer.py,sha256=YYAT0431p6jmrzzpVgaPhu7yGkRroWGv4e99t2XlkHI,3297
 xp/utils/__init__.py,sha256=_avMF_UOkfR3tNeDIPqQ5odmbq5raKkaq1rZ9Cn1CJs,332
 xp/utils/checksum.py,sha256=Px1S3dFGA-_plavBxrq3IqmprNlgtNDunE3whg6Otwg,1722
-xp/utils/dependencies.py,sha256=b3BdBOiTuX7WU734MyZXDE854RDlJgJlQY6oBj2AABQ,25295
+xp/utils/dependencies.py,sha256=tmqgooFjkZ8W_CekzJdPlaQas3IJGnVXbfBZdUimwZU,23992
 xp/utils/event_helper.py,sha256=zD0K3TPfGEThU9vUNlDtglTai3Cmm30727iwjDZy6Dk,1007
 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-1.49.0.dist-info/RECORD,,
+conson_xp-1.50.0.dist-info/RECORD,,

xp/__init__.py

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

xp/cli/commands/conbus/conbus_actiontable_commands.py

@@ -1,8 +1,6 @@
 """ActionTable CLI commands."""
 
 import json
-from contextlib import suppress
-from pathlib import Path
 
 import click
 from click import Context
@@ -13,10 +11,9 @@ from xp.cli.utils.decorators import (
 )
 from xp.cli.utils.serial_number_type import SERIAL
 from xp.models.actiontable.actiontable import ActionTable
-from xp.models.actiontable.actiontable_type import ActionTableType
+from xp.models.actiontable.actiontable_type import ActionTableType, ActionTableType2
 from xp.models.config.conson_module_config import (
     ConsonModuleConfig,
-    ConsonModuleListConfig,
 )
 from xp.services.conbus.actiontable.actiontable_download_service import (
     ActionTableDownloadService,
@@ -164,18 +161,12 @@ def conbus_upload_actiontable(ctx: Context, serial_number: str) -> None:
 
     with service:
         # Load config to get entry count for success message
-        config_path = Path.cwd() / "conson.yml"
-        if config_path.exists():
-            with suppress(Exception):
-                config = ConsonModuleListConfig.from_yaml(str(config_path))
-                module = config.find_module(serial_number)
-                if module and module.action_table:
-                    entries_count = len(module.action_table)
-
         service.on_progress.connect(progress_callback)
         service.on_finish.connect(on_finish)
         service.on_error.connect(on_error)
-        service.start(serial_number=serial_number)
+        service.start(
+            serial_number=serial_number, actiontable_type=ActionTableType2.ACTIONTABLE
+        )
         service.start_reactor()
 
 

xp/cli/commands/conbus/conbus_msactiontable_commands.py

@@ -1,7 +1,7 @@
 """XP24 Action Table CLI commands."""
 
 import json
-from typing import Any, Union
+from typing import Any, Optional, Union
 
 import click
 from click import Context
@@ -11,8 +11,7 @@ from xp.cli.utils.decorators import (
     connection_command,
 )
 from xp.cli.utils.serial_number_type import SERIAL
-from xp.cli.utils.xp_module_type import XP_MODULE_TYPE
-from xp.models.actiontable.actiontable_type import ActionTableType
+from xp.models.actiontable.actiontable_type import ActionTableType, ActionTableType2
 from xp.models.config.conson_module_config import ConsonModuleConfig
 from xp.services.conbus.actiontable.actiontable_download_service import (
     ActionTableDownloadService,
@@ -23,11 +22,59 @@ from xp.services.conbus.actiontable.actiontable_list_service import (
 from xp.services.conbus.actiontable.actiontable_show_service import (
     ActionTableShowService,
 )
-from xp.services.conbus.msactiontable.msactiontable_upload_service import (
-    MsActionTableUploadService,
+from xp.services.conbus.actiontable.actiontable_upload_service import (
+    ActionTableUploadService,
 )
 
 
+class XpModuleTypeChoice(click.ParamType):
+    """
+    Click parameter type for validating XP module types.
+
+    Attributes:
+        name: The parameter type name.
+        choices: List of valid module type strings.
+    """
+
+    name = "xpmoduletype"
+
+    def __init__(self) -> None:
+        """Initialize the XpModuleTypeChoice parameter type."""
+        self.choices = ["xp20", "xp24", "xp31", "xp33"]
+
+    def convert(
+        self,
+        value: Any,
+        param: Optional[click.Parameter],
+        ctx: Optional[click.Context],
+    ) -> Any:
+        """
+        Convert and validate XP module type input.
+
+        Args:
+            value: The input value to convert.
+            param: The Click parameter.
+            ctx: The Click context.
+
+        Returns:
+            Lowercase module type string if valid, None if input is None.
+        """
+        if value is None:
+            return value
+        normalized_value = value.lower()
+        if normalized_value in self.choices:
+            return normalized_value
+        choices_list = "\n".join(f" - {choice}" for choice in sorted(self.choices))
+        self.fail(
+            f"{value!r} is not a valid choice. Choose from:\n{choices_list}",
+            param,
+            ctx,
+        )
+
+
+XP_MODULE_TYPE = XpModuleTypeChoice()
+
+
 def _get_actiontable_type(xpmoduletype: str) -> ActionTableType:
     """
     Map xpmoduletype string to ActionTableType enum.
@@ -244,22 +291,18 @@ def conbus_show_msactiontable(ctx: Context, serial_number: str) -> None:
 
 @conbus_msactiontable.command("upload", short_help="Upload MSActionTable")
 @click.argument("serial_number", type=SERIAL)
-@click.argument("xpmoduletype", type=XP_MODULE_TYPE)
 @click.pass_context
 @connection_command()
-def conbus_upload_msactiontable(
-    ctx: Context, serial_number: str, xpmoduletype: str
-) -> None:
+def conbus_upload_msactiontable(ctx: Context, serial_number: str) -> None:
     """
     Upload MS action table from conson.yml to XP module.
 
     Args:
         ctx: Click context object.
         serial_number: 10-digit module serial number.
-        xpmoduletype: XP module type.
     """
-    service: MsActionTableUploadService = (
-        ctx.obj.get("container").get_container().resolve(MsActionTableUploadService)
+    service: ActionTableUploadService = (
+        ctx.obj.get("container").get_container().resolve(ActionTableUploadService)
     )
 
     def on_progress(progress: str) -> None:
@@ -300,7 +343,7 @@ def conbus_upload_msactiontable(
         service.on_finish.connect(on_finish)
         service.start(
             serial_number=serial_number,
-            xpmoduletype=xpmoduletype,
+            actiontable_type=ActionTableType2.MSACTIONTABLE,
         )
         service.start_reactor()
 

xp/models/actiontable/actiontable_type.py

@@ -18,3 +18,16 @@ class ActionTableType(str, Enum):
     MSACTIONTABLE_XP20 = "msactiontable_xp20"
     MSACTIONTABLE_XP24 = "msactiontable_xp24"
     MSACTIONTABLE_XP33 = "msactiontable_xp33"
+
+
+class ActionTableType2(str, Enum):
+    """
+    ActionTable types for download/upload operations.
+
+    Attributes:
+        ACTIONTABLE: Standard action table.
+        MSACTIONTABLE: MS action table.
+    """
+
+    ACTIONTABLE = "actiontable"
+    MSACTIONTABLE = "msactiontable"

xp/services/conbus/actiontable/actiontable_upload_service.py

@@ -5,18 +5,32 @@ from typing import Any, Optional
 
 from psygnal import Signal
 
-from xp.models.config.conson_module_config import ConsonModuleListConfig
+from xp.models.actiontable.actiontable_type import ActionTableType2
+from xp.models.config.conson_module_config import (
+    ConsonModuleConfig,
+    ConsonModuleListConfig,
+)
 from xp.models.protocol.conbus_protocol import TelegramReceivedEvent
 from xp.models.telegram.system_function import SystemFunction
 from xp.models.telegram.telegram_type import TelegramType
 from xp.services.actiontable.actiontable_serializer import ActionTableSerializer
+from xp.services.actiontable.msactiontable_xp20_serializer import (
+    Xp20MsActionTableSerializer,
+)
+from xp.services.actiontable.msactiontable_xp24_serializer import (
+    Xp24MsActionTableSerializer,
+)
+from xp.services.actiontable.msactiontable_xp33_serializer import (
+    Xp33MsActionTableSerializer,
+)
 from xp.services.protocol.conbus_event_protocol import ConbusEventProtocol
 from xp.services.telegram.telegram_service import TelegramService
 
 
 class ActionTableUploadService:
     """
-    TCP client service for uploading action tables to Conbus modules.
+    TCP client service for uploading action tables and MS action tables to Conbus
+    modules.
 
     Manages TCP socket connections, handles telegram generation and transmission,
     and processes server responses for action table uploads.
@@ -35,6 +49,9 @@ class ActionTableUploadService:
         self,
         conbus_protocol: ConbusEventProtocol,
         actiontable_serializer: ActionTableSerializer,
+        xp20ms_serializer: Xp20MsActionTableSerializer,
+        xp24ms_serializer: Xp24MsActionTableSerializer,
+        xp33ms_serializer: Xp33MsActionTableSerializer,
         telegram_service: TelegramService,
         conson_config: ConsonModuleListConfig,
     ) -> None:
@@ -44,14 +61,22 @@ class ActionTableUploadService:
         Args:
             conbus_protocol: ConbusEventProtocol for communication.
             actiontable_serializer: Action table serializer.
+            xp20ms_serializer: XP20 MS action table serializer.
+            xp24ms_serializer: XP24 MS action table serializer.
+            xp33ms_serializer: XP33 MS action table serializer.
             telegram_service: Telegram service for parsing.
             conson_config: Conson module list configuration.
         """
         self.conbus_protocol = conbus_protocol
-        self.serializer = actiontable_serializer
+        self.actiontable_serializer = actiontable_serializer
+        self.xp20ms_serializer = xp20ms_serializer
+        self.xp24ms_serializer = xp24ms_serializer
+        self.xp33ms_serializer = xp33ms_serializer
         self.telegram_service = telegram_service
         self.conson_config = conson_config
         self.serial_number: str = ""
+        self.xpmoduletype: str = ""
+        self.actiontable_type: ActionTableType2 = ActionTableType2.ACTIONTABLE
 
         # Upload state
         self.upload_data_chunks: list[str] = []
@@ -70,10 +95,17 @@ class ActionTableUploadService:
     def connection_made(self) -> None:
         """Handle connection established event."""
         self.logger.debug("Connection established, sending upload actiontable telegram")
+
+        system_function = (
+            SystemFunction.UPLOAD_ACTIONTABLE
+            if self.actiontable_type == ActionTableType2.ACTIONTABLE
+            else SystemFunction.UPLOAD_MSACTIONTABLE
+        )
+
         self.conbus_protocol.send_telegram(
             telegram_type=TelegramType.SYSTEM,
             serial_number=self.serial_number,
-            system_function=SystemFunction.UPLOAD_ACTIONTABLE,
+            system_function=system_function,
             data_value="00",
         )
 
@@ -127,10 +159,16 @@ class ActionTableUploadService:
                 # Second character: 'A' + chunk_index (sequential counter A-O for 15 chunks)
                 prefix_hex = f"AAA{ord('A') + self.current_chunk_index:c}"
 
+                system_function = (
+                    SystemFunction.ACTIONTABLE
+                    if self.actiontable_type == ActionTableType2.ACTIONTABLE
+                    else SystemFunction.MSACTIONTABLE
+                )
+
                 self.conbus_protocol.send_telegram(
                     telegram_type=TelegramType.SYSTEM,
                     serial_number=self.serial_number,
-                    system_function=SystemFunction.ACTIONTABLE,
+                    system_function=system_function,
                     data_value=f"{prefix_hex}{chunk}",
                 )
                 self.current_chunk_index += 1
@@ -169,19 +207,24 @@ class ActionTableUploadService:
     def start(
         self,
         serial_number: str,
+        actiontable_type: ActionTableType2,
         timeout_seconds: Optional[float] = None,
     ) -> None:
         """
-        Upload action table to module.
+        Upload action table or MS action table to module.
 
         Uploads the action table configuration to the specified module.
+        Module type will decide which actiontable to use.
 
         Args:
             serial_number: Module serial number.
+            actiontable_type: True if actionTable false for MS action table.
             timeout_seconds: Optional timeout in seconds.
         """
         self.logger.info("Starting actiontable upload")
         self.serial_number = serial_number
+        self.actiontable_type = actiontable_type
+
         if timeout_seconds:
             self.conbus_protocol.timeout_seconds = timeout_seconds
 
@@ -193,29 +236,65 @@ class ActionTableUploadService:
 
         # Parse action table strings to ActionTable object
         try:
-            module_action_table = module.action_table or []
-            action_table = self.serializer.from_short_string(module_action_table)
+            encoded_data = self.get_encoded_action_table(module)
+            # Chunk the data into 64 byte chunks
+            chunk_size = 64
+            self.upload_data_chunks = [
+                encoded_data[i : i + chunk_size]
+                for i in range(0, len(encoded_data), chunk_size)
+            ]
+            self.current_chunk_index = 0
+
         except ValueError as e:
             self.logger.error(f"Invalid action table format: {e}")
             self.failed(f"Invalid action table format: {e}")
             return
 
-        # Encode action table to hex string
-        encoded_data = self.serializer.to_encoded_string(action_table)
-
-        # Chunk the data into 64 byte chunks
-        chunk_size = 64
-        self.upload_data_chunks = [
-            encoded_data[i : i + chunk_size]
-            for i in range(0, len(encoded_data), chunk_size)
-        ]
-        self.current_chunk_index = 0
-
         self.logger.debug(
             f"Upload data encoded: {len(encoded_data)} chars, "
             f"{len(self.upload_data_chunks)} chunks"
         )
 
+    def get_encoded_action_table(self, module: ConsonModuleConfig) -> str:
+        """
+        Get encoded action table string for upload.
+
+        Args:
+            module: Module configuration containing action table data.
+
+        Returns:
+            Hex-encoded action table string ready for transmission.
+        """
+        msactiontable = (
+            True if self.actiontable_type == ActionTableType2.MSACTIONTABLE else False
+        )
+        # Parse MS action table from short format (first element)
+        if msactiontable and module.module_type.lower() == "xp20":
+            xp20_short_table = module.xp20_msaction_table or []
+            xp20_actiontable = self.xp20ms_serializer.from_short_string(
+                xp20_short_table
+            )
+            encoded_string = self.xp20ms_serializer.to_encoded_string(xp20_actiontable)
+        elif msactiontable and module.module_type.lower() == "xp24":
+            xp24_short_table = module.xp24_msaction_table or []
+            xp24_actiontable = self.xp24ms_serializer.from_short_string(
+                xp24_short_table
+            )
+            encoded_string = self.xp24ms_serializer.to_encoded_string(xp24_actiontable)
+        elif msactiontable and module.module_type.lower() == "xp33":
+            xp33_short_table = module.xp33_msaction_table or []
+            xp33_actiontable = self.xp33ms_serializer.from_short_string(
+                xp33_short_table
+            )
+            encoded_string = self.xp33ms_serializer.to_encoded_string(xp33_actiontable)
+        else:
+            short_table = module.action_table or []
+            actiontable = self.actiontable_serializer.from_short_string(short_table)
+            encoded_string = self.actiontable_serializer.to_encoded_string(actiontable)
+
+        # Serialize to telegram data (64 characters: AAAA + 64 data chars)
+        return encoded_string
+
     def set_timeout(self, timeout_seconds: float) -> None:
         """
         Set operation timeout.
@@ -243,6 +322,7 @@ class ActionTableUploadService:
         self.upload_data_chunks = []
         self.current_chunk_index = 0
         self.serial_number = ""
+        self.xpmoduletype = ""
         return self
 
     def __exit__(self, _exc_type: Any, _exc_val: Any, _exc_tb: Any) -> None:

xp/utils/dependencies.py

@@ -51,9 +51,6 @@ from xp.services.conbus.conbus_output_service import ConbusOutputService
 from xp.services.conbus.conbus_raw_service import ConbusRawService
 from xp.services.conbus.conbus_receive_service import ConbusReceiveService
 from xp.services.conbus.conbus_scan_service import ConbusScanService
-from xp.services.conbus.msactiontable.msactiontable_upload_service import (
-    MsActionTableUploadService,
-)
 from xp.services.conbus.write_config_service import WriteConfigService
 from xp.services.homekit.homekit_cache_service import HomeKitCacheService
 from xp.services.homekit.homekit_conbus_service import HomeKitConbusService
@@ -336,6 +333,9 @@ class ServiceContainer:
             factory=lambda: ActionTableUploadService(
                 conbus_protocol=self.container.resolve(ConbusEventProtocol),
                 actiontable_serializer=self.container.resolve(ActionTableSerializer),
+                xp20ms_serializer=self.container.resolve(Xp20MsActionTableSerializer),
+                xp24ms_serializer=self.container.resolve(Xp24MsActionTableSerializer),
+                xp33ms_serializer=self.container.resolve(Xp33MsActionTableSerializer),
                 telegram_service=self.container.resolve(TelegramService),
                 conson_config=self.container.resolve(ConsonModuleListConfig),
             ),
@@ -372,37 +372,6 @@ class ServiceContainer:
             scope=punq.Scope.singleton,
         )
 
-        self.container.register(
-            ActionTableDownloadService,
-            factory=lambda: ActionTableDownloadService(
-                conbus_protocol=self.container.resolve(ConbusEventProtocol),
-                actiontable_serializer=self.container.resolve(ActionTableSerializer),
-                msactiontable_serializer_xp20=self.container.resolve(
-                    Xp20MsActionTableSerializer
-                ),
-                msactiontable_serializer_xp24=self.container.resolve(
-                    Xp24MsActionTableSerializer
-                ),
-                msactiontable_serializer_xp33=self.container.resolve(
-                    Xp33MsActionTableSerializer
-                ),
-            ),
-            scope=punq.Scope.singleton,
-        )
-
-        self.container.register(
-            MsActionTableUploadService,
-            factory=lambda: MsActionTableUploadService(
-                conbus_protocol=self.container.resolve(ConbusEventProtocol),
-                xp20ms_serializer=self.container.resolve(Xp20MsActionTableSerializer),
-                xp24ms_serializer=self.container.resolve(Xp24MsActionTableSerializer),
-                xp33ms_serializer=self.container.resolve(Xp33MsActionTableSerializer),
-                telegram_service=self.container.resolve(TelegramService),
-                conson_config=self.container.resolve(ConsonModuleListConfig),
-            ),
-            scope=punq.Scope.singleton,
-        )
-
         self.container.register(
             ConbusCustomService,
             factory=lambda: ConbusCustomService(

xp/cli/utils/xp_module_type.py

@@ -1,55 +0,0 @@
-"""Click parameter type for XP module type validation."""
-
-from typing import Any, Optional
-
-import click
-
-
-class XpModuleTypeChoice(click.ParamType):
-    """
-    Click parameter type for validating XP module types.
-
-    Attributes:
-        name: The parameter type name.
-        choices: List of valid module type strings.
-    """
-
-    name = "xpmoduletype"
-
-    def __init__(self) -> None:
-        """Initialize the XpModuleTypeChoice parameter type."""
-        self.choices = ["xp20", "xp24", "xp31", "xp33"]
-
-    def convert(
-        self, value: Any, param: Optional[click.Parameter], ctx: Optional[click.Context]
-    ) -> Any:
-        """
-        Convert and validate XP module type input.
-
-        Args:
-            value: The input value to convert.
-            param: The Click parameter.
-            ctx: The Click context.
-
-        Returns:
-            Lowercase module type string if valid, None if input is None.
-        """
-        if value is None:
-            return value
-
-        # Convert to lower for comparison
-        normalized_value = value.lower()
-
-        if normalized_value in self.choices:
-            return normalized_value
-
-        # If not found, show error with available choices
-        choices_list = "\n".join(f" - {choice}" for choice in sorted(self.choices))
-        self.fail(
-            f"{value!r} is not a valid choice. " f"Choose from:\n{choices_list}",
-            param,
-            ctx,
-        )
-
-
-XP_MODULE_TYPE = XpModuleTypeChoice()

xp/services/conbus/msactiontable/__init__.py

@@ -1 +0,0 @@
-"""MsAction table services for Conbus."""

xp/services/conbus/msactiontable/msactiontable_upload_service.py

@@ -1,332 +0,0 @@
-"""Service for uploading MS action tables via Conbus protocol."""
-
-import logging
-from typing import Any, Optional, Union
-
-from psygnal import Signal
-
-from xp.models.config.conson_module_config import ConsonModuleListConfig
-from xp.models.protocol.conbus_protocol import TelegramReceivedEvent
-from xp.models.telegram.system_function import SystemFunction
-from xp.models.telegram.telegram_type import TelegramType
-from xp.services.actiontable.msactiontable_xp20_serializer import (
-    Xp20MsActionTableSerializer,
-)
-from xp.services.actiontable.msactiontable_xp24_serializer import (
-    Xp24MsActionTableSerializer,
-)
-from xp.services.actiontable.msactiontable_xp33_serializer import (
-    Xp33MsActionTableSerializer,
-)
-from xp.services.protocol.conbus_event_protocol import ConbusEventProtocol
-from xp.services.telegram.telegram_service import TelegramService
-
-
-class MsActionTableUploadError(Exception):
-    """Raised when MS action table upload operations fail."""
-
-    pass
-
-
-class MsActionTableUploadService:
-    """
-    TCP client service for uploading MS action tables to Conbus modules.
-
-    Manages TCP socket connections, handles telegram generation and transmission,
-    and processes server responses for MS action table uploads.
-
-    Attributes:
-        on_progress: Signal emitted with telegram frame when progress is made.
-        on_error: Signal emitted with error message string when an error occurs.
-        on_finish: Signal emitted with bool (True on success) when upload completes.
-    """
-
-    on_progress: Signal = Signal(str)
-    on_error: Signal = Signal(str)
-    on_finish: Signal = Signal(bool)  # True on success
-
-    def __init__(
-        self,
-        conbus_protocol: ConbusEventProtocol,
-        xp20ms_serializer: Xp20MsActionTableSerializer,
-        xp24ms_serializer: Xp24MsActionTableSerializer,
-        xp33ms_serializer: Xp33MsActionTableSerializer,
-        telegram_service: TelegramService,
-        conson_config: ConsonModuleListConfig,
-    ) -> None:
-        """
-        Initialize the MS action table upload service.
-
-        Args:
-            conbus_protocol: ConbusEventProtocol for communication.
-            xp20ms_serializer: XP20 MS action table serializer.
-            xp24ms_serializer: XP24 MS action table serializer.
-            xp33ms_serializer: XP33 MS action table serializer.
-            telegram_service: Telegram service for parsing.
-            conson_config: Conson module list configuration.
-        """
-        self.conbus_protocol = conbus_protocol
-        self.xp20ms_serializer = xp20ms_serializer
-        self.xp24ms_serializer = xp24ms_serializer
-        self.xp33ms_serializer = xp33ms_serializer
-        self.serializer: Union[
-            Xp20MsActionTableSerializer,
-            Xp24MsActionTableSerializer,
-            Xp33MsActionTableSerializer,
-        ] = xp20ms_serializer
-        self.telegram_service = telegram_service
-        self.conson_config = conson_config
-        self.serial_number: str = ""
-        self.xpmoduletype: str = ""
-
-        # Upload state
-        self.upload_data: str = ""
-        self.upload_initiated: bool = False
-
-        # Set up logging
-        self.logger = logging.getLogger(__name__)
-
-        # Connect protocol signals
-        self.conbus_protocol.on_connection_made.connect(self.connection_made)
-        self.conbus_protocol.on_telegram_sent.connect(self.telegram_sent)
-        self.conbus_protocol.on_telegram_received.connect(self.telegram_received)
-        self.conbus_protocol.on_timeout.connect(self.timeout)
-        self.conbus_protocol.on_failed.connect(self.failed)
-
-    def connection_made(self) -> None:
-        """Handle connection established event."""
-        self.logger.debug(
-            "Connection established, sending upload msactiontable telegram"
-        )
-        self.conbus_protocol.send_telegram(
-            telegram_type=TelegramType.SYSTEM,
-            serial_number=self.serial_number,
-            system_function=SystemFunction.UPLOAD_MSACTIONTABLE,
-            data_value="00",
-        )
-
-    def telegram_sent(self, telegram_sent: str) -> None:
-        """
-        Handle telegram sent event.
-
-        Args:
-            telegram_sent: The telegram that was sent.
-        """
-        self.logger.debug(f"Telegram sent: {telegram_sent}")
-
-    def telegram_received(self, telegram_received: TelegramReceivedEvent) -> None:
-        """
-        Handle telegram received event.
-
-        Args:
-            telegram_received: The telegram received event.
-        """
-        self.logger.debug(f"Telegram received: {telegram_received}")
-        if (
-            not telegram_received.checksum_valid
-            or telegram_received.telegram_type != TelegramType.REPLY.value
-            or telegram_received.serial_number != self.serial_number
-        ):
-            self.logger.debug("Not a reply response")
-            return
-
-        reply_telegram = self.telegram_service.parse_reply_telegram(
-            telegram_received.frame
-        )
-
-        self._handle_upload_response(reply_telegram)
-
-    def _handle_upload_response(self, reply_telegram: Any) -> None:
-        """
-        Handle telegram responses during upload.
-
-        Args:
-            reply_telegram: Parsed reply telegram.
-        """
-        if reply_telegram.system_function == SystemFunction.ACK:
-            self.logger.debug("Received ACK for upload")
-
-            if not self.upload_initiated:
-                # First ACK - send data chunk
-                self.logger.debug("Sending msactiontable data")
-                self.conbus_protocol.send_telegram(
-                    telegram_type=TelegramType.SYSTEM,
-                    serial_number=self.serial_number,
-                    system_function=SystemFunction.MSACTIONTABLE,
-                    data_value=self.upload_data,
-                )
-                self.upload_initiated = True
-                self.on_progress.emit(".")
-            else:
-                # Second ACK - send EOF
-                self.logger.debug("Data sent, sending EOF")
-                self.conbus_protocol.send_telegram(
-                    telegram_type=TelegramType.SYSTEM,
-                    serial_number=self.serial_number,
-                    system_function=SystemFunction.EOF,
-                    data_value="00",
-                )
-                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")
-        else:
-            self.logger.debug(f"Unexpected response during upload: {reply_telegram}")
-
-    def timeout(self) -> None:
-        """Handle timeout event."""
-        self.logger.debug("Upload timeout")
-        self.failed("Upload timeout")
-
-    def failed(self, message: str) -> None:
-        """
-        Handle failed connection event.
-
-        Args:
-            message: Failure message.
-        """
-        self.logger.debug(f"Failed: {message}")
-        self.on_error.emit(message)
-
-    def start(
-        self,
-        serial_number: str,
-        xpmoduletype: str,
-        timeout_seconds: Optional[float] = None,
-    ) -> None:
-        """
-        Upload MS action table to module.
-
-        Uploads the MS action table configuration to the specified module.
-
-        Args:
-            serial_number: Module serial number.
-            xpmoduletype: XP module type (xp20, xp24, xp33).
-            timeout_seconds: Optional timeout in seconds.
-
-        Raises:
-            MsActionTableUploadError: If configuration or validation errors occur.
-        """
-        self.logger.info("Starting msactiontable upload")
-        self.serial_number = serial_number
-        self.xpmoduletype = xpmoduletype
-
-        # Select serializer based on module type
-        if xpmoduletype == "xp20":
-            self.serializer = self.xp20ms_serializer
-            config_field = "xp20_msaction_table"
-        elif xpmoduletype == "xp24":
-            self.serializer = self.xp24ms_serializer
-            config_field = "xp24_msaction_table"
-        elif xpmoduletype == "xp33":
-            self.serializer = self.xp33ms_serializer
-            config_field = "xp33_msaction_table"
-        else:
-            raise MsActionTableUploadError(f"Unsupported module type: {xpmoduletype}")
-
-        if timeout_seconds:
-            self.conbus_protocol.timeout_seconds = timeout_seconds
-
-        # Find module
-        module = self.conson_config.find_module(serial_number)
-        if not module:
-            self.failed(f"Module {serial_number} not found in conson.yml")
-            return
-
-        # Validate module type matches
-        if module.module_type.lower() != xpmoduletype.lower():
-            self.failed(
-                f"Module type mismatch: module has type {module.module_type}, "
-                f"but {xpmoduletype} was specified"
-            )
-            return
-
-        # Get msactiontable config for the module type
-        msactiontable_config = getattr(module, config_field, None)
-
-        if not msactiontable_config:
-            self.failed(
-                f"Module {serial_number} does not have {config_field} configured in conson.yml"
-            )
-            return
-
-        if not isinstance(msactiontable_config, list) or len(msactiontable_config) == 0:
-            self.failed(
-                f"Module {serial_number} has empty {config_field} list in conson.yml"
-            )
-            return
-
-        # Parse MS action table from short format (first element)
-        try:
-            short_format = msactiontable_config
-            msactiontable: Union[
-                "Xp20MsActionTable", "Xp24MsActionTable", "Xp33MsActionTable"
-            ]
-            if xpmoduletype == "xp20":
-                from xp.models.actiontable.msactiontable_xp20 import Xp20MsActionTable
-
-                msactiontable = Xp20MsActionTable.from_short_format(short_format)
-            elif xpmoduletype == "xp24":
-                from xp.models.actiontable.msactiontable_xp24 import Xp24MsActionTable
-
-                msactiontable = Xp24MsActionTable.from_short_format(short_format)
-            elif xpmoduletype == "xp33":
-                from xp.models.actiontable.msactiontable_xp33 import Xp33MsActionTable
-
-                msactiontable = Xp33MsActionTable.from_short_format(short_format)
-        except (ValueError, AttributeError) as e:
-            self.logger.error(f"Invalid msactiontable format: {e}")
-            self.failed(f"Invalid msactiontable format: {e}")
-            return
-
-        # Serialize to telegram data (64 characters: AAAA + 64 data chars)
-        self.upload_data = "AAAA" + self.serializer.to_encoded_string(msactiontable)  # type: ignore[arg-type]
-
-        self.logger.debug(
-            f"Upload data encoded: {len(self.upload_data)} chars (single chunk)"
-        )
-
-    def set_timeout(self, timeout_seconds: float) -> None:
-        """
-        Set operation timeout.
-
-        Args:
-            timeout_seconds: Timeout in seconds.
-        """
-        self.conbus_protocol.timeout_seconds = timeout_seconds
-
-    def start_reactor(self) -> None:
-        """Start the reactor."""
-        self.conbus_protocol.start_reactor()
-
-    def stop_reactor(self) -> None:
-        """Stop the reactor."""
-        self.conbus_protocol.stop_reactor()
-
-    def __enter__(self) -> "MsActionTableUploadService":
-        """Enter context manager - reset state for singleton reuse.
-
-        Returns:
-            Self for context manager protocol.
-        """
-        # Reset state
-        self.upload_data = ""
-        self.upload_initiated = False
-        self.serial_number = ""
-        self.xpmoduletype = ""
-        return self
-
-    def __exit__(self, _exc_type: Any, _exc_val: Any, _exc_tb: Any) -> None:
-        """Exit context manager - cleanup signals and reactor."""
-        # Disconnect protocol signals
-        self.conbus_protocol.on_connection_made.disconnect(self.connection_made)
-        self.conbus_protocol.on_telegram_sent.disconnect(self.telegram_sent)
-        self.conbus_protocol.on_telegram_received.disconnect(self.telegram_received)
-        self.conbus_protocol.on_timeout.disconnect(self.timeout)
-        self.conbus_protocol.on_failed.disconnect(self.failed)
-        # Disconnect service signals
-        self.on_progress.disconnect()
-        self.on_error.disconnect()
-        self.on_finish.disconnect()
-        # Stop reactor
-        self.stop_reactor()