Move removal of setpoint

Author: bouwew

plugwise/data.py

@@ -168,9 +168,6 @@ def _get_location_data(self, loc_id: str) -> GwEntityData:
                 data["control_state"] = "idle"
                 self._count += 1
 
-        data["sensors"].pop("setpoint")  # remove, only used in _control_state()
-        self._count -= 1
-
         # Thermostat data (presets, temperatures etc)
         self._climate_data(loc_id, zone, data)
 

plugwise/helper.py

@@ -940,6 +940,9 @@ def _control_state(self, data: GwEntityData, loc_id: str) -> str | bool:
             # Work around this by comparing the reported temperature and setpoint for a location
             setpoint = data["sensors"]["setpoint"]
             temperature = data["sensors"]["temperature"]
+            data["sensors"].pop("setpoint")  # remove, only used here
+            self._count -= 1
+
             # No cooling available in older firmware
             return "heating" if temperature < setpoint else "off"