Merge pull request #235 from plugwise/core-81531

Fix for Core PR #81531

Author: bouwew

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+# v0.25.6: Revert py.typed, fix Core PR #81531
+
+# v0.25.5: not released
+
 # v0.25.4: Add py.typed, fix typing as suggested in #231
 
 # v0.25.3: Bugfix for https://github.com/plugwise/plugwise-beta/issues/309

plugwise/__init__.py

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

plugwise/constants.py

@@ -388,6 +388,8 @@
 DEFAULT_TIMEOUT: Final = 30
 DEFAULT_USERNAME: Final = "smile"
 DEFAULT_PORT: Final = 80
+DEFAULT_PW_MAX: Final = 30.0
+DEFAULT_PW_MIN: Final = 4.0
 NONE: Final = "None"
 FAKE_APPL: Final = "aaaa0000aaaa0000aaaa0000aaaa00aa"
 FAKE_LOC: Final = "0000aaaa0000aaaa0000aaaa0000aa00"

plugwise/helper.py

@@ -25,6 +25,8 @@
     BINARY_SENSORS,
     DATA,
     DAYS,
+    DEFAULT_PW_MAX,
+    DEFAULT_PW_MIN,
     DEVICE_MEASUREMENTS,
     ENERGY_KILO_WATT_HOUR,
     ENERGY_WATT_HOUR,
@@ -794,16 +796,21 @@ def _presets(self, loc_id: str) -> dict[str, list[float]]:
 
             for directive in directives:
                 preset = directive.find("then").attrib
-                keys, dummy = zip(*preset.items())
-                if str(keys[0]) == "setpoint":
-                    presets[directive.attrib["preset"]] = [
-                        float(preset.get("setpoint")),
-                        0,
-                    ]
+                if "setpoint" in preset:
+                    if not self._cooling_present or self._cooling_enabled:
+                        presets[directive.attrib["preset"]] = [
+                            float(preset["setpoint"]),
+                            DEFAULT_PW_MIN,
+                        ]
+                    else:
+                        presets[directive.attrib["preset"]] = [  # pragma: no cover
+                            float(preset["setpoint"]),
+                            DEFAULT_PW_MAX,
+                        ]
                 else:
                     presets[directive.attrib["preset"]] = [
-                        float(preset.get("heating_setpoint")),
-                        float(preset.get("cooling_setpoint")),
+                        float(preset["heating_setpoint"]),
+                        float(preset["cooling_setpoint"]),
                     ]
 
         return presets
@@ -1241,14 +1248,24 @@ def _schedules(
         for rule_id, loc_id in rule_ids.items():
             name = self._domain_objects.find(f'./rule[@id="{rule_id}"]/name').text
             schedule: dict[str, list[float]] = {}
-            # Only process the active schedule in detail for Anna with cooling
+            # Only process the active schedule in detail for Adam or Anna with cooling
             if self._cooling_present and loc_id != NONE:
                 locator = f'./rule[@id="{rule_id}"]/directives'
                 directives = self._domain_objects.find(locator)
                 for directive in directives:
                     entry = directive.find("then").attrib
-                    keys, dummy = zip(*entry.items())
-                    if str(keys[0]) == "preset":
+                    if "setpoint" in entry:
+                        if not self._cooling_present or self._cooling_enabled:
+                            schedule[directive.attrib["time"]] = [
+                                float(entry["setpoint"]),
+                                DEFAULT_PW_MIN,
+                            ]
+                        else:
+                            schedule[directive.attrib["time"]] = [
+                                float(entry["setpoint"]),
+                                DEFAULT_PW_MAX,
+                            ]
+                    elif "preset" in entry:
                         schedule[directive.attrib["time"]] = [
                             float(self._presets(loc_id)[entry["preset"]][0]),
                             float(self._presets(loc_id)[entry["preset"]][1]),

py.typed

@@ -35,7 +35,6 @@ def readme():
     author_email="[email protected]",
     license="MIT",
     packages=find_packages(),
-    package_data={"plugwise": ["py.typed"]},
     install_requires=[
         "aiohttp",
         "async_timeout",

setup.py

@@ -1979,7 +1979,7 @@
 		<directives>
 			<when time="[sa 16:30,sa 23:30)"><then preset="home"/></when>
 			<when time="[su 09:00,su 23:00)"><then preset="home"/></when>
-			<when time="[sa 23:30,su 09:00)"><then preset="asleep"/></when>
+			<when time="[sa 23:30,su 09:00)"><then setpoint="17.5"/></when>
 			<when time="[fr 23:30,sa 08:30)"><then preset="asleep"/></when>
 			<when time="[sa 08:30,sa 16:30)"><then preset="away"/></when>
 			<when time="[su 23:00,mo 08:00)"><then preset="asleep"/></when>

userdata/adam_heatpump_cooling/core.domain_objects.xml

@@ -2010,7 +2010,7 @@
 			<when time="[tu 06:45,we 06:45)"><then preset="home"/></when>
 			<when time="[we 06:45,th 06:45)"><then preset="home"/></when>
 			<when time="[th 06:45,fr 06:45)"><then preset="home"/></when>
-			<when time="[fr 06:45,su 08:30)"><then preset="home"/></when>
+			<when time="[fr 06:45,su 08:30)"><then setpoint="21.5"/></when>
 			<when time="[su 22:45,mo 23:00)"><then preset="asleep"/></when>
 			<when time="[mo 23:00,th 23:00)"><then preset="asleep"/></when>
 			<when time="[th 23:00,fr 23:00)"><then preset="asleep"/></when>