Improve x_cooling_present and anna_no_cooling_enabled logic

Author: bouwew

plugwise/helper.py

@@ -311,7 +311,7 @@ def __init__(self) -> None:
         self._stretch_v3 = False
         self._thermo_locs: dict[str, ThermoLoc] = {}
 
-        self.anna_no_cooling_enabled = True
+        self.anna_no_cooling_enabled: bool | None = None
         self.gateway_id: str
         self.gw_data: GatewayData = {}
         self.gw_devices: dict[str, DeviceData] = {}
@@ -853,8 +853,10 @@ def _get_appliance_data(self, d_id: str) -> DeviceData:
             data.pop("heating_state", None)
 
         # Use cooling_enabled to set self.anna_no_cooling_enabled to False, then remove
-        if "cooling_enabled" in data:
-            self.anna_no_cooling_enabled = False
+        if self._anna_cooling_present:
+            self.anna_no_cooling_enabled = True
+            if "cooling_enabled" in data:
+                self.anna_no_cooling_enabled = False
             data.pop("cooling_enabled", None)
 
         return data

plugwise/smile.py

@@ -86,15 +86,16 @@ def get_all_devices(self) -> None:
             self._on_off_device = onoff_boiler is not None
             self._opentherm_device = open_therm_boiler is not None
 
-            # Determine if the Adam or Anna had cooling capability
+            # Determine if the Adam or Anna has cooling capability
             locator = "./gateway/features/cooling"
-            self._anna_cooling_present = adam_cooling_present = (
+            anna_cooling_present_1 = adam_cooling_present = (
                 self._domain_objects.find(locator) is not None
             )
             # Alternative method for the Anna with Elga
             locator_2 = "./gateway/features/elga_support"
+            anna_cooling_present_2 = self._domain_objects.find(locator_2) is not None
             self._anna_cooling_present = (
-                self._domain_objects.find(locator_2) is not None
+                anna_cooling_present_1 or anna_cooling_present_2
             )
             self._cooling_present = self._anna_cooling_present or adam_cooling_present