Add ThermoZone for Anna

Author: bouwew

plugwise/data.py

@@ -35,7 +35,7 @@ def _all_entity_data(self) -> None:
         Collect data for each entity and add to self.gw_entities.
         """
         self._update_gw_entities()
-        if self.check_name(ADAM):
+        if self._is_thermostat:
             self._update_zones()
             self.gw_entities.update(self._zones)
 
@@ -48,6 +48,8 @@ def _update_zones(self) -> None:
             data = self._get_location_data(location_id)
             zone.update(data)
 
+            self._update_for_cooling(zone)
+
     def _update_gw_entities(self) -> None:
         """Helper-function for _all_entities_data() and async_update().
 
@@ -76,8 +78,6 @@ def _update_gw_entities(self) -> None:
             if is_battery_low:
                 entity["binary_sensors"]["low_battery"] = True
 
-            self._update_for_cooling(entity)
-
             remove_empty_platform_dicts(entity)
 
     def _detect_low_batteries(self) -> list[str]:
@@ -126,7 +126,7 @@ def _update_for_cooling(self, entity: GwEntityData) -> None:
         if (
             self.check_name(ANNA)
             and self._cooling_present
-            and entity["dev_class"] == "thermostat"
+            and entity["dev_class"] == "climate"
         ):
             thermostat = entity["thermostat"]
             sensors = entity["sensors"]
@@ -142,11 +142,9 @@ def _update_for_cooling(self, entity: GwEntityData) -> None:
             thermostat.pop("setpoint")
             temp_dict.update(thermostat)
             entity["thermostat"] = temp_dict
-            if "setpoint" in sensors:
-                sensors.pop("setpoint")
             sensors["setpoint_low"] = temp_dict["setpoint_low"]
             sensors["setpoint_high"] = temp_dict["setpoint_high"]
-            self._count += 2  # add 4, remove 2
+            self._count += 3  # add 4, remove 1
 
     def _get_location_data(self, loc_id: str) -> GwEntityData:
         """Helper-function for _all_entity_data() and async_update().
@@ -197,11 +195,6 @@ def _get_entity_data(self, entity_id: str) -> GwEntityData:
         if self.check_name(ADAM):
             self._get_adam_data(entity, data)
 
-        # Thermostat data for Anna (presets, temperatures etc)
-        if self.check_name(ANNA) and entity["dev_class"] == "thermostat":
-            self._climate_data(entity_id, entity, data)
-            self._get_anna_control_state(data)
-
         return data
 
     def _check_availability(
@@ -249,16 +242,12 @@ def _get_adam_data(self, entity: GwEntityData, data: GwEntityData) -> None:
                 self._count += 1
 
     def _climate_data(
-        self, location_id: str, entity: GwEntityData, data: GwEntityData
+        self, loc_id: str, entity: GwEntityData, data: GwEntityData
     ) -> None:
         """Helper-function for _get_entity_data().
 
         Determine climate-control entity data.
         """
-        loc_id = location_id
-        if entity.get("location") is not None:
-            loc_id = entity["location"]
-
         # Presets
         data["preset_modes"] = None
         data["active_preset"] = None
@@ -301,20 +290,6 @@ def check_reg_mode(self, mode: str) -> bool:
             "regulation_modes" in gateway and gateway["select_regulation_mode"] == mode
         )
 
-    def _get_anna_control_state(self, data: GwEntityData) -> None:
-        """Set the thermostat control_state based on the opentherm/onoff device state."""
-        data["control_state"] = "idle"
-        self._count += 1
-        for entity in self.gw_entities.values():
-            if entity["dev_class"] != "heater_central":
-                continue
-
-            binary_sensors = entity["binary_sensors"]
-            if binary_sensors["heating_state"]:
-                data["control_state"] = "heating"
-            if binary_sensors.get("cooling_state"):
-                data["control_state"] = "cooling"
-
     def _get_schedule_states_with_off(
         self, location: str, schedules: list[str], selected: str, data: GwEntityData
     ) -> None:

plugwise/helper.py

@@ -468,7 +468,7 @@ def _get_actuator_functionalities(
                 item == "thermostat"
                 and (
                     entity["dev_class"] != "climate"
-                    if self.check_name(ADAM)
+                    if self._is_thermostat
                     else entity["dev_class"] != "thermostat"
                 )
             ):
@@ -773,19 +773,19 @@ def _rank_thermostat(
                 thermo_loc["secondary"].append(appliance_id)
 
     def _control_state(self, data: GwEntityData, loc_id: str) -> str | bool:
-        """Helper-function for _get_adam_data().
+        """Helper-function for _get_location_data().
 
-        Adam: find the thermostat control_state of a location, from DOMAIN_OBJECTS.
+        Adam & Anna: find the thermostat control_state of a location, from DOMAIN_OBJECTS.
         Represents the heating/cooling demand-state of the local primary thermostat.
         Note: heating or cooling can still be active when the setpoint has been reached.
         """
         locator = f'location[@id="{loc_id}"]/actuator_functionalities/thermostat_functionality[type="thermostat"]/control_state'
         if (ctrl_state := self._domain_objects.find(locator)) is not None:
             return str(ctrl_state.text)
 
-        # Handle missing control_state in regulation_mode off for firmware >= 3.2.0 (issue #776)
+        # Adam: handle missing control_state in regulation_mode off for firmware >= 3.2.0 (issue #776)
         # In newer firmware versions, default to "off" when control_state is not present
-        if self.smile.version != version.Version("0.0.0"):
+        if self.check_name(ADAM) and self.smile.version != version.Version("0.0.0"):
             if self.smile.version >= version.parse("3.2.0"):
                 return "off"
 
@@ -794,7 +794,15 @@ def _control_state(self, data: GwEntityData, loc_id: str) -> str | bool:
             setpoint = data["sensors"]["setpoint"]
             temperature = data["sensors"]["temperature"]
             # No cooling available in older firmware
-            return "heating" if temperature < setpoint else "off"
+            return "heating" if temperature < setpoint else "idle"
+
+        if self.check_name(ANNA):
+            # Older Anna firmware does not have the control_state xml-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 "idle"
 
         return False  # pragma: no cover
 

plugwise/smile.py

@@ -10,7 +10,6 @@
 from typing import Any, cast
 
 from plugwise.constants import (
-    ADAM,
     ANNA,
     APPLIANCES,
     DOMAIN_OBJECTS,
@@ -113,8 +112,7 @@ def get_all_gateway_entities(self) -> None:
             self.therms_with_offset_func = (
                 self._get_appliances_with_offset_functionality()
             )
-            if self.check_name(ADAM):
-                self._scan_thermostats()
+            self._scan_thermostats()
 
         if group_data := self._get_group_switches():
             self.gw_entities.update(group_data)