conson-xp 1.11.0__py3-none-any.whl → 1.15.0__py3-none-any.whl

{conson_xp-1.11.0.dist-info → conson_xp-1.15.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: conson-xp
-Version: 1.11.0
+Version: 1.15.0
 Summary: XP Protocol Communication Tools
 Author-Email: ldvchosal <ldvchosal@github.com>
 License: MIT License
@@ -316,6 +316,11 @@ xp conbus linknumber get
 xp conbus linknumber set
 
 
+xp conbus modulenumber
+xp conbus modulenumber get
+xp conbus modulenumber set
+
+
 xp conbus msactiontable
 xp conbus msactiontable download
 

{conson_xp-1.11.0.dist-info → conson_xp-1.15.0.dist-info}/RECORD

@@ -1,13 +1,13 @@
-conson_xp-1.11.0.dist-info/METADATA,sha256=fGKwcGHNxOkx1fqKtt_yiGvb2qdCzbv3mABmqZVQvZ0,9358
-conson_xp-1.11.0.dist-info/WHEEL,sha256=9P2ygRxDrTJz3gsagc0Z96ukrxjr-LFBGOgv3AuKlCA,90
-conson_xp-1.11.0.dist-info/entry_points.txt,sha256=1OcdIcDM1hz3ljCXgybaPUh1IOFEwkaTgLIW9u9zGeg,50
-conson_xp-1.11.0.dist-info/licenses/LICENSE,sha256=rxj6woMM-r3YCyGq_UHFtbh7kHTAJgrccH6O-33IDE4,1419
-xp/__init__.py,sha256=XSIJ1JlixN5N_iTzjciH-3DCu1QnEoPIUXf79udFESc,181
+conson_xp-1.15.0.dist-info/METADATA,sha256=1uDwWEJsmWvUk8RjzbLoPj0WrlRujgplsRRb5NHEJdU,9437
+conson_xp-1.15.0.dist-info/WHEEL,sha256=9P2ygRxDrTJz3gsagc0Z96ukrxjr-LFBGOgv3AuKlCA,90
+conson_xp-1.15.0.dist-info/entry_points.txt,sha256=1OcdIcDM1hz3ljCXgybaPUh1IOFEwkaTgLIW9u9zGeg,50
+conson_xp-1.15.0.dist-info/licenses/LICENSE,sha256=rxj6woMM-r3YCyGq_UHFtbh7kHTAJgrccH6O-33IDE4,1419
+xp/__init__.py,sha256=cQLZ0V5wACMFH4b8H0g8gWRKytLc5RdIi_JA8HVho6Q,181
 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/__init__.py,sha256=EGDWTEH_pCKIMWelnjhK4_PxBsvIH24rO9fz1nF1pKA,4638
 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.py,sha256=eqdY8ArapvD08Z4p7Xk7eh4z0dESHuMSw7PKtwTJRYU,3021
 xp/cli/commands/conbus/conbus_actiontable_commands.py,sha256=cdjLV9cnm7teEOlu5Jf1MS_aL7lNy8KiDIyjCQa5Nzw,7138
 xp/cli/commands/conbus/conbus_autoreport_commands.py,sha256=oZgyUUFNsb4yf2WO81l2w1PrasNwdC__QwxNkJ2jCaU,3794
 xp/cli/commands/conbus/conbus_blink_commands.py,sha256=UK-Ey4K0FvaPQ96U0gyMid236RlBmUhPNRes9y0SlkM,4848
@@ -16,7 +16,8 @@ xp/cli/commands/conbus/conbus_custom_commands.py,sha256=lICT93ijMdhVRm8KjNMLo7kQ
 xp/cli/commands/conbus/conbus_datapoint_commands.py,sha256=r36OuTjREtbGKL-bskAGa0-WLw7x06td6woZn3GYJNA,3630
 xp/cli/commands/conbus/conbus_discover_commands.py,sha256=Jt-OjARc-QXCr453bhKG0zXRqvOMVKZr328zNxSDulY,1373
 xp/cli/commands/conbus/conbus_lightlevel_commands.py,sha256=FpCwogdxa7yFUjlrxM7e8Q2Ut32tKAHabngQQChvtJI,6763
-xp/cli/commands/conbus/conbus_linknumber_commands.py,sha256=pn491Iy_LcwZ5XLtvNTWu8qG_Vdaaxr7le1tTuVK7Qw,3392
+xp/cli/commands/conbus/conbus_linknumber_commands.py,sha256=KitaGDM5HpwVUz8rLpO8VZUypUTcAg3Bzl0DVm6gnSk,3391
+xp/cli/commands/conbus/conbus_modulenumber_commands.py,sha256=L7-6y3rDllOjQ9g6Bk_RiTKIhAOHVPLdxWif9exkngs,3463
 xp/cli/commands/conbus/conbus_msactiontable_commands.py,sha256=fb9MQ4O04H0Dinpt7vSF5GtfntTZHelQ5TuUmSBbCTg,2899
 xp/cli/commands/conbus/conbus_output_commands.py,sha256=zdRVbHzVhMbZpG2x5WXtujc3wKTsoQUV4IgkVIbJbCc,5019
 xp/cli/commands/conbus/conbus_raw_commands.py,sha256=8BKUarwvHgz-sxML7n99YVsb8B1HJNExjQpRsuY_tQw,1829
@@ -73,11 +74,11 @@ xp/models/conbus/conbus_receive.py,sha256=-1u1qK-texfKCNZV-GYf_9KyLtJdIrx7HuZsKz
 xp/models/conbus/conbus_writeconfig.py,sha256=z8fdJeFLyGJW7UMHcHxGrHIMS6gG1D3aXeYUkBuwnEg,2136
 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_config.py,sha256=Y_k92PsKHFBnn3r1_RSZHJP5uLH27Gw8G7Bj5N8jvUE,2904
 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
+xp/models/protocol/conbus_protocol.py,sha256=igRgnbfjhnmNZG6kqQw4un433EpKTMXR13MJW151_7U,9041
 xp/models/response.py,sha256=h6_B1k_v6IrWhgNWBohEGQGRCp5TcVhgQ3RJS8gTkhY,1230
 xp/models/telegram/__init__.py,sha256=-_exhjlRLbBNuPxHC4tLA2SAgf8M0yHJMeyEoQIk9PI,53
 xp/models/telegram/action_type.py,sha256=vkw_chTgmsadksGXvZ9D_qYGpjOwCw-OgbEi8Bml17g,783
@@ -120,20 +121,20 @@ xp/services/conbus/conbus_output_service.py,sha256=mHFOAPx2zo0TStZ3pokp6v94AQjIa
 xp/services/conbus/conbus_raw_service.py,sha256=4yZLLTIAOxpgByUTWZXw1ihGa6Xtl98ckj9T7VfprDI,4335
 xp/services/conbus/conbus_receive_service.py,sha256=frXrS0OyKKvYYQTWdma21Kd0BKw5aSuHn3ZXTTqOaj0,3953
 xp/services/conbus/conbus_scan_service.py,sha256=tHJ5qaxcNXxAZb2D2F1v6IrzydfxjJOYllM6Txt1eBE,5176
-xp/services/conbus/write_config_service.py,sha256=qe5TwQdVnMCcJ4lCeZLADdUeoDpbEaV3XoZ19a3F_qk,7128
+xp/services/conbus/write_config_service.py,sha256=6feNdixI_Nli4MRLe15nea-7gTEXMUwZIvTqv_1OqHI,7157
 xp/services/homekit/__init__.py,sha256=xAMKmln_AmEFdOOJGKWYi96seRlKDQpKx3-hm7XbdIo,36
 xp/services/homekit/homekit_cache_service.py,sha256=NdijyH5_iyhsTHBb-OyT8Y2xnNDj8F5MP8neoVQ26hY,11010
-xp/services/homekit/homekit_conbus_service.py,sha256=EYhYqGISPxUB6QrMDLWRPOA4S8f9AgJf0D_BKqXlGLA,3482
+xp/services/homekit/homekit_conbus_service.py,sha256=porvo4nZ4PE0R6bdaKwClDW2kevkW_8DOzw4NOO6DZQ,3348
 xp/services/homekit/homekit_config_validator.py,sha256=1jCUrfMUqthEoNc7wAk4io1PpbptqgsdnCOCzz62Io8,10732
 xp/services/homekit/homekit_conson_validator.py,sha256=V_Otxu0q3LK-3GP3-Zw0nZyV_rb9RjHp4tWcvzYJeGs,3787
 xp/services/homekit/homekit_dimminglight.py,sha256=O5SwnhkrJQHm7BopI9nL9QcfRSokcxn-H4csZMg0B5c,5770
 xp/services/homekit/homekit_dimminglight_service.py,sha256=lxFE2k8a8V9YQwpWPAAmbUvYD3zDlVa337xzDQl6tjM,5231
 xp/services/homekit/homekit_hap_service.py,sha256=YrFe10XPBf6EC2SRnWmcCbjdVkrHjxSNPwYDPVvQiDQ,12527
 xp/services/homekit/homekit_lightbulb.py,sha256=7HGMIPwEcmvSs89ENcDhdb8g0R9WMq7115gYuwcskAs,3661
-xp/services/homekit/homekit_lightbulb_service.py,sha256=pyRyxrNQqTW79rmGagItNpz7AMXTbBQL_l1o5VXTRn8,2652
+xp/services/homekit/homekit_lightbulb_service.py,sha256=G_ummBFiBurhQ2ZVwJ9l_aZ2MQgl5Uq-oi3KjIrdb-Y,2752
 xp/services/homekit/homekit_module_service.py,sha256=7lanEinxAfTdn28ZHV-O5YyTqq_3v8FIyP2FI0jsEQM,1526
 xp/services/homekit/homekit_outlet.py,sha256=_Glfytfmvydz9TEn69N6bw3Ux0Y-EMw2eJPgeborkoA,5268
-xp/services/homekit/homekit_outlet_service.py,sha256=mDvSv9_69Z6jGUBHixmBm7giDCVYtLOWtMZqYjBgUdE,3698
+xp/services/homekit/homekit_outlet_service.py,sha256=y7DbWbbvihWwF1Gyl0l9Hup1JHin6PTlDEHdoIqTfEQ,3798
 xp/services/homekit/homekit_service.py,sha256=0lW-hg40ETco3gDBEYkR_sX-UIYsLSKCD4NWruLXUM8,14031
 xp/services/log_file_service.py,sha256=fvPcZQj8XOKUA-4ep5R8n0PelvwvRlTLlVxvIWM5KR4,10506
 xp/services/module_type_service.py,sha256=xWhr1EAZMykL5uNWHWdpa5T8yNruGKH43XRTOS8GwZg,7477
@@ -155,7 +156,7 @@ xp/services/server/xp33_server_service.py,sha256=X5BJr7RYueHAPNrfW-HnqV7ZN-OAouK
 xp/services/telegram/__init__.py,sha256=kv0JgMg13Fp18WgGQpalNRAWwiWbrz18X4kZAP9xpSQ,48
 xp/services/telegram/telegram_blink_service.py,sha256=Xctc9mCSZiiW1YTh8cA-4jlc8fTioS5OxT6ymhSqiYI,4487
 xp/services/telegram/telegram_checksum_service.py,sha256=rp_C5PlraOOIyqZDp9XjBBNZLUeBLdQNNHVpN6D-1v8,4729
-xp/services/telegram/telegram_datapoint_service.py,sha256=A3ERuFSWc22uJUoymH-2dWkt2_AfUvJcLQ1iy8ZbO0s,2399
+xp/services/telegram/telegram_datapoint_service.py,sha256=iZ-zp_EM_1ouyeTbd2erhIY2x-98nEHveWWN_a9NfFU,2750
 xp/services/telegram/telegram_discover_service.py,sha256=oTpiq-yzP_UmC0xVOMMFeHO-rIlK1pF3aG-Kq4SeiBI,9025
 xp/services/telegram/telegram_link_number_service.py,sha256=1_c-_QCRPTHYn3BmMElrBJqGG6vnoIst8CB-N42hazk,6862
 xp/services/telegram/telegram_output_service.py,sha256=UaUv_14fR8o5K2PxQBXrCzx-Hohnk-gzbev_oLw_Clc,10799
@@ -163,8 +164,8 @@ xp/services/telegram/telegram_service.py,sha256=XrP1CPi0ckxoKBaNwLA6lo-TogWxXgmX
 xp/services/telegram/telegram_version_service.py,sha256=M5HdOTsLdcwo122FP-jW6R740ktLrtKf2TiMDVz23h8,10528
 xp/utils/__init__.py,sha256=_avMF_UOkfR3tNeDIPqQ5odmbq5raKkaq1rZ9Cn1CJs,332
 xp/utils/checksum.py,sha256=HDpiQxmdIedbCbZ4o_Box0i_Zig417BtCV_46ZyhiTk,1711
-xp/utils/dependencies.py,sha256=xUmk4XWGArR5__kHdEG1Y4K_dHxsP5mkXhwon_SW6Eo,20110
+xp/utils/dependencies.py,sha256=ibTkpQ7nak2ioqlPtb7yCqBJ9tl3NHSxDdODtUItbCg,20281
 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.11.0.dist-info/RECORD,,
+conson_xp-1.15.0.dist-info/RECORD,,

xp/__init__.py

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

xp/cli/commands/__init__.py

@@ -10,6 +10,7 @@ from xp.cli.commands.conbus.conbus import (
     conbus_datapoint,
     conbus_lightlevel,
     conbus_linknumber,
+    conbus_modulenumber,
     conbus_msactiontable,
     conbus_output,
 )
@@ -46,6 +47,10 @@ from xp.cli.commands.conbus.conbus_linknumber_commands import (
     get_linknumber_command,
     set_linknumber_command,
 )
+from xp.cli.commands.conbus.conbus_modulenumber_commands import (
+    get_modulenumber_command,
+    set_modulenumber_command,
+)
 from xp.cli.commands.conbus.conbus_msactiontable_commands import (
     conbus_download_msactiontable,
 )
@@ -87,6 +92,7 @@ __all__ = [
     "conbus_output",
     "conbus_datapoint",
     "conbus_linknumber",
+    "conbus_modulenumber",
     "conbus_autoreport",
     "conbus_lightlevel",
     "conbus_msactiontable",
@@ -123,6 +129,8 @@ __all__ = [
     "receive_telegrams",
     "set_linknumber_command",
     "get_linknumber_command",
+    "set_modulenumber_command",
+    "get_modulenumber_command",
     "get_autoreport_command",
     "set_autoreport_command",
     "xp_lightlevel_set",

xp/cli/commands/conbus/conbus.py

@@ -57,6 +57,18 @@ def conbus_linknumber() -> None:
     pass
 
 
+@click.group(
+    "modulenumber",
+    cls=HelpColorsGroup,
+    help_headers_color="yellow",
+    help_options_color="green",
+    short_help="Module number operations",
+)
+def conbus_modulenumber() -> None:
+    """Set or get the module number for specific modules."""
+    pass
+
+
 @click.group(
     "autoreport",
     cls=HelpColorsGroup,
@@ -109,6 +121,7 @@ conbus.add_command(conbus_blink)
 conbus.add_command(conbus_output)
 conbus.add_command(conbus_datapoint)
 conbus.add_command(conbus_linknumber)
+conbus.add_command(conbus_modulenumber)
 conbus.add_command(conbus_autoreport)
 conbus.add_command(conbus_lightlevel)
 conbus.add_command(conbus_msactiontable)

xp/cli/commands/conbus/conbus_linknumber_commands.py

@@ -49,7 +49,7 @@ def set_linknumber_command(
         ctx.obj.get("container").get_container().resolve(WriteConfigService)
     )
 
-    data_value = f"{link_number: 02d}"
+    data_value = f"{link_number:02d}"
     with service:
         service.write_config(
             serial_number=serial_number,

xp/cli/commands/conbus/conbus_modulenumber_commands.py

@@ -0,0 +1,104 @@
+"""Conbus module number CLI commands."""
+
+import json
+
+import click
+
+from xp.cli.commands.conbus.conbus import conbus_modulenumber
+from xp.cli.utils.decorators import (
+    connection_command,
+)
+from xp.cli.utils.serial_number_type import SERIAL
+from xp.models import ConbusDatapointResponse
+from xp.models.conbus.conbus_writeconfig import ConbusWriteConfigResponse
+from xp.models.telegram.datapoint_type import DataPointType
+from xp.services.conbus.conbus_datapoint_service import ConbusDatapointService
+from xp.services.conbus.write_config_service import WriteConfigService
+from xp.services.telegram.telegram_datapoint_service import TelegramDatapointService
+
+
+@conbus_modulenumber.command("set", short_help="Set module number for a module")
+@click.argument("serial_number", type=SERIAL)
+@click.argument("module_number", type=click.IntRange(0, 99))
+@click.pass_context
+@connection_command()
+def set_modulenumber_command(
+    ctx: click.Context, serial_number: str, module_number: int
+) -> None:
+    r"""Set the module number for a specific module.
+
+    Args:
+        ctx: Click context object.
+        serial_number: 10-digit module serial number.
+        module_number: Module number to set (0-99).
+
+    Examples:
+        \b
+        xp conbus modulenumber set 0123450001 25
+    """
+
+    def on_finish(response: "ConbusWriteConfigResponse") -> None:
+        """Handle successful completion of light level on command.
+
+        Args:
+            response: Light level response object.
+        """
+        click.echo(json.dumps(response.to_dict(), indent=2))
+
+    service: WriteConfigService = (
+        ctx.obj.get("container").get_container().resolve(WriteConfigService)
+    )
+
+    data_value = f"{module_number:02d}"
+    with service:
+        service.write_config(
+            serial_number=serial_number,
+            datapoint_type=DataPointType.MODULE_NUMBER,
+            data_value=data_value,
+            finish_callback=on_finish,
+            timeout_seconds=0.5,
+        )
+
+
+@conbus_modulenumber.command("get", short_help="Get module number for a module")
+@click.argument("serial_number", type=SERIAL)
+@click.pass_context
+@connection_command()
+def get_modulenumber_command(ctx: click.Context, serial_number: str) -> None:
+    r"""Get the current module number for a specific module.
+
+    Args:
+        ctx: Click context object.
+        serial_number: 10-digit module serial number.
+
+    Examples:
+        \b
+        xp conbus modulenumber get 0123450001
+    """
+    service: ConbusDatapointService = (
+        ctx.obj.get("container").get_container().resolve(ConbusDatapointService)
+    )
+    telegram_service: TelegramDatapointService = (
+        ctx.obj.get("container").get_container().resolve(TelegramDatapointService)
+    )
+
+    def on_finish(service_response: ConbusDatapointResponse) -> None:
+        """Handle successful completion of module number get command.
+
+        Args:
+            service_response: Module number response object.
+        """
+        modulenumber_value = telegram_service.get_modulenumber(
+            service_response.data_value
+        )
+        result = service_response.to_dict()
+        result["modulenumber_value"] = modulenumber_value
+        click.echo(json.dumps(result, indent=2))
+
+    with service:
+        service.query_datapoint(
+            serial_number=serial_number,
+            datapoint_type=DataPointType.MODULE_NUMBER,
+            finish_callback=on_finish,
+            timeout_seconds=0.5,
+        )

xp/models/homekit/homekit_config.py

@@ -55,6 +55,8 @@ class HomekitAccessoryConfig(BaseModel):
         output_number: Output number for the accessory.
         description: Description of the accessory.
         service: Service type for the accessory.
+        on_action: on code for the accessory.
+        off_action: off code for the accessory.
         hap_accessory: Optional HAP accessory identifier.
     """
 
@@ -64,6 +66,8 @@ class HomekitAccessoryConfig(BaseModel):
     output_number: int
     description: str
     service: str
+    on_action: str
+    off_action: str
     hap_accessory: Optional[int] = None
 
 

xp/models/protocol/conbus_protocol.py

@@ -61,11 +61,15 @@ class SendActionEvent(BaseEvent):
         serial_number: Serial number of the light bulb set.
         output_number: Output number of the light bulb set.
         value: Set light bulb On or Off (True/False).
+        on_action: On action E00L00I00.
+        off_action: On action E00L00I04.
     """
 
     serial_number: str = Field(description="Serial number of the light bulb set")
     output_number: int = Field(description="Output number of the light bulb set")
     value: bool = Field(description="Set light bulb On or Off (True/False)")
+    on_action: str = Field(description="on action")
+    off_action: str = Field(description="off action")
 
 
 class DatapointEvent(BaseEvent):

xp/services/conbus/write_config_service.py

@@ -165,6 +165,7 @@ class WriteConfigService(ConbusProtocol):
         self.write_config_response.data_value = self.data_value
         if self.write_config_finished_callback:
             self.write_config_finished_callback(self.write_config_response)
+        self._stop_reactor()
 
     def write_config(
         self,

xp/services/homekit/homekit_conbus_service.py

@@ -12,7 +12,6 @@ from xp.models.protocol.conbus_protocol import (
     SendActionEvent,
     SendWriteConfigEvent,
 )
-from xp.models.telegram.action_type import ActionType
 from xp.models.telegram.datapoint_type import DataPointType
 from xp.models.telegram.system_function import SystemFunction
 from xp.services.protocol.telegram_protocol import TelegramProtocol
@@ -87,11 +86,8 @@ class HomeKitConbusService:
         """
         self.logger.debug(f"send_action_event {event}")
 
-        action_value = (
-            ActionType.ON_RELEASE.value if event.value else ActionType.OFF_PRESS.value
-        )
-        input_action = f"{event.output_number:02d}{action_value}"
-        telegram = (
-            f"S{event.serial_number}F{SystemFunction.ACTION.value}D{input_action}"
-        )
-        self.telegram_protocol.sendFrame(telegram.encode())
+        telegram = event.on_action if event.value else event.off_action
+        telegram_make = f"{telegram}M"
+        telegram_break = f"{telegram}B"
+        self.telegram_protocol.sendFrame(telegram_make.encode())
+        self.telegram_protocol.sendFrame(telegram_break.encode())

xp/services/homekit/homekit_lightbulb_service.py

@@ -77,6 +77,8 @@ class HomeKitLightbulbService:
             serial_number=event.serial_number,
             output_number=event.output_number,
             value=event.value,
+            on_action=event.accessory.on_action,
+            off_action=event.accessory.off_action,
         )
 
         self.logger.debug(f"Dispatching SendActionEvent for {event.serial_number}")

xp/services/homekit/homekit_outlet_service.py

@@ -85,6 +85,8 @@ class HomeKitOutletService:
             serial_number=event.serial_number,
             output_number=event.output_number,
             value=event.value,
+            on_action=event.accessory.on_action,
+            off_action=event.accessory.off_action,
         )
 
         self.logger.debug(f"Dispatching SendActionEvent for {event.serial_number}")

xp/services/telegram/telegram_datapoint_service.py

@@ -68,3 +68,15 @@ class TelegramDatapointService:
         """
         link_number_value = int(data_value)
         return link_number_value
+
+    def get_modulenumber(self, data_value: str) -> int:
+        """Parse and return the module number value.
+
+        Args:
+            data_value: The raw module number data value as a string.
+
+        Returns:
+            The module number as an integer.
+        """
+        module_number_value = int(data_value)
+        return module_number_value

xp/utils/dependencies.py

@@ -64,6 +64,7 @@ from xp.services.reverse_proxy_service import ReverseProxyService
 from xp.services.server.device_service_factory import DeviceServiceFactory
 from xp.services.server.server_service import ServerService
 from xp.services.telegram.telegram_blink_service import TelegramBlinkService
+from xp.services.telegram.telegram_datapoint_service import TelegramDatapointService
 from xp.services.telegram.telegram_discover_service import TelegramDiscoverService
 from xp.services.telegram.telegram_link_number_service import LinkNumberService
 from xp.services.telegram.telegram_output_service import TelegramOutputService
@@ -128,6 +129,7 @@ class ServiceContainer:
         )
         self.container.register(TelegramDiscoverService, scope=punq.Scope.singleton)
         self.container.register(TelegramBlinkService, scope=punq.Scope.singleton)
+        self.container.register(TelegramDatapointService, scope=punq.Scope.singleton)
         self.container.register(LinkNumberService, scope=punq.Scope.singleton)
 
         # Conbus services layer