From dab4b28a25bd6f90343107e4cd2f363a6c459565 Mon Sep 17 00:00:00 2001
From: Bouwe Westerdijk <bouwe.s.westerdijk@gmail.com>
Date: Mon, 13 Jul 2026 20:15:11 +0200
Subject: [PATCH 01/21] Correct m_adam_heating water_temperature

---
 scripts/manual_fixtures.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/manual_fixtures.py b/scripts/manual_fixtures.py
index a62d9cf3b..4c0c30b7e 100755
--- a/scripts/manual_fixtures.py
+++ b/scripts/manual_fixtures.py
@@ -131,6 +131,9 @@ def json_writer(manual_name: str, output: dict) -> None:
 m_adam_cooling["056ee145a816487eaa69243c3280f8bf"]["sensors"][
     "intended_boiler_temperature"
 ] = 17.5
+m_adam_cooling["056ee145a816487eaa69243c3280f8bf"]["sensors"][
+    "water_temperature"
+] = 19.0
 
 json_writer("m_adam_cooling", m_adam_cooling)
 

From aebdaa9694911a43adce232c2e9406a9b572a506 Mon Sep 17 00:00:00 2001
From: Bouwe Westerdijk <bouwe.s.westerdijk@gmail.com>
Date: Mon, 13 Jul 2026 20:18:55 +0200
Subject: [PATCH 02/21] Correct m_anna_heatpump_cooling fixture

---
 scripts/manual_fixtures.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/scripts/manual_fixtures.py b/scripts/manual_fixtures.py
index 4c0c30b7e..fd25e76df 100755
--- a/scripts/manual_fixtures.py
+++ b/scripts/manual_fixtures.py
@@ -255,6 +255,9 @@ def json_writer(manual_name: str, output: dict) -> None:
 
 m_anna_heatpump_cooling["1cbf783bb11e4a7c8a6843dee3a86927"]["maximum_boiler_temperature"]["current"] = 22.7
 m_anna_heatpump_cooling["1cbf783bb11e4a7c8a6843dee3a86927"]["max_dhw_temperature"]["current"] = 41.5
+m_anna_heatpump_cooling["1cbf783bb11e4a7c8a6843dee3a86927"]["sensors"][
+    "dhw_temperature"
+] = 41.5
 m_anna_heatpump_cooling["1cbf783bb11e4a7c8a6843dee3a86927"]["sensors"][
     "intended_boiler_temperature"
 ] = 0.0
@@ -267,6 +270,9 @@ def json_writer(manual_name: str, output: dict) -> None:
 m_anna_heatpump_cooling["1cbf783bb11e4a7c8a6843dee3a86927"]["sensors"][
     "outdoor_air_temperature"
 ] = 28.0
