Merge pull request #226 from plugwise/setpoint_high_low

# v0.25.0: Improve compatibility with HA Core climate platform

Author: bouwew

CHANGELOG.md

@@ -1,6 +1,8 @@
 # Changelog
 
-# v0.24.2: Better Core compatibility (change mode cool to heat_cool)
+# v0.25.0: Improve compatibility with HA Core climate platform
+- Change mode cool to heat_cool
+- Add setpoint_high/setpoint_low to output
 
 # v0.24.1: Bugfix: fix root-cause of https://github.com/home-assistant/core/issues/79708
 

plugwise/__init__.py

@@ -1,6 +1,6 @@
 """Plugwise module."""
 
-__version__ = "0.24.2"
+__version__ = "0.25.0"
 
 from plugwise.smile import Smile
 from plugwise.stick import Stick

plugwise/constants.py

@@ -397,6 +397,8 @@
     "upper_bound",
     "resolution",
 )
+MAX_SETPOINT: Final[float] = 40.0
+MIN_SETPOINT: Final[float] = 0.0
 SPECIAL_FORMAT: Final[tuple[str, ...]] = (ENERGY_KILO_WATT_HOUR, VOLUME_CUBIC_METERS)
 SWITCH_GROUP_TYPES: Final[tuple[str, ...]] = ("switching", "report")
 ZONE_THERMOSTATS: Final[tuple[str, ...]] = (
@@ -564,6 +566,8 @@
     "outdoor_temperature",
     "return_temperature",
     "setpoint",
+    "setpoint_high",
+    "setpoint_low",
     "temperature_difference",
     "valve_position",
     "water_pressure",
@@ -666,6 +670,8 @@ class SmileSensors(TypedDict, total=False):
     outdoor_temperature: float
     return_temperature: float
     setpoint: float
+    setpoint_high: float
+    setpoint_low: float
     temperature_difference: float
     valve_position: float
     water_pressure: float
@@ -695,6 +701,8 @@ class ActuatorData(TypedDict, total=False):
 
     lower_bound: float
     setpoint: float
+    setpoint_high: float
+    setpoint_low: float
     resolution: float
     upper_bound: float
 

plugwise/helper.py

@@ -949,6 +949,8 @@ def _get_appliance_data(self, d_id: str) -> DeviceData:
             ):
                 if data.get("c_heating_state") and not data.get("heating_state"):
                     data["heating_state"] = True
+                    if self._cooling_present:
+                        self._cooling_active = True
 
             data.pop("c_heating_state")
 
@@ -958,21 +960,17 @@ def _get_appliance_data(self, d_id: str) -> DeviceData:
 
         if d_id == self._heater_id:
             # Adam
-            if self._cooling_enabled:
-                data["cooling_enabled"] = self._cooling_enabled
             if self.smile_name == "Smile Anna":
                 # Use elga_status_code or cooling_enabled to set _cooling_enabled to True
                 if self._cooling_present:
                     # Elga:
                     if "elga_status_code" in data:
                         self._cooling_enabled = data["elga_status_code"] in [8, 9]
-                        data["cooling_enabled"] = self._cooling_enabled
                         self._cooling_active = data["elga_status_code"] == 8
                         data.pop("elga_status_code", None)
                     # Loria/Thermastate: look at cooling_state, not at cooling_enabled, not available on R32!
                     elif "cooling_ena_switch" in data:
                         self._cooling_enabled = data["cooling_ena_switch"]
-                        data["cooling_enabled"] = self._cooling_enabled
                         self._cooling_active = data["cooling_state"]
 
         # Don't show cooling_state when no cooling present

plugwise/smile.py

@@ -21,6 +21,8 @@
     DOMAIN_OBJECTS,
     LOCATIONS,
     LOGGER,
+    MAX_SETPOINT,
+    MIN_SETPOINT,
     MODULES,
     NOTIFICATIONS,
     RULES,
@@ -29,6 +31,7 @@
     SWITCH_GROUP_TYPES,
     SYSTEM,
     ZONE_THERMOSTATS,
+    ActuatorData,
     ApplianceData,
     DeviceData,
     GatewayData,
