Improve

Author: bouwew

plugwise/data.py

@@ -19,8 +19,6 @@
 from plugwise.helper import SmileHelper
 from plugwise.util import remove_empty_platform_dicts
 
-from packaging import version
-
 
 class SmileData(SmileHelper):
     """The Plugwise Smile main class."""
@@ -169,13 +167,9 @@ def _get_location_data(self, loc_id: str) -> GwEntityData:
             if str(ctrl_state) == "off":
                 data["control_state"] = "idle"
                 self._count += 1
-        # control_state not present in regulation_mode off (issue #776)
-        elif self.smile_version is not None and self.smile_version >= version.parse("3.2.0"):
-            data["control_state"] = "idle"
-            self._count += 1
 
-        # data.pop("setpoint")  # remove, only used in _control_state()
-        # 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

@@ -6,6 +6,7 @@
 
 import asyncio
 import datetime as dt
+from packaging import version
 from typing import cast
 
 from plugwise.common import SmileCommon
@@ -932,12 +933,17 @@ def _control_state(self, data: GwEntityData, loc_id: str) -> str:
             if (ctrl_state := location.find(locator)) is not None:
                 return ctrl_state.text
 
-        # Older Adam firmware does not have the control_state key
-        # Work around this by comparing the reported temperature and setpoint for a location
-        setpoint = data["setpoint"]
-        temperature = data["temperature"]
-        # No cooling available in older firmware
-        return "heating" if temperature < setpoint else "idle"
+        # control_state not present in regulation_mode off (issue #776)
+        if self.smile_version is not None:
+            if self.smile_version >= version.parse("3.2.0"):
+                return "off"
+
+            # Older Adam firmware does not have the control_state key
+            # Work around this by comparing the reported temperature and setpoint for a location
+            setpoint = data["sensors"]["setpoint"]
+            temperature = data["sensors"]["temperature"]
+            # No cooling available in older firmware
+            return "heating" if temperature < setpoint else "off"
 
     def _heating_valves(self) -> int | bool:
         """Helper-function for smile.py: _get_adam_data().