Merge pull request #237 from plugwise/fix-25_6

Correct mistake in v0.25.6

Author: bouwew

CHANGELOG.md

@@ -1,5 +1,7 @@
 # Changelog
 
+# v0.25.7: Correct faulty logic in the v0.25.6 release
+
 # v0.25.6: Revert py.typed, fix Core PR #81531
 
 # v0.25.5: not released

plugwise/__init__.py

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

plugwise/helper.py

@@ -797,15 +797,15 @@ def _presets(self, loc_id: str) -> dict[str, list[float]]:
             for directive in directives:
                 preset = directive.find("then").attrib
                 if "setpoint" in preset:
-                    if not self._cooling_present or self._cooling_enabled:
+                    if not self._cooling_present or not self._cooling_enabled:
                         presets[directive.attrib["preset"]] = [
                             float(preset["setpoint"]),
-                            DEFAULT_PW_MIN,
+                            DEFAULT_PW_MAX,
                         ]
                     else:
                         presets[directive.attrib["preset"]] = [  # pragma: no cover
+                            DEFAULT_PW_MIN,
                             float(preset["setpoint"]),
-                            DEFAULT_PW_MAX,
                         ]
                 else:
                     presets[directive.attrib["preset"]] = [
@@ -1255,15 +1255,15 @@ def _schedules(
                 for directive in directives:
                     entry = directive.find("then").attrib
                     if "setpoint" in entry:
-                        if not self._cooling_present or self._cooling_enabled:
+                        if not self._cooling_present or not self._cooling_enabled:
                             schedule[directive.attrib["time"]] = [
                                 float(entry["setpoint"]),
-                                DEFAULT_PW_MIN,
+                                DEFAULT_PW_MAX,
                             ]
                         else:
                             schedule[directive.attrib["time"]] = [
+                                DEFAULT_PW_MIN,
                                 float(entry["setpoint"]),
-                                DEFAULT_PW_MAX,
                             ]
                     elif "preset" in entry:
                         schedule[directive.attrib["time"]] = [