@@ -51,25 +54,59 @@ class SmileData(SmileHelper):
     def update_for_cooling(self, devices: dict[str, DeviceData]) -> None:
         """Helper-function for adding/updating various cooling-related values."""
         for _, device in devices.items():
-            # For Anna + cooling, modify cooling_state based on provided info by Plugwise
-            if self.smile_name == "Smile Anna":
-                if device["dev_class"] == "heater_central" and self._cooling_present:
-                    device["binary_sensors"]["cooling_state"] = False
-                    if self._cooling_active:
-                        device["binary_sensors"]["cooling_state"] = True
+            # For Anna or Adama + cooling, modify cooling_state based on provided info by Plugwise
+            if device["dev_class"] == "heater_central" and self._cooling_present:
+                device["binary_sensors"]["cooling_state"] = False
+                if self._cooling_active:
+                    device["binary_sensors"]["cooling_state"] = True
 
             # For Adam + on/off cooling, modify heating_state and cooling_state
             # based on provided info by Plugwise
             if (
                 self.smile_name == "Adam"
                 and device["dev_class"] == "heater_central"
                 and self._on_off_device
-                and self._cooling_enabled
+                and self._cooling_active
                 and device["binary_sensors"]["heating_state"]
             ):
                 device["binary_sensors"]["cooling_state"] = True
                 device["binary_sensors"]["heating_state"] = False
 
+            # Add setpoint_low and setpoint_high when cooling is enabled
+            if device["dev_class"] not in ZONE_THERMOSTATS:
+                continue
+
+            if self._cooling_present:
+                # Replace setpoint with setpoint_high/_low
+                thermostat = device["thermostat"]
+                sensors = device["sensors"]
+                max_setpoint = MAX_SETPOINT
+                min_setpoint = MIN_SETPOINT
+                if self._sched_setpoints is not None:
+                    max_setpoint = self._sched_setpoints[1]
+                    min_setpoint = self._sched_setpoints[0]
+
+                temp_dict: ActuatorData = {
+                    "setpoint": thermostat["setpoint"],
+                    "setpoint_low": thermostat["setpoint"],
+                    "setpoint_high": max_setpoint,
+                }
+                if self._cooling_active:
+                    temp_dict = {
+                        "setpoint": thermostat["setpoint"],
+                        "setpoint_low": min_setpoint,
+                        "setpoint_high": thermostat["setpoint"],
+                    }
+                # Keep setpoint in sensors, remove when appropriate
+                # if "setpoint" in sensors:
+                #     sensors.pop("setpoint")
+                sensors["setpoint_low"] = temp_dict["setpoint_low"]
+                sensors["setpoint_high"] = temp_dict["setpoint_high"]
+                # Keep setpoint in output, remove when appropriate
+                # thermostat.pop("setpoint")
+                temp_dict.update(thermostat)
+                device["thermostat"] = temp_dict
+
     def _all_device_data(self) -> None:
         """Helper-function for get_all_devices().
         Collect initial data for each device and add to self.gw_data and self.gw_devices.
@@ -674,11 +711,29 @@ async def set_preset(self, loc_id: str, preset: str) -> None:
 
         await self._request(uri, method="put", data=data)
 
-    async def set_temperature(self, loc_id: str, temperature: float) -> None:
+    async def set_temperature(self, loc_id: str, items: dict[str, float]) -> None:
         """Set the given Temperature on the relevant Thermostat."""
-        temp = str(temperature)
+        setpoint: float | None = None
+        if "setpoint" in items:
+            setpoint = items["setpoint"]
+        if self._cooling_present:
+            if "setpoint_low" in items:
+                setpoint = items["setpoint_low"]
+            if self._cooling_active:
+                if "setpoint_high" in items:
+                    setpoint = items["setpoint_high"]
+
+        if setpoint is None:
+            raise PlugwiseError(
+                "Plugwise: failed setting temperature: no valid input provided"
+            )  # pragma: no cover"
+
+        temperature = str(setpoint)
         uri = self._thermostat_uri(loc_id)
-        data = f"<thermostat_functionality><setpoint>{temp}</setpoint></thermostat_functionality>"
+        data = (
+            "<thermostat_functionality><setpoint>"
+            f"{temperature}</setpoint></thermostat_functionality>"
+        )
 
         await self._request(uri, method="put", data=data)