Follow plugwise naming

_cooling_active -> _cooling_enabled

Author: bouwew

plugwise/helper.py

@@ -289,10 +289,10 @@ def __init__(self) -> None:
         self._appl_data: dict[str, ApplianceData] = {}
         self._appliances: etree
         self._allowed_modes: list[str] = []
-        self._adam_cooling_active = False
-        self._anna_cooling_active: bool | None = None
+        self._adam_cooling_enabled = False
+        self._anna_cooling_enabled: bool | None = None
         self._anna_cooling_present = False
-        self._cooling_active = False
+        self._cooling_enabled = False
         self._cooling_activation_outdoor_temp: float
         self._cooling_deactivation_threshold: float
         self._cooling_present = False
@@ -480,7 +480,7 @@ def _appliance_info_finder(self, appliance: etree, appl: Munch) -> Munch:
             mode_list: list[str] = []
             locator = "./actuator_functionalities/regulation_mode_control_functionality"
             if (search := appliance.find(locator)) is not None:
-                self._adam_cooling_active = search.find("mode").text == "cooling"
+                self._adam_cooling_enabled = search.find("mode").text == "cooling"
                 if search.find("allowed_modes") is not None:
                     for mode in search.find("allowed_modes"):
                         mode_list.append(mode.text)
@@ -854,7 +854,7 @@ def _get_appliance_data(self, d_id: str) -> DeviceData:
 
         # Use cooling_enabled to set self._anna_cooling_active, then remove
         if "cooling_enabled" in data:
-            self._anna_cooling_active = data.get("cooling_enabled")
+            self._anna_cooling_enabled = data.get("cooling_enabled")
             data.pop("cooling_enabled", None)
 
         return data

plugwise/smile.py

@@ -109,17 +109,17 @@ def get_all_devices(self) -> None:
 
         # Anna: indicate possible active heating/cooling operation-mode
         # Actual ongoing heating/cooling is shown via heating_state/cooling_state
-        if self._anna_cooling_present and self._anna_cooling_active is None:
+        if self._anna_cooling_present and self._anna_cooling_enabled is None:
             if (
-                not self._cooling_active
+                not self._cooling_enabled
                 and self._outdoor_temp > self._cooling_activation_outdoor_temp
             ):
-                self._cooling_active = True
+                self._cooling_enabled = True
             if (
-                self._cooling_active
+                self._cooling_enabled
                 and self._outdoor_temp < self._cooling_deactivation_threshold
             ):
-                self._cooling_active = False
+                self._cooling_enabled = False
 
         # Don't show cooling_state when no cooling present
         for _, device in self.gw_devices.items():
@@ -192,7 +192,7 @@ def _device_data_climate(
                 if sched_setpoints is None:
                     device_data["setpoint_low"] = device_data["setpoint"]
                     device_data["setpoint_high"] = float(40)
-                    if self._cooling_active or self._anna_cooling_active:
+                    if self._cooling_enabled or self._anna_cooling_enabled:
                         device_data["setpoint_low"] = float(0)
                         device_data["setpoint_high"] = device_data["setpoint"]
                 else:
@@ -212,7 +212,7 @@ def _device_data_climate(
             if self._heater_id is not None:
                 if self._anna_cooling_present:
                     device_data["mode"] = "heat_cool"
-                if self.smile_name == "Adam" and self._adam_cooling_active:
+                if self.smile_name == "Adam" and self._adam_cooling_enabled:
                     device_data["mode"] = "cool"
 
         return device_data

tests/test_smile.py

@@ -3135,8 +3135,8 @@ async def test_connect_anna_heatpump_cooling_to_off(self):
         self.smile_setup = "anna_heatpump_cooling_to_off"
         server, smile, client = await self.connect_wrapper()
 
-        # Preset _cooling_active to True, will turn to False due to the lowered outdoor temp
-        smile._cooling_active = True
+        # Preset _cooling_enabled to True, will turn to False due to the lowered outdoor temp
+        smile._cooling_enabled = True
         await self.device_test(smile, testdata)
         await smile.close_connection()
         await self.disconnect(server, client)