Revert back to (_)elga_cooling_* / (_)lortherm_cooling?*

Author: bouwew

plugwise/helper.py

@@ -316,18 +316,22 @@ def __init__(self) -> None:
         self._stretch_v3 = False
         self._thermo_locs: dict[str, ThermoLoc] = {}
 
-        #####################################################################
-        # 'anna_cooling_enabled' refers 1) to the state of the Elga heatpump
+        ###################################################################
+        # 'elga_cooling_enabled' refers to the state of the Elga heatpump
         # connected to an Anna. For Elga, 'elga_status_code' in [8, 9]
         # means cooling mode is available, next to heating mode.
         # 'elga_status_code' = 8 means cooling is active, 9 means idle.
-        # 2) it also refers to the state of the Loria or Thermastage heatpump
-        # connected to an Anna. For these, 'cooling_state' = on means set
-        # to cooling mode, next of to heating mode.
+        #
+        # 'lortherm_cooling_enabled' refers to the state of the Loria or
+        # Thermastage heatpump connected to an Anna. For these,
+        # 'cooling_state' = on means set to cooling mode, instead of to
+        # heating mode.
         # 'modulation_level' = 100 means cooling is active, 0.0 means idle.
-        #####################################################################
-        self._anna_cooling_active = False
-        self.anna_cooling_enabled = False
+        ###################################################################
+        self._elga_cooling_active = False
+        self.elga_cooling_enabled = False
+        self._lortherm_cooling_active = False
+        self.lortherm_cooling_enabled = False
 
         self.gateway_id: str
         self.gw_data: GatewayData = {}
@@ -875,16 +879,15 @@ def _get_appliance_data(self, d_id: str) -> DeviceData:
             if self._anna_cooling_present:
                 # Elga:
                 if "elga_status_code" in data:
-                    self.anna_cooling_enabled = data["elga_status_code"] in [8, 9]
-                    self._anna_cooling_active = data["elga_status_code"] == 8
+                    self.elga_cooling_enabled = data["elga_status_code"] in [8, 9]
+                    self._elga_cooling_active = data["elga_status_code"] == 8
                     data.pop("elga_status_code", None)
                 # Loria/Thermastate:
                 elif "cooling_state" in data:
-                    self.anna_cooling_enabled = data["cooling_state"]
+                    self.lortherm_cooling_enabled = data["cooling_state"]
+                    self._lortherm_cooling_active = False
                     if data["modulation_level"] == 100:
-                        self._anna_cooling_active = True
-                    if data["modulation_level"] == 0.0:
-                        self._anna_cooling_active = False
+                        self._lortherm_cooling_active = True
 
         # Don't show cooling_state when no cooling present
         if not self._cooling_present and "cooling_state" in data:

plugwise/smile.py

@@ -59,18 +59,18 @@ def update_for_cooling(self, devices: dict[str, DeviceData]) -> None:
             if self.smile_name == "Anna":
                 if device["dev_class"] == "heater_central" and self._cooling_present:
                     device["binary_sensors"]["cooling_state"] = False
-                    if self._anna_cooling_active:
+                    if self._elga_cooling_active:
                         device["binary_sensors"]["cooling_state"] = True
 
                 # Add setpoint_low and setpoint_high when cooling is enabled
                 if device["dev_class"] not in ZONE_THERMOSTATS:
                     continue
 
-                if self.anna_cooling_enabled:
+                if self.elga_cooling_enabled:
                     sensors = device["sensors"]
                     sensors["setpoint_low"] = sensors["setpoint"]
                     sensors["setpoint_high"] = MAX_SETPOINT
-                    if self._anna_cooling_active:
+                    if self._elga_cooling_active:
                         sensors["setpoint_low"] = MIN_SETPOINT
                         sensors["setpoint_high"] = sensors["setpoint"]
                     if self._sched_setpoints is not None:
@@ -231,9 +231,9 @@ def _device_data_climate(
         device_data["mode"] = "auto"
         if sel_schedule == "None":
             device_data["mode"] = "heat"
-            if self.anna_cooling_enabled:
+            if self.elga_cooling_enabled:
                 device_data["mode"] = "heat_cool"
-            if self._adam_cooling_enabled:
+            if self._adam_cooling_enabled or self.lortherm_cooling_enabled:
                 device_data["mode"] = "cool"
 
         return device_data
@@ -643,7 +643,7 @@ async def set_temperature(self, loc_id: str, temps: dict[str, Any]) -> None:
         """Set the given Temperature on the relevant Thermostat."""
         if "setpoint" in temps:
             setpoint = temps["setpoint"]
-        elif self._anna_cooling_active:
+        elif self._elga_cooling_active:
             setpoint = temps["setpoint_high"]
         else:
             setpoint = temps["setpoint_low"]

tests/test_smile.py

@@ -944,8 +944,8 @@ async def test_connect_anna_v4(self):
         assert not self.notifications
 
         assert not smile._anna_cooling_present
-        assert not smile._anna_cooling_active
-        assert not smile.anna_cooling_enabled
+        assert not smile._elga_cooling_active
+        assert not smile.elga_cooling_enabled
 
         result = await self.tinker_thermostat(
             smile,
@@ -3055,8 +3055,8 @@ async def test_connect_anna_heatpump_heating(self):
         assert not self.notifications
 
         assert smile._anna_cooling_present
-        assert smile.anna_cooling_enabled
-        assert not smile._anna_cooling_active
+        assert smile.elga_cooling_enabled
+        assert not smile._elga_cooling_active
 
         result = await self.tinker_thermostat(
             smile,
@@ -3130,8 +3130,8 @@ async def test_connect_anna_heatpump_cooling(self):
         assert not self.notifications
 
         assert smile._anna_cooling_present
-        assert smile.anna_cooling_enabled
-        assert smile._anna_cooling_active
+        assert smile.elga_cooling_enabled
+        assert smile._elga_cooling_active
 
         result = await self.tinker_thermostat(
             smile,
@@ -3185,8 +3185,8 @@ async def test_connect_anna_heatpump_cooling_fake_firmware(self):
 
         await self.device_test(smile, testdata)
         assert smile._anna_cooling_present
-        assert smile.anna_cooling_enabled
-        assert smile._anna_cooling_active
+        assert smile.lortherm_cooling_enabled
+        assert smile._lortherm_cooling_active
 
         await smile.close_connection()
         await self.disconnect(server, client)
@@ -3224,8 +3224,8 @@ async def test_connect_anna_loria_idle_fake_firmware(self):
 
         await self.device_test(smile, testdata)
         assert smile._anna_cooling_present
-        assert smile.anna_cooling_enabled
-        assert not smile._anna_cooling_active
+        assert smile.lortherm_cooling_enabled
+        assert not smile._lortherm_cooling_active
 
         await smile.close_connection()
         await self.disconnect(server, client)
@@ -3485,8 +3485,8 @@ async def test_connect_anna_elga_2_cooling(self):
         assert not self.notifications
 
         assert smile._anna_cooling_present
-        assert smile.anna_cooling_enabled
-        assert smile._anna_cooling_active
+        assert smile.elga_cooling_enabled
+        assert smile._elga_cooling_active
 
         await smile.close_connection()
         await self.disconnect(server, client)