conson-xp 1.14.0__tar.gz → 1.15.0__tar.gz

{conson_xp-1.14.0 → conson_xp-1.15.0}/PKG-INFO

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

{conson_xp-1.14.0 → conson_xp-1.15.0}/pyproject.toml

@@ -20,7 +20,7 @@ dependencies = [
 ]
 requires-python = ">=3.11"
 readme = "README.md"
-version = "1.14.0"
+version = "1.15.0"
 
 [project.license]
 file = "LICENSE"

{conson_xp-1.14.0 → conson_xp-1.15.0}/src/xp/__init__.py

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

{conson_xp-1.14.0 → conson_xp-1.15.0}/src/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
 
 

{conson_xp-1.14.0 → conson_xp-1.15.0}/src/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):

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

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

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

{conson_xp-1.14.0 → conson_xp-1.15.0}/tests/integration/test_homekit_config_integration.py

@@ -102,6 +102,8 @@ class TestHomekitConfigIntegration:
                     "output_number": 1,
                     "description": "Main Living Room Light",
                     "service": "lightbulb",
+                    "on_action": "E00L01I01",
+                    "off_action": "E00L01I05",
                 },
                 {
                     "name": "side_lamp",
@@ -110,6 +112,8 @@ class TestHomekitConfigIntegration:
                     "output_number": 2,
                     "description": "Side Lamp",
                     "service": "lightbulb",
+                    "on_action": "E00L01I02",
+                    "off_action": "E00L01I06",
                 },
                 {
                     "name": "kitchen_light",
@@ -118,6 +122,8 @@ class TestHomekitConfigIntegration:
                     "output_number": 1,
                     "description": "Kitchen Light",
                     "service": "lightbulb",
+                    "on_action": "E00L02I01",
+                    "off_action": "E00L02I05",
                 },
             ],
         }
@@ -194,6 +200,8 @@ class TestHomekitConfigIntegration:
                     "output_number": 0,  # Invalid output
                     "description": "Main Light",
                     "service": "invalid_service",  # Invalid service
+                    "on_action": "E00L01I01",
+                    "off_action": "E00L01I05",
                 },
                 {
                     "name": "main_light",  # Duplicate accessory name
@@ -202,6 +210,8 @@ class TestHomekitConfigIntegration:
                     "output_number": 50,  # Output exceeds module capability
                     "description": "Duplicate Light",
                     "service": "lightbulb",
+                    "on_action": "E00L01I02",
+                    "off_action": "E00L01I06",
                 },
                 {
                     "name": "orphaned_light",  # Not assigned to any room
@@ -210,6 +220,8 @@ class TestHomekitConfigIntegration:
                     "output_number": 3,
                     "description": "Orphaned Light",
                     "service": "lightbulb",
+                    "on_action": "E00L01I03",
+                    "off_action": "E00L01I07",
                 },
             ],
         }

{conson_xp-1.14.0 → conson_xp-1.15.0}/tests/unit/test_services/test_homekit_config_validator.py

@@ -41,6 +41,8 @@ class TestHomekitConfigValidator:
                     output_number=1,
                     description="Light 1",
                     service="lightbulb",
+                    on_action="E00L01I01",
+                    off_action="E00L01I05",
                 ),
                 HomekitAccessoryConfig(
                     name="light2",
@@ -49,6 +51,8 @@ class TestHomekitConfigValidator:
                     output_number=2,
                     description="Light 2",
                     service="lightbulb",
+                    on_action="E00L01I02",
+                    off_action="E00L01I06",
                 ),
             ]
 
@@ -82,6 +86,8 @@ class TestHomekitConfigValidator:
                 output_number=1,
                 description="Light 1",
                 service="lightbulb",
+                on_action="E00L01I01",
+                off_action="E00L01I05",
             ),
             HomekitAccessoryConfig(
                 name="light1",
@@ -90,6 +96,8 @@ class TestHomekitConfigValidator:
                 output_number=2,
                 description="Light 2",
                 service="lightbulb",
+                on_action="E00L01I02",
+                off_action="E00L01I06",
             ),
         ]
         config = self.create_test_homekit_config(accessories=accessories)
@@ -113,6 +121,8 @@ class TestHomekitConfigValidator:
                 output_number=1,
                 description="Light 1",
                 service="invalid_service",
+                on_action="E00L01I01",
+                off_action="E00L01I05",
             )
         ]
         config = self.create_test_homekit_config(accessories=accessories)
@@ -136,6 +146,8 @@ class TestHomekitConfigValidator:
                 output_number=0,
                 description="Light 1",
                 service="lightbulb",
+                on_action="E00L01I01",
+                off_action="E00L01I05",
             ),
             HomekitAccessoryConfig(
                 name="light2",
@@ -144,6 +156,8 @@ class TestHomekitConfigValidator:
                 output_number=-1,
                 description="Light 2",
                 service="lightbulb",
+                on_action="E00L01I02",
+                off_action="E00L01I06",
             ),
         ]
         config = self.create_test_homekit_config(accessories=accessories)
