Correct switch state input

Author: bouwew

plugwise/legacy/smile.py

@@ -18,6 +18,7 @@
     OFF,
     REQUIRE_APPLIANCES,
     RULES,
+    STATE_ON,
     GwEntityData,
     ThermoLoc,
 )
@@ -241,7 +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 == "true"
+        req_state = state == STATE_ON
         switch = Munch()
         switch.actuator = "actuator_functionalities"
         switch.func_type = "relay_functionality"
@@ -251,7 +252,7 @@ async def set_switch_state(
 
         # Handle switch-lock
         if model == "lock":
-            state = "false" if state == "off" else "true"
+            state = "true" if state == STATE_ON else "false"
             appliance = self._appliances.find(f'appliance[@id="{appl_id}"]')
             appl_name = appliance.find("name").text
             appl_type = appliance.find("type").text
@@ -295,7 +296,7 @@ async def _set_groupswitch_member_state(
 
         Set the given State of the relevant Switch (relay) within a group of members.
         """
-        req_state = state == "true"
+        req_state = state == STATE_ON
         switched = 0
         for member in members:
             if not self.gw_entities[member]["switches"]["lock"]:

plugwise/smile.py

@@ -22,6 +22,7 @@
     NOTIFICATIONS,
     OFF,
     RULES,
+    STATE_ON,
     GwEntityData,
     ThermoLoc,
 )
@@ -379,7 +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 == "true"
+        req_state = state == STATE_ON
         switch = Munch()
         switch.actuator = "actuator_functionalities"
         switch.device = "relay"
@@ -397,7 +398,7 @@ async def set_switch_state(
 
         if model == "lock":
             switch.func = "lock"
-            state = "false" if state == "off" else "true"
+            state = "true" if state == STATE_ON else "false"
 
         if members is not None:
             return await self._set_groupswitch_member_state(members, state, switch)
@@ -433,7 +434,7 @@ async def _set_groupswitch_member_state(
 
         Set the given State of the relevant Switch within a group of members.
         """
-        req_state = state == "true"
+        req_state = state == STATE_ON
         switched = 0
         for member in members:
             locator = f'appliance[@id="{member}"]/{switch.actuator}/{switch.func_type}'

tests/test_init.py

@@ -684,9 +684,9 @@ async def tinker_switch(
         """Turn a Switch on and off to test functionality."""
         _LOGGER.info("Asserting modifying settings for switch devices:")
         _LOGGER.info("- Devices (%s):", dev_id)
-        convert = {"true": True, "false": False}
+        convert = {"on": True, "off": False}
         tinker_switch_passed = False
-        for new_state in ["false", "true", "false"]:
+        for new_state in ["off", "on", "off"]:
             _LOGGER.info("- Switching %s", new_state)
             try:
                 result = await smile.set_switch_state(dev_id, members, model, new_state)