Add SmileCommon property heater_id, Smile/Legacy property cooling_present

Author: bouwew

plugwise/__init__.py

@@ -86,9 +86,7 @@ def __init__(
     @property
     def cooling_present(self) -> bool:
         """Return the cooling capability."""
-        if "cooling_present" in self._smile_props:
-            return self._smile_props["cooling_present"]
-        return False
+        return self._smile_api.cooling_present
 
     @property
     def gateway_id(self) -> str:
@@ -98,9 +96,7 @@ def gateway_id(self) -> str:
     @property
     def heater_id(self) -> str:
         """Return the heater-id."""
-        if "heater_id" in self._smile_props:
-            return self._smile_props["heater_id"]
-        return NONE
+        return self._smile_api.heater_id
 
     @property
     def item_count(self) -> int:

plugwise/common.py

@@ -58,6 +58,11 @@ def __init__(self) -> None:
         self.smile_name: str
         self.smile_type: str
 
+    @property
+    def heater_id(self) -> str:
+        """Return the heater-id."""
+        return self._heater_id
+
     def smile(self, name: str) -> bool:
         """Helper-function checking the smile-name."""
         return self.smile_name == name

plugwise/helper.py

@@ -233,7 +233,7 @@ def _appliance_info_finder(self, appl: Munch, appliance: etree.Element) -> Munch
                     appliance, "domestic_hot_water_mode_control_functionality"
                 )
                 # Skip orphaned heater_central (Core Issue #104433)
-                if appl.entity_id != self._heater_id:
+                if appl.entity_id != self.heater_id:
                     return Munch()
                 return appl
             case _ as s if s.endswith("_plug"):
@@ -344,7 +344,7 @@ def _get_measurement_data(self, entity_id: str) -> GwEntityData:
 
         # Get non-P1 data from APPLIANCES
         measurements = DEVICE_MEASUREMENTS
-        if self._is_thermostat and entity_id == self._heater_id:
+        if self._is_thermostat and entity_id == self.heater_id:
             measurements = HEATER_CENTRAL_MEASUREMENTS
             # Show the allowed dhw_modes (Loria only)
             if self._dhw_allowed_modes:
@@ -619,7 +619,7 @@ def _update_anna_cooling(self, entity_id: str, data: GwEntityData) -> None:
 
         Support added for Techneco Elga and Thercon Loria/Thermastage.
         """
-        if entity_id != self._heater_id:
+        if entity_id != self.heater_id:
             return
 
         if "elga_status_code" in data:

plugwise/legacy/helper.py

@@ -125,7 +125,7 @@ def _all_appliances(self) -> None:
                 continue
 
             # Skip orphaned heater_central (Core Issue #104433)
-            if appl.pwclass == "heater_central" and appl.entity_id != self._heater_id:
+            if appl.pwclass == "heater_central" and appl.entity_id != self.heater_id:
                 continue  # pragma: no cover
 
             self._create_gw_entities(appl)
@@ -268,7 +268,7 @@ def _get_measurement_data(self, entity_id: str) -> GwEntityData:
             return data
 
         measurements = DEVICE_MEASUREMENTS
-        if self._is_thermostat and entity_id == self._heater_id:
+        if self._is_thermostat and entity_id == self.heater_id:
             measurements = HEATER_CENTRAL_MEASUREMENTS
 
         if (

plugwise/legacy/smile.py

@@ -76,6 +76,11 @@ def __init__(
         self._first_update = True
         self._previous_day_number: str = "0"
 
+    @property
+    def cooling_present(self) -> bool:
+        """Return the cooling capability."""
+        return False
+
     async def full_xml_update(self) -> None:
         """Perform a first fetch of the Plugwise server XML data."""
         self._domain_objects = await self._request(DOMAIN_OBJECTS)

plugwise/smile.py

@@ -83,6 +83,11 @@ def __init__(
         self.smile_version = smile_version
         self.therms_with_offset_func: list[str] = []
 
+    @property
+    def cooling_present(self) -> bool:
+        """Return the cooling capability."""
+        return self._cooling_present
+
     async def full_xml_update(self) -> None:
         """Perform a first fetch of the Plugwise server XML data."""
         self._domain_objects = await self._request(DOMAIN_OBJECTS)