Clean up

Author: bouwew

plugwise/data.py

@@ -163,12 +163,12 @@ def _get_location_data(self, loc_id: str) -> GwEntityData:
         data = self._get_zone_data(loc_id)
         data["control_state"] = "idle"
         self._count += 1
-        if (ctrl_state := self._control_state(data, loc_id)) and str(ctrl_state) in (
+        if (ctrl_state := self._control_state(data)) and ctrl_state in (
             "cooling",
             "heating",
             "preheating",
         ):
-            data["control_state"] = str(ctrl_state)
+            data["control_state"] = ctrl_state
 
         if "setpoint" in data["sensors"]:
             data["sensors"].pop("setpoint")  # remove, only used in _control_state()

plugwise/helper.py

@@ -790,7 +790,7 @@ def _rank_thermostat(
             else:
                 thermo_loc["secondary"].append(appliance_id)
 
-    def _control_state(self, data: GwEntityData, loc_id: str) -> str | bool:
+    def _control_state(self, data: GwEntityData) -> str | bool:
         """Helper-function for _get_adam_data().
 
         Adam: find the thermostat control_state of a location, from DOMAIN_OBJECTS.