Return fixes

Author: bouwew

plugwise/constants.py

@@ -23,6 +23,7 @@
 PRESET_AWAY: Final = "away"
 PRESSURE_BAR: Final = "bar"
 SIGNAL_STRENGTH_DECIBELS_MILLIWATT: Final = "dBm"
+STATE_ON: Final = "on"
 TEMP_CELSIUS: Final = "°C"
 TEMP_KELVIN: Final = "°K"
 TIME_MILLISECONDS: Final = "ms"

plugwise/legacy/smile.py

@@ -18,6 +18,7 @@
     OFF,
     REQUIRE_APPLIANCES,
     RULES,
+    STATE_ON,
     GwEntityData,
     ThermoLoc,
 )
@@ -241,6 +242,7 @@ async def set_switch_state(
         For group switches, sets the state for each member in the group separately.
         For switch-locks, sets the lock state using a different data format.
         """
+        req_state = state == STATE_ON
         switch = Munch()
         switch.actuator = "actuator_functionalities"
         switch.func_type = "relay_functionality"
@@ -285,7 +287,7 @@ async def set_switch_state(
             return False
 
         await self.call_request(uri, method="put", data=data)
-        return True
+        return req_state
 
     async def _set_groupswitch_member_state(
         self, data: str, members: list[str], state: str, switch: Munch
@@ -294,12 +296,14 @@ async def _set_groupswitch_member_state(
 
         Set the given State of the relevant Switch (relay) within a group of members.
         """
+        switched = 0
         for member in members:
             if not self.gw_entities[member]["switches"]["lock"]:
                 uri = f"{APPLIANCES};id={member}/relay"
                 await self.call_request(uri, method="put", data=data)
+                switched += 1
 
-        return True
+        return switched > 0
 
     async def set_temperature(self, _: str, items: dict[str, float]) -> None:
         """Set the given Temperature on the relevant Thermostat."""

plugwise/smile.py

@@ -22,6 +22,7 @@
     NOTIFICATIONS,
     OFF,
     RULES,
+    STATE_ON,
     GwEntityData,
     ThermoLoc,
 )
@@ -379,6 +380,7 @@ async def set_switch_state(
         self, appl_id: str, members: list[str] | None, model: str, state: str
     ) -> bool:
         """Set the given State of the relevant Switch."""
+        req_state = state == STATE_ON
         switch = Munch()
         switch.actuator = "actuator_functionalities"
         switch.device = "relay"
@@ -423,7 +425,7 @@ async def set_switch_state(
             return False
 
         await self.call_request(uri, method="put", data=data)
-        return True
+        return req_state
 
     async def _set_groupswitch_member_state(
         self, members: list[str], state: str, switch: Munch
@@ -432,6 +434,7 @@ async def _set_groupswitch_member_state(
 
         Set the given State of the relevant Switch within a group of members.
         """
+        switched = 0
         for member in members:
             locator = f'appliance[@id="{member}"]/{switch.actuator}/{switch.func_type}'
             switch_id = self._domain_objects.find(locator).attrib["id"]
@@ -443,8 +446,9 @@ async def _set_groupswitch_member_state(
             )
             if not self.gw_entities[member]["switches"].get("lock"):
                 await self.call_request(uri, method="put", data=data)
+                switched += 1
 
-        return True
+        return switched > 0
 
     async def set_temperature(self, loc_id: str, items: dict[str, float]) -> None:
         """Set the given Temperature on the relevant Thermostat."""