+m_anna_heatpump_cooling["1cbf783bb11e4a7c8a6843dee3a86927"]["sensors"][
+    "water_temperature"
+] = 22.7
 
 # Go for 015a
 m_anna_heatpump_cooling["015ae9ea3f964e668e490fa39da3870b"]["sensors"][

From 9cf82822438249abbcd315f52ce9d64ae58383ec Mon Sep 17 00:00:00 2001
From: Bouwe Westerdijk <bouwe.s.westerdijk@gmail.com>
Date: Wed, 15 Jul 2026 19:40:23 +0200
Subject: [PATCH 03/21] Optimize set_dhw_mode(), set_select(),
 set_schedule_state() functions

---
 plugwise/smile.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugwise/smile.py b/plugwise/smile.py
index 39deea4ce..b1a482a3a 100644
--- a/plugwise/smile.py
+++ b/plugwise/smile.py
@@ -232,7 +232,7 @@ async def set_preset(self, loc_id: str, preset: str) -> None:
         await self.call_request(uri, method="put", data=data)
 
     async def set_select(
-        self, key: str, appl_or_loc_id: str, option: str, state: str | None
+        self, key: str, appl_or_loc_id: str, option: str,
     ) -> None:
         """Set a dhw/gateway/regulation mode or the thermostat schedule option."""
         match key:
@@ -247,13 +247,13 @@ async def set_select(
             case "select_schedule":
                 # The schedule name corresponds to the select option
                 # Location id is passed
-                await self.set_schedule_state(appl_or_loc_id, state, option)
+                await self.set_schedule_state(appl_or_loc_id, option)
             case "select_zone_profile":
                 # Location id is passed
                 await self.set_zone_profile(appl_or_loc_id, option)
 
     async def set_dhw_mode(
-        self, key: str, appl_id: str, length: int, mode: str
+        self, key: str, appl_id: str, mode: str, length: int
     ) -> None:
         """Set the domestic hot water mode.
 
@@ -266,7 +266,7 @@ async def set_dhw_mode(
 
         match length:
             case 2:
-                await self.set_select(key, appl_id, mode, None)
+                await self.set_select(key, appl_id, mode)
             case _:
                 data = (
                     "<domestic_hot_water_mode_control_functionality>"
@@ -344,8 +344,8 @@ async def set_zone_profile(self, loc_id: str, profile: str) -> None:
     async def set_schedule_state(
         self,
         loc_id: str,
-        new_state: str | None,
         name: str | None,
+        new_state: str | None,
     ) -> None:
         """Activate/deactivate the Schedule, with the given name, on the relevant Thermostat.
 

From 8900a2c4be1244920c7606597574f1ffce54eae7 Mon Sep 17 00:00:00 2001
From: Bouwe Westerdijk <bouwe.s.westerdijk@gmail.com>
Date: Wed, 15 Jul 2026 19:47:24 +0200
Subject: [PATCH 04/21] Also optimize the legacy set-functions

---
 plugwise/legacy/smile.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugwise/legacy/smile.py b/plugwise/legacy/smile.py
index 419f2fde9..897555401 100644
--- a/plugwise/legacy/smile.py
+++ b/plugwise/legacy/smile.py
@@ -132,7 +132,7 @@ async def reboot_gateway(self) -> None:
         """Set-function placeholder for legacy devices."""
 
     async def set_dhw_mode(
-        self, key: str, location: str, length: int, mode: str
+        self, key: str, location: str, mode: str, length: int,
     ) -> None:
         """Set-function placeholder for legacy devices."""
 
@@ -170,14 +170,14 @@ async def set_regulation_mode(self, mode: str) -> None:
         """Set-function placeholder for legacy devices."""
 
     async def set_select(
-        self, key: str, loc_id: str, option: str, state: str | None
+        self, key: str, loc_id: str, option: str,
     ) -> None:
         """Set the thermostat schedule option."""
         # schedule name corresponds to select option
-        await self.set_schedule_state("dummy", state, option)
+        await self.set_schedule_state("dummy", option)
 
     async def set_schedule_state(
-        self, _: str, state: str | None, name: str | None
+        self, _: str, name: str | None, state: str | None = None,
     ) -> None:
         """Activate/deactivate the Schedule.
 

From 8b1c9394ba1c385c41803aafcc890dfc5c064a05 Mon Sep 17 00:00:00 2001
From: Bouwe Westerdijk <bouwe.s.westerdijk@gmail.com>
Date: Wed, 15 Jul 2026 19:54:41 +0200
Subject: [PATCH 05/21] Fix test set_select() call

---
 tests/test_init.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_init.py b/tests/test_init.py
index b7947ba4a..3a1e7b408 100644
--- a/tests/test_init.py
+++ b/tests/test_init.py
@@ -744,7 +744,7 @@ async def tinker_thermostat_schedule(
                     new_schedule = new_schedule[1:]
                 _LOGGER.info("- Adjusting schedule to %s", f"{new_schedule}{warning}")
                 try:
-                    await api.set_select("select_schedule", loc_id, new_schedule, state)
+                    await api.set_select("select_schedule", loc_id, new_schedule)
                     tinker_schedule_passed = True
                     _LOGGER.info("  + working as intended")
                 except pw_exceptions.PlugwiseError:

From 20fdf79b4d92a1bd0e0b690fa826863edfa6f756 Mon Sep 17 00:00:00 2001
From: Bouwe Westerdijk <bouwe.s.westerdijk@gmail.com>
Date: Wed, 15 Jul 2026 19:59:36 +0200
Subject: [PATCH 06/21] Update set-function in __init__.py

---
 plugwise/__init__.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/plugwise/__init__.py b/plugwise/__init__.py
index fe8a9470e..30fac7404 100644
--- a/plugwise/__init__.py
+++ b/plugwise/__init__.py
@@ -358,11 +358,10 @@ async def set_select(
         key: str,
         loc_id: str,
         option: str,
-        state: str | None = None,
     ) -> None:
         """Set the selected option for the applicable Select."""
         try:
-            await self._smile_api.set_select(key, loc_id, option, state)
+            await self._smile_api.set_select(key, loc_id, option)
         except ConnectionFailedError as exc:
             raise ConnectionFailedError(
                 f"Failed to set select option '{option}': {str(exc)}"
@@ -371,12 +370,12 @@ async def set_select(
     async def set_schedule_state(
         self,
         loc_id: str,
-        state: str | None,
         name: str | None = None,
+        state: str | None = None
     ) -> None:
         """Activate/deactivate the Schedule, with the given name, on the relevant Thermostat."""
         try:
-            await self._smile_api.set_schedule_state(loc_id, state, name)
+            await self._smile_api.set_schedule_state(loc_id, name, state)
         except ConnectionFailedError as exc:  # pragma no cover
             raise ConnectionFailedError(
                 f"Failed to set schedule state: {str(exc)}"
@@ -462,12 +461,12 @@ async def set_regulation_mode(self, mode: str) -> None:
             ) from exc  # pragma no cover
 
     async def set_dhw_mode(
-        self, key: str, location: str, length: int, mode: str
+        self, key: str, location: str, mode: str, length: int,
     ) -> None:
         """Set the domestic hot water heating regulation mode."""
         try:  # pragma no cover
             await self._smile_api.set_dhw_mode(
-                key, location, length, mode
+                key, location, mode, length,
             )  # pragma: no cover
         except ConnectionFailedError as exc:  # pragma no cover
             raise ConnectionFailedError(

From c1c9cadc290f166f390279f6fe578426396819a2 Mon Sep 17 00:00:00 2001
From: Bouwe Westerdijk <bouwe.s.westerdijk@gmail.com>
Date: Wed, 15 Jul 2026 20:13:21 +0200
Subject: [PATCH 07/21] Try different approach for state

---
 plugwise/__init__.py     |  2 +-
 plugwise/legacy/smile.py |  6 +++---
 plugwise/smile.py        | 14 ++++++++------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/plugwise/__init__.py b/plugwise/__init__.py
index 30fac7404..27c13fdde 100644
--- a/plugwise/__init__.py
+++ b/plugwise/__init__.py
@@ -371,7 +371,7 @@ async def set_schedule_state(
         self,
         loc_id: str,
         name: str | None = None,
-        state: str | None = None
+        state: str | None = None,
     ) -> None:
         """Activate/deactivate the Schedule, with the given name, on the relevant Thermostat."""
         try:
diff --git a/plugwise/legacy/smile.py b/plugwise/legacy/smile.py
index 897555401..337b4a648 100644
--- a/plugwise/legacy/smile.py
+++ b/plugwise/legacy/smile.py
@@ -170,14 +170,14 @@ async def set_regulation_mode(self, mode: str) -> None:
         """Set-function placeholder for legacy devices."""
 
     async def set_select(
-        self, key: str, loc_id: str, option: str,
+        self, key: str, loc_id: str, option: str, state: str | None = None,
     ) -> None:
         """Set the thermostat schedule option."""
         # schedule name corresponds to select option
-        await self.set_schedule_state("dummy", option)
+        await self.set_schedule_state("loc_id", option, state=state)
 
     async def set_schedule_state(
-        self, _: str, name: str | None, state: str | None = None,
+        self, _: str, name: str | None = None, state: str | None = None,
     ) -> None:
         """Activate/deactivate the Schedule.
 
diff --git a/plugwise/smile.py b/plugwise/smile.py
index b1a482a3a..ca7cc9779 100644
--- a/plugwise/smile.py
+++ b/plugwise/smile.py
@@ -345,7 +345,7 @@ async def set_schedule_state(
         self,
         loc_id: str,
         name: str | None,
-        new_state: str | None,
+        state: str | None = None
     ) -> None:
         """Activate/deactivate the Schedule, with the given name, on the relevant Thermostat.
 
@@ -353,12 +353,14 @@ async def set_schedule_state(
         Used in HA Core to set the hvac_mode: in practice switch between schedule on - off.
         """
         # Input checking
-        if new_state not in (STATE_OFF, STATE_ON):
+        if state is None:
+            state = STATE_ON
+        elif state not in (STATE_OFF, STATE_ON):
             raise PlugwiseError("Plugwise: invalid schedule state.")
 
         # Translate selection of Off-schedule-option to disabling the active schedule
         if name == OFF:
-            new_state = STATE_OFF
+            state = STATE_OFF
 
         # Handle no schedule-name / schedule-off requested: find the active schedule
         if name is None or name == OFF:
@@ -372,7 +374,7 @@ async def set_schedule_state(
             raise PlugwiseError("Plugwise: no schedule with this name available.")
 
         # If no state change is requested, do nothing
-        if new_state == self._schedule_old_states[loc_id][name]:
+        if state == self._schedule_old_states[loc_id][name]:
             return
 
         schedule_rule_id: str = next(iter(schedule_rule))
@@ -384,7 +386,7 @@ async def set_schedule_state(
             template_id = self._domain_objects.find(locator).get("id")
             template = f'<template id="{template_id}" />'
 
-        contexts = self.determine_contexts(loc_id, new_state, schedule_rule_id)
+        contexts = self.determine_contexts(loc_id, state, schedule_rule_id)
         data = (
             "<rules>"
             f"<rule id='{schedule_rule_id}'>"
@@ -396,7 +398,7 @@ async def set_schedule_state(
         )
         uri = f"{RULES};id={schedule_rule_id}"
         await self.call_request(uri, method="put", data=data)
-        self._schedule_old_states[loc_id][name] = new_state
+        self._schedule_old_states[loc_id][name] = state
 
     def determine_contexts(self, loc_id: str, state: str, sched_id: str) -> str:
         """Helper-function for set_schedule_state()."""

From beef1cc8a6acaf9d2483a30843ed45c2f1df6329 Mon Sep 17 00:00:00 2001
From: Bouwe Westerdijk <bouwe.s.westerdijk@gmail.com>
Date: Wed, 15 Jul 2026 20:20:29 +0200
Subject: [PATCH 08/21] Adapt test-set_schedule_state() call

---
 tests/test_adam.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test_adam.py b/tests/test_adam.py
index bb32bf2a8..15da5f21e 100644
--- a/tests/test_adam.py
+++ b/tests/test_adam.py
@@ -77,10 +77,10 @@ async def test_connect_adam_plus_anna_new(self):
         assert result
 
         # Special test-case for turning a schedule off based on only the location id.
-        await api.set_schedule_state("f2bf9048bef64cc5b6d5110154e33c81", "off")
+        await api.set_schedule_state("f2bf9048bef64cc5b6d5110154e33c81", None, "off")
 
         # Special test-case for turning a schedule off for a location via the option "off".
-        await api.set_schedule_state("f2bf9048bef64cc5b6d5110154e33c81", "on", "off")
+        await api.set_schedule_state("f2bf9048bef64cc5b6d5110154e33c81", "off", "on")
 
         # bad schedule-state test
         result = await self.tinker_thermostat_schedule(

From 26f758e11091e5a3915a10e7f1d8a48532c7fb87 Mon Sep 17 00:00:00 2001
From: Bouwe Westerdijk <bouwe.s.westerdijk@gmail.com>
Date: Wed, 15 Jul 2026 20:28:00 +0200
Subject: [PATCH 09/21] Adapt set_dhw_mode() call

---
 tests/test_init.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_init.py b/tests/test_init.py
index 3a1e7b408..bcf09f765 100644
--- a/tests/test_init.py
+++ b/tests/test_init.py
@@ -860,7 +860,7 @@ async def tinker_dhw_mode(api, appliance, key, length, unhappy=False):
                 mode = mode[1:]
             _LOGGER.info("%s", f"- Adjusting dhw mode to {mode}{warning}")
             try:
-                await api.set_dhw_mode(key, appliance, length, mode)
+                await api.set_dhw_mode(key, appliance, mode, length)
                 _LOGGER.info("  + tinker_dhw_mode worked as intended")
                 tinker_dhw_mode_passed = True
             except pw_exceptions.PlugwiseError:

From 39f61f3c4e3bf5604df8b2dc85190ba575760f2f Mon Sep 17 00:00:00 2001
From: Bouwe Westerdijk <bouwe.s.westerdijk@gmail.com>
Date: Wed, 15 Jul 2026 20:31:35 +0200
Subject: [PATCH 10/21] Adapt set_select() in __init__.py

---
 plugwise/__init__.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugwise/__init__.py b/plugwise/__init__.py
index 27c13fdde..488423f15 100644
--- a/plugwise/__init__.py
+++ b/plugwise/__init__.py
@@ -358,10 +358,11 @@ async def set_select(
         key: str,
         loc_id: str,
         option: str,
+        state: str | None = None,
     ) -> None:
         """Set the selected option for the applicable Select."""
         try:
-            await self._smile_api.set_select(key, loc_id, option)
+            await self._smile_api.set_select(key, loc_id, option, state=state)
         except ConnectionFailedError as exc:
             raise ConnectionFailedError(
                 f"Failed to set select option '{option}': {str(exc)}"
@@ -375,7 +376,7 @@ async def set_schedule_state(
     ) -> None:
         """Activate/deactivate the Schedule, with the given name, on the relevant Thermostat."""
         try:
-            await self._smile_api.set_schedule_state(loc_id, name, state)
+            await self._smile_api.set_schedule_state(loc_id, name=name, state=state)
         except ConnectionFailedError as exc:  # pragma no cover
             raise ConnectionFailedError(
                 f"Failed to set schedule state: {str(exc)}"

From 2d8bb39dc7d5f86eed43c9b103d0f4cc1100f6e2 Mon Sep 17 00:00:00 2001
From: Bouwe Westerdijk <bouwe.s.westerdijk@gmail.com>
Date: Thu, 16 Jul 2026 08:22:06 +0200
Subject: [PATCH 11/21] Save Copilot fix

---
 plugwise/smile.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/plugwise/smile.py b/plugwise/smile.py
index ca7cc9779..8bec483d7 100644
--- a/plugwise/smile.py
+++ b/plugwise/smile.py
@@ -232,7 +232,11 @@ async def set_preset(self, loc_id: str, preset: str) -> None:
         await self.call_request(uri, method="put", data=data)
 
     async def set_select(
-        self, key: str, appl_or_loc_id: str, option: str,
+        self,
+        key: str,
+        appl_or_loc_id: str,
+        option: str,
+        state: str | None = None,
     ) -> None:
         """Set a dhw/gateway/regulation mode or the thermostat schedule option."""
         match key:
@@ -247,7 +251,7 @@ async def set_select(
             case "select_schedule":
                 # The schedule name corresponds to the select option
                 # Location id is passed
-                await self.set_schedule_state(appl_or_loc_id, option)
+                await self.set_schedule_state(appl_or_loc_id, option, state=state)
             case "select_zone_profile":
                 # Location id is passed
                 await self.set_zone_profile(appl_or_loc_id, option)

From 6c37c9eb249b60cee0839edb38088dc7d344abf6 Mon Sep 17 00:00:00 2001
From: Bouwe Westerdijk <bouwe.s.westerdijk@gmail.com>
Date: Thu, 16 Jul 2026 08:25:46 +0200
Subject: [PATCH 12/21] Ruffed

---
 plugwise/__init__.py     | 11 +++++++++--
 plugwise/legacy/smile.py | 17 ++++++++++++++---
 plugwise/smile.py        |  5 +----
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/plugwise/__init__.py b/plugwise/__init__.py
index 488423f15..3fff9be68 100644
--- a/plugwise/__init__.py
+++ b/plugwise/__init__.py
@@ -462,12 +462,19 @@ async def set_regulation_mode(self, mode: str) -> None:
             ) from exc  # pragma no cover
 
     async def set_dhw_mode(
-        self, key: str, location: str, mode: str, length: int,
+        self,
+        key: str,
+        location: str,
+        mode: str,
+        length: int,
     ) -> None:
         """Set the domestic hot water heating regulation mode."""
         try:  # pragma no cover
             await self._smile_api.set_dhw_mode(
-                key, location, mode, length,
+                key,
+                location,
+                mode,
+                length,
             )  # pragma: no cover
         except ConnectionFailedError as exc:  # pragma no cover
             raise ConnectionFailedError(
diff --git a/plugwise/legacy/smile.py b/plugwise/legacy/smile.py
index 337b4a648..b81ae360e 100644
--- a/plugwise/legacy/smile.py
+++ b/plugwise/legacy/smile.py
@@ -132,7 +132,11 @@ async def reboot_gateway(self) -> None:
         """Set-function placeholder for legacy devices."""
 
     async def set_dhw_mode(
-        self, key: str, location: str, mode: str, length: int,
+        self,
+        key: str,
+        location: str,
+        mode: str,
+        length: int,
     ) -> None:
         """Set-function placeholder for legacy devices."""
 
@@ -170,14 +174,21 @@ async def set_regulation_mode(self, mode: str) -> None:
         """Set-function placeholder for legacy devices."""
 
     async def set_select(
-        self, key: str, loc_id: str, option: str, state: str | None = None,
+        self,
+        key: str,
+        loc_id: str,
+        option: str,
+        state: str | None = None,
     ) -> None:
         """Set the thermostat schedule option."""
         # schedule name corresponds to select option
         await self.set_schedule_state("loc_id", option, state=state)
 
     async def set_schedule_state(
-        self, _: str, name: str | None = None, state: str | None = None,
+        self,
+        _: str,
+        name: str | None = None,
+        state: str | None = None,
     ) -> None:
         """Activate/deactivate the Schedule.
 
diff --git a/plugwise/smile.py b/plugwise/smile.py
index 8bec483d7..b060ae82f 100644
--- a/plugwise/smile.py
+++ b/plugwise/smile.py
@@ -346,10 +346,7 @@ async def set_zone_profile(self, loc_id: str, profile: str) -> None:
         await self.call_request(uri, method="post", data=data)
 
     async def set_schedule_state(
-        self,
-        loc_id: str,
-        name: str | None,
-        state: str | None = None
+        self, loc_id: str, name: str | None, state: str | None = None
     ) -> None:
         """Activate/deactivate the Schedule, with the given name, on the relevant Thermostat.
 

From 596321c5ae92fec9c631ee4e4cb79b8121b7b968 Mon Sep 17 00:00:00 2001
From: Bouwe Westerdijk <bouwe.s.westerdijk@gmail.com>
Date: Thu, 16 Jul 2026 08:26:35 +0200
Subject: [PATCH 13/21] Save updated fixtures

---
 fixtures/m_adam_cooling/data.json          | 2 +-
 fixtures/m_anna_heatpump_cooling/data.json | 4 ++--
 fixtures/m_anna_heatpump_idle/data.json    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/fixtures/m_adam_cooling/data.json b/fixtures/m_adam_cooling/data.json
index da02a5282..508fbbb54 100644
--- a/fixtures/m_adam_cooling/data.json
+++ b/fixtures/m_adam_cooling/data.json
@@ -25,7 +25,7 @@
     "select_dhw_mode": "eco",
     "sensors": {
       "intended_boiler_temperature": 17.5,
-      "water_temperature": 43.0
+      "water_temperature": 19.0
     },
     "switches": {
       "dhw_cm_switch": false
diff --git a/fixtures/m_anna_heatpump_cooling/data.json b/fixtures/m_anna_heatpump_cooling/data.json
index 2caf94cca..5a902c45d 100644
--- a/fixtures/m_anna_heatpump_cooling/data.json
+++ b/fixtures/m_anna_heatpump_cooling/data.json
@@ -52,13 +52,13 @@
     "model": "Generic heater/cooler",
     "name": "OpenTherm",
     "sensors": {
-      "dhw_temperature": 46.3,
+      "dhw_temperature": 41.5,
       "intended_boiler_temperature": 0.0,
       "modulation_level": 40,
       "outdoor_air_temperature": 28.0,
       "return_temperature": 23.8,
       "water_pressure": 1.57,
-      "water_temperature": 29.1
+      "water_temperature": 22.7
     },
     "switches": {
       "dhw_cm_switch": false
diff --git a/fixtures/m_anna_heatpump_idle/data.json b/fixtures/m_anna_heatpump_idle/data.json
index c41b5b7d7..652d1591f 100644
--- a/fixtures/m_anna_heatpump_idle/data.json
+++ b/fixtures/m_anna_heatpump_idle/data.json
@@ -52,13 +52,13 @@
     "model": "Generic heater/cooler",
     "name": "OpenTherm",
     "sensors": {
-      "dhw_temperature": 46.3,
+      "dhw_temperature": 41.5,
       "intended_boiler_temperature": 18.0,
       "modulation_level": 0,
       "outdoor_air_temperature": 28.2,
       "return_temperature": 22.0,
       "water_pressure": 1.57,
-      "water_temperature": 29.1
+      "water_temperature": 22.7
     },
     "switches": {
       "dhw_cm_switch": false

From a2b3c59e19fde30f003e10940ea156d564367bac Mon Sep 17 00:00:00 2001
From: Bouwe Westerdijk <bouwe.s.westerdijk@gmail.com>
Date: Thu, 16 Jul 2026 18:10:12 +0200
Subject: [PATCH 14/21] Widen name scope options

---
 plugwise/smile.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugwise/smile.py b/plugwise/smile.py
index b060ae82f..3e5a90126 100644
--- a/plugwise/smile.py
+++ b/plugwise/smile.py
@@ -366,7 +366,7 @@ async def set_schedule_state(
         # Handle no schedule-name / schedule-off requested: find the active schedule
         if name is None or name == OFF:
             _, name = self._schedules(loc_id)
-            if name == OFF:  # no active schedule found, nothing to do
+            if name in (NONE, OFF):  # no active schedule found, nothing to do
                 return
 
         schedule_rule = self._rule_ids_by_name(name, loc_id)

From 22753ee683bb124b9a7602c4238d8f283ebf7b87 Mon Sep 17 00:00:00 2001
From: Bouwe Westerdijk <bouwe.s.westerdijk@gmail.com>
Date: Thu, 16 Jul 2026 18:18:14 +0200
Subject: [PATCH 15/21] Increase test coverage for set_schedule_state()

---
 tests/test_adam.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/test_adam.py b/tests/test_adam.py
index 15da5f21e..3cd9d1d41 100644
--- a/tests/test_adam.py
+++ b/tests/test_adam.py
@@ -82,6 +82,12 @@ async def test_connect_adam_plus_anna_new(self):
         # Special test-case for turning a schedule off for a location via the option "off".
         await api.set_schedule_state("f2bf9048bef64cc5b6d5110154e33c81", "off", "on")
 
+        # Special test-case for setting a schedule to an invalid state.
+        with pytest.raises(pw_exceptions.PlugwiseError):
+            await api.set_schedule_state(
+                "f2bf9048bef64cc5b6d5110154e33c81", "Weekschema", "eco"
+            )
+
         # bad schedule-state test
         result = await self.tinker_thermostat_schedule(
             api,

From 5b8b10a7a15f1b4a687faa0845a4c7e9ea85729a Mon Sep 17 00:00:00 2001
From: Bouwe Westerdijk <bouwe.s.westerdijk@gmail.com>
Date: Thu, 16 Jul 2026 18:25:49 +0200
Subject: [PATCH 16/21] Update CHANGELOG

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 81f77b84d..f3f878629 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Ongoing
+
+- Improve manual fixtures script, reorder set_schedule_state() arguments for better compatibility with set_dhw_mode()
+
 ## v1.14.0
 
 - Include both old and new entities for a step-wise introduction of water_heaters in HA via PR [#895](https://github.com/plugwise/python-plugwise/pull/895):

From 42e6a89f12e06315943fc16aa13a18384bc2b189 Mon Sep 17 00:00:00 2001
From: Bouwe Westerdijk <bouwe.s.westerdijk@gmail.com>
Date: Thu, 16 Jul 2026 18:32:17 +0200
Subject: [PATCH 17/21] Legacy set_select: handle unused key argument

---
 plugwise/legacy/smile.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugwise/legacy/smile.py b/plugwise/legacy/smile.py
index b81ae360e..6b4399b54 100644
--- a/plugwise/legacy/smile.py
+++ b/plugwise/legacy/smile.py
@@ -175,7 +175,7 @@ async def set_regulation_mode(self, mode: str) -> None:
 
     async def set_select(
         self,
-        key: str,
+        _: str,
         loc_id: str,
         option: str,
         state: str | None = None,

From d4699a6cd7cfc9333d895c3c188ed72f53d0e544 Mon Sep 17 00:00:00 2001
From: Bouwe Westerdijk <bouwe.s.westerdijk@gmail.com>
Date: Thu, 16 Jul 2026 18:42:41 +0200
Subject: [PATCH 18/21] Implement nitpick suggestion

---
 plugwise/smile.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugwise/smile.py b/plugwise/smile.py
index 3e5a90126..02508701a 100644
--- a/plugwise/smile.py
+++ b/plugwise/smile.py
@@ -346,7 +346,7 @@ async def set_zone_profile(self, loc_id: str, profile: str) -> None:
         await self.call_request(uri, method="post", data=data)
 
     async def set_schedule_state(
-        self, loc_id: str, name: str | None, state: str | None = None
+        self, loc_id: str, name: str | None = None, state: str | None = None
     ) -> None:
         """Activate/deactivate the Schedule, with the given name, on the relevant Thermostat.
 

From 73c04804eceeef061500e694530d3c7821bd4473 Mon Sep 17 00:00:00 2001
From: Bouwe Westerdijk <bouwe.s.westerdijk@gmail.com>
Date: Thu, 16 Jul 2026 18:51:09 +0200
Subject: [PATCH 19/21] Update CHANGELOG

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f3f878629..82119a1db 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## Ongoing
 
-- Improve manual fixtures script, reorder set_schedule_state() arguments for better compatibility with set_dhw_mode()
+- Improve manual fixtures script, reorder set_schedule_state() arguments for better compatibility with set_dhw_mode(), via PR[#897](https://github.com/plugwise/python-plugwise/pull/897)
 
 ## v1.14.0
 

From e2edd7a087857e1a7ecc380dfdab49efa9569e2a Mon Sep 17 00:00:00 2001
From: Bouwe Westerdijk <bouwe.s.westerdijk@gmail.com>
Date: Thu, 16 Jul 2026 18:52:01 +0200
Subject: [PATCH 20/21] Set version to v1.14.1

---
 CHANGELOG.md   | 2 +-
 pyproject.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 82119a1db..f62626b08 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## Ongoing
+## v1.14.1
 
 - Improve manual fixtures script, reorder set_schedule_state() arguments for better compatibility with set_dhw_mode(), via PR[#897](https://github.com/plugwise/python-plugwise/pull/897)
 
diff --git a/pyproject.toml b/pyproject.toml
index ff5146d20..649b08fb7 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name            = "plugwise"
-version         = "1.14.0"
+version         = "1.14.1a0"
 license         = "MIT"
 description     = "Plugwise Smile (Adam/Anna/P1) and Stretch module for Python 3."
 readme          = "README.md"

From 205dfd768e1bfb1d63a5b97cb472e4d648048044 Mon Sep 17 00:00:00 2001
From: Bouwe Westerdijk <bouwe.s.westerdijk@gmail.com>
Date: Fri, 17 Jul 2026 07:48:20 +0200
Subject: [PATCH 21/21] Release-version v1.14.1

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 649b08fb7..a1092e395 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name            = "plugwise"
-version         = "1.14.1a0"
+version         = "1.14.1"
 license         = "MIT"
 description     = "Plugwise Smile (Adam/Anna/P1) and Stretch module for Python 3."
 readme          = "README.md"