simply again, separation between state and group is not for the module solve

Author: dirixmjm

plugwise_usb/api.py

@@ -53,8 +53,7 @@ class NodeFeature(str, Enum):
     RELAY = "relay"
     RELAY_INIT = "relay_init"
     RELAY_LOCK = "relay_lock"
-    SWITCH_GROUP_1 = "switch_group_1"
-    SWITCH_GROUP_2 = "switch_group_2"
+    SWITCH = "switch"
     SENSE = "sense"
     TEMPERATURE = "temperature"
 
@@ -87,8 +86,7 @@ class NodeType(Enum):
     NodeFeature.MOTION_CONFIG,
     NodeFeature.TEMPERATURE,
     NodeFeature.SENSE,
-    NodeFeature.SWITCH_GROUP_1,
-    NodeFeature.SWITCH_GROUP_2,
+    NodeFeature.SWITCH,
 )
 
 

plugwise_usb/nodes/helpers/firmware.py

@@ -168,8 +168,7 @@ class SupportedVersions(NamedTuple):
     NodeFeature.RELAY_LOCK: 2.0,
     NodeFeature.MOTION: 2.0,
     NodeFeature.MOTION_CONFIG: 2.0,
-    NodeFeature.SWITCH_GROUP_1: 2.0,
-    NodeFeature.SWITCH_GROUP_2: 2.0,
+    NodeFeature.SWITCH: 2.0,
 }
 
 # endregion

plugwise_usb/nodes/node.py

@@ -315,7 +315,7 @@ def relay_lock(self) -> RelayLock:
     @raise_not_loaded
     def switch(self) -> bool:
         """Switch button value."""
-        if NodeFeature.SWITCH_GROUP_1 not in self._features:
+        if NodeFeature.SWITCH not in self._features:
             raise FeatureError(f"Switch value is not supported for node {self.mac}")
         raise NotImplementedError()
 

plugwise_usb/nodes/switch.py

@@ -36,8 +36,7 @@ def __init__(
         """Initialize Scan Device."""
         super().__init__(mac, address, controller, loaded_callback)
         self._switch_subscription: Callable[[], None] | None = None
-        self._switch_group_1 = SwitchGroup()
-        self._switch_group_2 = SwitchGroup()
+        self._switch = SwitchGroup()
 
     async def load(self) -> bool:
         """Load and activate Switch node features."""
@@ -55,8 +54,7 @@ async def load(self) -> bool:
                 NodeFeature.BATTERY,
                 NodeFeature.INFO,
                 NodeFeature.PING,
-                NodeFeature.SWITCH_GROUP_1,
-                NodeFeature.SWITCH_GROUP_2,
+                NodeFeature.SWITCH,
             ),
         )
         if await self.initialize():
@@ -91,7 +89,7 @@ async def unload(self) -> None:
     @raise_not_loaded
     def switch(self) -> bool:
         """Current state of switch."""
-        return bool(self._switch_group_1.state)
+        return bool(self._switch.state)
 
     # endregion
 
@@ -118,22 +116,13 @@ async def _switch_state_update(
             self.name,
             switch_state,
         )
-        if switch_group == 1:
-            self._switch_group_1.state = switch_state
-            self._switch_group_1.group = switch_group
-            self._switch_group_1.timestampe = timestamp
+        self._switch.state = switch_state
+        self._switch.group = switch_group
+        self._switch.timestampe = timestamp
 
-            await self.publish_feature_update_to_subscribers(
-                NodeFeature.SWITCH_GROUP_1, self._switch_group_1
-            )
-        elif switch_group == 2:
-            self._switch_group_2.state = switch_state
-            self._switch_group_2.group = switch_group
-            self._switch_group_2.timestampe = timestamp
-
-            await self.publish_feature_update_to_subscribers(
-                NodeFeature.SWITCH_GROUP_2, self._switch_group_2
-            )
+        await self.publish_feature_update_to_subscribers(
+            NodeFeature.SWITCH, self._switch
+        )
 
     @raise_not_loaded
     async def get_state(self, features: tuple[NodeFeature]) -> dict[NodeFeature, Any]:
@@ -152,10 +141,8 @@ async def get_state(self, features: tuple[NodeFeature]) -> dict[NodeFeature, Any
                 )
 
             match feature:
-                case NodeFeature.SWITCH_GROUP_1:
-                    states[NodeFeature.SWITCH_GROUP_1] = self._switch_group_1
-                case NodeFeature.SWITCH_GROUP_2:
-                    states[NodeFeature.SWITCH_GROUP_2] = self._switch_group_2
+                case NodeFeature.SWITCH:
+                    states[NodeFeature.SWITCH] = self._switch
                 case _:
                     state_result = await super().get_state((feature,))
                     states[feature] = state_result[feature]

tests/test_usb.py

@@ -2363,8 +2363,7 @@ async def load_callback(event: pw_api.NodeEvent, mac: str) -> None:  # type: ign
                 pw_api.NodeFeature.BATTERY,
                 pw_api.NodeFeature.INFO,
                 pw_api.NodeFeature.PING,
-                pw_api.NodeFeature.SWITCH_GROUP_1,
-                pw_api.NodeFeature.SWITCH_GROUP_2,
+                pw_api.NodeFeature.SWITCH,
             )
         )
 
@@ -2373,8 +2372,7 @@ async def load_callback(event: pw_api.NodeEvent, mac: str) -> None:  # type: ign
                 pw_api.NodeFeature.AVAILABLE,
                 pw_api.NodeFeature.BATTERY,
                 pw_api.NodeFeature.INFO,
-                pw_api.NodeFeature.SWITCH_GROUP_1,
-                pw_api.NodeFeature.SWITCH_GROUP_2,
+                pw_api.NodeFeature.SWITCH,
             )
         )
         assert not state[pw_api.NodeFeature.AVAILABLE].state
@@ -2635,17 +2633,15 @@ async def test_node_discovery_and_load(  # noqa: PLR0915
                 pw_api.NodeFeature.BATTERY,
                 pw_api.NodeFeature.INFO,
                 pw_api.NodeFeature.PING,
-                pw_api.NodeFeature.SWITCH_GROUP_1,
-                pw_api.NodeFeature.SWITCH_GROUP_2,
+                pw_api.NodeFeature.SWITCH,
             )
         )
         state = await stick.nodes["8888888888888888"].get_state(
             (
                 pw_api.NodeFeature.AVAILABLE,
                 pw_api.NodeFeature.BATTERY,
                 pw_api.NodeFeature.INFO,
-                pw_api.NodeFeature.SWITCH_GROUP_1,
-                pw_api.NodeFeature.SWITCH_GROUP_2,
+                pw_api.NodeFeature.SWITCH,
             )
         )
         assert state[pw_api.NodeFeature.AVAILABLE].state