Merge pull request #229 from plugwise/same-setpoint

Fix for plugwise/plugwise-beta#309

Author: bouwew

CHANGELOG.md

@@ -1,5 +1,7 @@
 # Changelog
 
+# v0.25.3: Bugfix for https://github.com/plugwise/plugwise-beta/issues/309
+
 # v0.25.2: Bugfix, code improvements
 - Fix a set_temperature() and heat_cool related bug
 

plugwise/__init__.py

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

plugwise/helper.py

@@ -118,12 +118,12 @@ def _get_actuator_functionalities(xml: etree) -> DeviceData:
 
 def schedules_temps(
     schedules: dict[str, dict[str, list[float]]], name: str
-) -> list[float] | None:
+) -> list[float]:
     """Helper-function for schedules().
     Obtain the schedule temperature of the schedule.
     """
     if name == NONE:
-        return None  # pragma: no cover
+        return []  # pragma: no cover
 
     schedule_list: list[tuple[int, dt.time, list[float]]] = []
     for period, temp in schedules[name].items():
@@ -153,7 +153,7 @@ def schedules_temps(
         if in_between(today, day_0, day_1, now, time_0, time_1):
             return schedule_list[i][2]
 
-    return None  # pragma: no cover
+    return []  # pragma: no cover
 
 
 def power_data_local_format(
@@ -329,7 +329,7 @@ def __init__(self) -> None:
         self._outdoor_temp: float
         self._reg_allowed_modes: list[str] = []
         self._schedule_old_states: dict[str, dict[str, str]] = {}
-        self._sched_setpoints: list[float] | None = None
+        self._sched_setpoints: list[float] = []
         self._smile_legacy = False
         self._status: etree
         self._stretch_v2 = False
@@ -738,7 +738,7 @@ def _match_locations(self) -> dict[str, ThermoLoc]:
 
         self._all_appliances()
         for location_id, location_details in self._loc_data.items():
-            for appliance_details in list(self._appl_data.values()):
+            for appliance_details in self._appl_data.values():
                 if appliance_details["location"] == location_id:
                     location_details.update(
                         {"master": None, "master_prio": 0, "slaves": set()}
@@ -1186,7 +1186,7 @@ def _preset(self, loc_id: str) -> str | None:
 
     def _schedules_legacy(
         self, avail: list[str], sel: str
-    ) -> tuple[list[str], str, None, None]:
+    ) -> tuple[list[str], str, list[float], None]:
         """Helper-function for _schedules().
         Collect available schedules/schedules for the legacy thermostat.
         """
@@ -1209,19 +1209,19 @@ def _schedules_legacy(
             if active:
                 sel = name
 
-        return avail, sel, None, None
+        return avail, sel, [], None
 
     def _schedules(
         self, location: str
-    ) -> tuple[list[str], str, list[float] | None, str | None]:
+    ) -> tuple[list[str], str, list[float], str | None]:
         """Helper-function for smile.py: _device_data_climate().
         Obtain the available schedules/schedules. Adam: a schedule can be connected to more than one location.
         NEW: when a location_id is present then the schedule is active. Valid for both Adam and non-legacy Anna.
         """
         available: list[str] = [NONE]
         last_used: str | None = None
         rule_ids: dict[str, str] = {}
-        schedule_temperatures: list[float] | None = None
+        schedule_temperatures: list[float] = []
         selected = NONE
 
         # Legacy Anna schedule, only one schedule allowed

plugwise/smile.py

@@ -52,51 +52,50 @@
 class SmileData(SmileHelper):
     """The Plugwise Smile main class."""
 
-    def update_for_cooling(self, devices: dict[str, DeviceData]) -> None:
+    def update_for_cooling(self, device: DeviceData) -> None:
         """Helper-function for adding/updating various cooling-related values."""
-        for device in list(devices.values()):
-            # 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_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
-
-            # For heating + cooling, replace setpoint with setpoint_high/_low
-            if self._cooling_present:
-                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_low": thermostat["setpoint"],
-                    "setpoint_high": max_setpoint,
+        # 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_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:
+            return
+
+        # For heating + cooling, replace setpoint with setpoint_high/_low
+        if self._cooling_present:
+            thermostat = device["thermostat"]
+            sensors = device["sensors"]
+            max_setpoint = MAX_SETPOINT
+            min_setpoint = MIN_SETPOINT
+            if device["selected_schedule"] != "None":
+                max_setpoint = self._sched_setpoints[1]
+                min_setpoint = self._sched_setpoints[0]
+
+            temp_dict: ActuatorData = {
+                "setpoint_low": thermostat["setpoint"],
+                "setpoint_high": max_setpoint,
+            }
+            if self._cooling_enabled:
+                temp_dict = {
+                    "setpoint_low": min_setpoint,
+                    "setpoint_high": thermostat["setpoint"],
                 }
-                if self._cooling_active:
-                    temp_dict = {
-                        "setpoint_low": min_setpoint,
-                        "setpoint_high": thermostat["setpoint"],
-                    }
-                if "setpoint" in sensors:
-                    sensors.pop("setpoint")
-                sensors["setpoint_low"] = temp_dict["setpoint_low"]
-                sensors["setpoint_high"] = temp_dict["setpoint_high"]
-                thermostat.pop("setpoint")
-                temp_dict.update(thermostat)
-                device["thermostat"] = temp_dict
+            thermostat.pop("setpoint")
+            temp_dict.update(thermostat)
+            device["thermostat"] = temp_dict
+            if "setpoint" in sensors:
+                sensors.pop("setpoint")
+            sensors["setpoint_low"] = temp_dict["setpoint_low"]
+            sensors["setpoint_high"] = temp_dict["setpoint_high"]
 
     def _all_device_data(self) -> None:
         """Helper-function for get_all_devices().
@@ -111,8 +110,8 @@ def _all_device_data(self) -> None:
                 device_id, data, device, bs_dict, s_dict, sw_dict
             )
 
-        # After all device data has been determined, add/update for cooling
-        self.update_for_cooling(self.gw_devices)
+            # Update for cooling
+            self.update_for_cooling(self.gw_devices[device_id])
 
         self.gw_data.update(
             {"smile_name": self.smile_name, "gateway_id": self.gateway_id}
@@ -255,16 +254,16 @@ def _check_availability(
         # OpenTherm device
         if details["dev_class"] == "heater_central" and details["name"] != "OnOff":
             device_data["available"] = True
-            for data in list(self._notifications.values()):
-                for msg in list(data.values()):
+            for data in self._notifications.values():
+                for msg in data.values():
                     if "no OpenTherm communication" in msg:
                         device_data["available"] = False
 
         # Smartmeter
         if details["dev_class"] == "smartmeter":
             device_data["available"] = True
-            for data in list(self._notifications.values()):
-                for msg in list(data.values()):
+            for data in self._notifications.values():
+                for msg in data.values():
                     if "P1 does not seem to be connected to a smart meter" in msg:
                         device_data["available"] = False
 
@@ -551,7 +550,7 @@ async def async_update(self) -> list[GatewayData | dict[str, DeviceData]]:
 
         for dev_id, dev_dict in self.gw_devices.items():
             data = self._get_device_data(dev_id)
-            for key, value in list(data.items()):
+            for key, value in data.items():
                 if key in dev_dict:
                     dev_dict[key] = value  # type: ignore [literal-required]
 
@@ -560,7 +559,7 @@ async def async_update(self) -> list[GatewayData | dict[str, DeviceData]]:
                 if item == "binary_sensors":
                     notifs = self._notifications
                 if item in dev_dict:
-                    for key, value in list(data.items()):
+                    for key, value in data.items():
                         update_helper(
                             data,
                             self.gw_devices,
@@ -571,8 +570,8 @@ async def async_update(self) -> list[GatewayData | dict[str, DeviceData]]:
                             notifs,
                         )
 
-        # After all device data has been determined, add/update for cooling
-        self.update_for_cooling(self.gw_devices)
+            # Update for cooling
+            self.update_for_cooling(dev_dict)
 
         return [self.gw_data, self.gw_devices]