@@ -207,6 +221,8 @@ class TestHomekitConfigValidator:
                 output_number=1,
                 description="Light 1",
                 service="lightbulb",
+                on_action="E00L01I01",
+                off_action="E00L01I05",
             ),
             HomekitAccessoryConfig(
                 name="orphaned_light",
@@ -215,6 +231,8 @@ class TestHomekitConfigValidator:
                 output_number=2,
                 description="Orphaned",
                 service="lightbulb",
+                on_action="E00L01I02",
+                off_action="E00L01I06",
             ),
         ]
         rooms = [RoomConfig(name="Living Room", accessories=["light1"])]
@@ -233,6 +251,8 @@ class TestHomekitConfigValidator:
                 output_number=1,
                 description="Light 1",
                 service="lightbulb",
+                on_action="E00L01I01",
+                off_action="E00L01I05",
             ),
             HomekitAccessoryConfig(
                 name="light2",
@@ -241,6 +261,8 @@ class TestHomekitConfigValidator:
                 output_number=2,
                 description="Light 2",
                 service="lightbulb",
+                on_action="E00L01I02",
+                off_action="E00L01I06",
             ),
         ]
         rooms = [
@@ -263,6 +285,8 @@ class TestHomekitConfigValidator:
                 output_number=1,
                 description="Light 1",
                 service="lightbulb",
+                on_action="E00L01I01",
+                off_action="E00L01I05",
             )
         ]
         rooms = [
@@ -316,6 +340,8 @@ class TestCrossReferenceValidator:
                 output_number=1,
                 description="Light 1",
                 service="lightbulb",
+                on_action="E00L01I01",
+                off_action="E00L01I05",
             ),
             HomekitAccessoryConfig(
                 name="light2",
@@ -324,6 +350,8 @@ class TestCrossReferenceValidator:
                 output_number=1,
                 description="Light 2",
                 service="lightbulb",
+                on_action="E00L02I01",
+                off_action="E00L02I05",
             ),
         ]
         rooms = [RoomConfig(name="Living Room", accessories=["light1", "light2"])]
@@ -361,6 +389,8 @@ class TestCrossReferenceValidator:
             output_number=1,
             description="Invalid",
             service="lightbulb",
+            on_action="E00L03I01",
+            off_action="E00L03I05",
         )
         homekit_validator.config.accessories.append(invalid_accessory)
 
@@ -394,6 +424,8 @@ class TestCrossReferenceValidator:
             output_number=20,
             description="High Output",
             service="lightbulb",
+            on_action="E00L02I09",
+            off_action="E00L02I13",
         )
         homekit_validator.config.accessories.append(high_output_accessory)
 
@@ -425,6 +457,8 @@ class TestCrossReferenceValidator:
                 output_number=1,
                 description="Invalid Serial",
                 service="lightbulb",
+                on_action="E00L03I01",
+                off_action="E00L03I05",
             ),
             HomekitAccessoryConfig(
                 name="invalid_output",
@@ -433,6 +467,8 @@ class TestCrossReferenceValidator:
                 output_number=20,
                 description="Invalid Output",
                 service="lightbulb",
+                on_action="E00L02I09",
+                off_action="E00L02I13",
             ),
         ]
         homekit_validator.config.accessories.extend(invalid_accessories)

{conson_xp-1.14.0 → conson_xp-1.15.0}/tests/unit/test_services/test_homekit_services.py

@@ -68,6 +68,8 @@ def mock_accessory():
         output_number=2,
         description="Test Description",
         service="lightbulb",
+        on_action="E00L01I01",
+        off_action="E00L01I05",
     )
 
 
@@ -357,23 +359,33 @@ class TestHomeKitConbusService:
 
     def test_handle_send_action_event_on(self, mock_module, mock_accessory):
         """Test handle_send_action_event for turning on."""
-        event = SendActionEvent(serial_number="1234567890", output_number=2, value=True)
+        event = SendActionEvent(
+            serial_number="1234567890",
+            output_number=2,
+            value=True,
+            on_action="E00L04I02",
+            off_action="E00L04I06",
+        )
 
         self.service.handle_send_action_event(event)
 
         sent_data = self.telegram_protocol.sendFrame.call_args[0][0]
-        assert sent_data == b"S1234567890F27D02AB"  # ON_RELEASE action
+        assert sent_data == b"E00L04I02B"  # ON action code
 
     def test_handle_send_action_event_off(self, mock_module, mock_accessory):
         """Test handle_send_action_event for turning off."""
         event = SendActionEvent(
-            serial_number="1234567890", output_number=5, value=False
+            serial_number="1234567890",
+            output_number=5,
+            value=False,
+            on_action="E00L05I05",
+            off_action="E00L05I09",
         )
 
         self.service.handle_send_action_event(event)
 
         sent_data = self.telegram_protocol.sendFrame.call_args[0][0]
-        assert sent_data == b"S1234567890F27D05AA"  # OFF_PRESS action
+        assert sent_data == b"E00L05I09B"  # OFF action code
 
 
 class TestHomeKitService: