From 8946ea2d4b68f7c6f153e0c0a09eb20cf3f53da3 Mon Sep 17 00:00:00 2001 From: Bouwe Westerdijk Date: Mon, 13 May 2024 19:31:56 +0200 Subject: [PATCH 1/9] Correct set_number() function --- plugwise/__init__.py | 2 +- plugwise/legacy/smile.py | 2 +- plugwise/smile.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugwise/__init__.py b/plugwise/__init__.py index cc886c27d..0e88a118d 100644 --- a/plugwise/__init__.py +++ b/plugwise/__init__.py @@ -327,7 +327,7 @@ async def set_number( self, key: str, temperature: float, - dev_id: str | None = None, + dev_id: str, ) -> None: """Set the max. Boiler or DHW setpoint on the Central Heating boiler.""" await self._smile_api.set_number(key, temperature, dev_id) diff --git a/plugwise/legacy/smile.py b/plugwise/legacy/smile.py index d3277ed04..a46ed8b61 100644 --- a/plugwise/legacy/smile.py +++ b/plugwise/legacy/smile.py @@ -158,7 +158,7 @@ async def set_number( self, key: str, temperature: float, - dev_id: str | None, + dev_id: str, ) -> None: """Set-function placeholder for legacy devices.""" diff --git a/plugwise/smile.py b/plugwise/smile.py index 6437ba47e..bafb003da 100644 --- a/plugwise/smile.py +++ b/plugwise/smile.py @@ -186,10 +186,10 @@ async def set_number( self, key: str, temperature: float, - dev_id: str | None, + dev_id: str, ) -> None: """Set the maximum boiler- or DHW-setpoint on the Central Heating boiler or the temperature-offset on a Thermostat.""" - if dev_id is not None: + if key == "temperature_offset": await self.set_offset(dev_id, temperature) return From 6a0cca183d5037c457d4ba3312986d53195ee5fb Mon Sep 17 00:00:00 2001 From: Bouwe Westerdijk Date: Mon, 13 May 2024 19:33:23 +0200 Subject: [PATCH 2/9] Adapt relevant tests --- tests/test_init.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_init.py b/tests/test_init.py index 94e489248..3afe6a208 100644 --- a/tests/test_init.py +++ b/tests/test_init.py @@ -876,7 +876,7 @@ async def tinker_max_boiler_temp(smile): _LOGGER.info("- Adjusting temperature to %s", new_temp) for test in ["maximum_boiler_temperature", "bogus_temperature"]: try: - await smile.set_number(test, new_temp) + await smile.set_number(test, new_temp, "dummy") _LOGGER.info(" + tinker_max_boiler_temp worked as intended") except pw_exceptions.PlugwiseError: _LOGGER.info(" + tinker_max_boiler_temp failed as intended") @@ -887,7 +887,7 @@ async def tinker_temp_offset(smile, dev_id): new_offset = 1.0 _LOGGER.info("- Adjusting temperature offset to %s", new_offset) try: - await smile.set_number("dummy", new_offset, dev_id=dev_id) + await smile.set_number("dummy", new_offset, dev_id) _LOGGER.info(" + tinker_temp_offset worked as intended") return True except pw_exceptions.PlugwiseError: From e02cc278d4b544e9af1ed57edfc4688767d67036 Mon Sep 17 00:00:00 2001 From: Bouwe Westerdijk Date: Mon, 13 May 2024 19:39:24 +0200 Subject: [PATCH 3/9] Update tinker_temp_offset() test --- tests/test_init.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/tests/test_init.py b/tests/test_init.py index 3afe6a208..4dc49c521 100644 --- a/tests/test_init.py +++ b/tests/test_init.py @@ -886,13 +886,14 @@ async def tinker_temp_offset(smile, dev_id): """Change temperature_offset to test functionality.""" new_offset = 1.0 _LOGGER.info("- Adjusting temperature offset to %s", new_offset) - try: - await smile.set_number("dummy", new_offset, dev_id) - _LOGGER.info(" + tinker_temp_offset worked as intended") - return True - except pw_exceptions.PlugwiseError: - _LOGGER.info(" + tinker_temp_offset failed as intended") - return False + for test in ["temperature_offset", "bogus_offset"]: + try: + await smile.set_number(test, new_offset, dev_id) + _LOGGER.info(" + tinker_temp_offset worked as intended") + return True + except pw_exceptions.PlugwiseError: + _LOGGER.info(" + tinker_temp_offset failed as intended") + return False @staticmethod async def tinker_gateway_mode(smile): From a67764b4ed8aea98377a0b31307232443d3e6e8e Mon Sep 17 00:00:00 2001 From: Bouwe Westerdijk Date: Mon, 13 May 2024 19:46:52 +0200 Subject: [PATCH 4/9] Simplify testcase --- tests/test_init.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/tests/test_init.py b/tests/test_init.py index 4dc49c521..69a7502e7 100644 --- a/tests/test_init.py +++ b/tests/test_init.py @@ -886,14 +886,13 @@ async def tinker_temp_offset(smile, dev_id): """Change temperature_offset to test functionality.""" new_offset = 1.0 _LOGGER.info("- Adjusting temperature offset to %s", new_offset) - for test in ["temperature_offset", "bogus_offset"]: - try: - await smile.set_number(test, new_offset, dev_id) - _LOGGER.info(" + tinker_temp_offset worked as intended") - return True - except pw_exceptions.PlugwiseError: - _LOGGER.info(" + tinker_temp_offset failed as intended") - return False + try: + await smile.set_number("temperature_offset", new_offset, dev_id) + _LOGGER.info(" + tinker_temp_offset worked as intended") + return True + except pw_exceptions.PlugwiseError: + _LOGGER.info(" + tinker_temp_offset failed as intended") + return False @staticmethod async def tinker_gateway_mode(smile): From b9ed03eb503448239d926098721181e1365f5103 Mon Sep 17 00:00:00 2001 From: Bouwe Westerdijk Date: Mon, 13 May 2024 19:49:45 +0200 Subject: [PATCH 5/9] Update CHANGELOG --- CHANGELOG.md | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3490646b4..0ce19584d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,18 +1,20 @@ # Changelog -## V0.37.4 +## v0.37.5 -- Combine set_temperature_offset() with set_number() -- Fix typo in manual_fixtures.py script +- Combine set_temperature_offset() with set_number() function. +- Fix typo in manual_fixtures.py script. + +## v0.37.4 - not released ## v0.37.3 -- Fix for [plugwise-beta #620](https://github.com/plugwise/plugwise-beta/issues/620) +- Fix for [plugwise-beta #620](https://github.com/plugwise/plugwise-beta/issues/620). ## v0.37.2 -- Code improvements -- Remove unused dependencies from pyproject.toml +- Code improvements. +- Remove unused dependencies from pyproject.toml. ## V0.37.1 From 84ecb3c045df697adbcdd9de1864595d7f7643e3 Mon Sep 17 00:00:00 2001 From: Bouwe Westerdijk Date: Mon, 13 May 2024 19:50:11 +0200 Subject: [PATCH 6/9] Bump to v0.37.5 release-version --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index b852a120d..bd79dde10 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "plugwise" -version = "0.37.4" +version = "0.37.5" license = {file = "LICENSE"} description = "Plugwise Smile (Adam/Anna/P1) and Stretch module for Python 3." readme = "README.md" From 1e384108b1a3a3d70eed926161879c5d471b576d Mon Sep 17 00:00:00 2001 From: Bouwe Westerdijk Date: Mon, 13 May 2024 20:02:55 +0200 Subject: [PATCH 7/9] Improve CHANGELOG --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ce19584d..473a4c35a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## v0.37.5 -- Combine set_temperature_offset() with set_number() function. +- Add setting the thermostat temperature_offset to the set_number() function. - Fix typo in manual_fixtures.py script. ## v0.37.4 - not released From 095b43942d16828f3debbc53872cc8b434eeb78b Mon Sep 17 00:00:00 2001 From: Bouwe Westerdijk Date: Mon, 13 May 2024 20:05:49 +0200 Subject: [PATCH 8/9] Sort --- plugwise/__init__.py | 2 +- plugwise/legacy/smile.py | 2 +- plugwise/smile.py | 2 +- tests/test_init.py | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/plugwise/__init__.py b/plugwise/__init__.py index 0e88a118d..10b3638d5 100644 --- a/plugwise/__init__.py +++ b/plugwise/__init__.py @@ -325,9 +325,9 @@ async def set_temperature(self, loc_id: str, items: dict[str, float]) -> None: async def set_number( self, + dev_id: str, key: str, temperature: float, - dev_id: str, ) -> None: """Set the max. Boiler or DHW setpoint on the Central Heating boiler.""" await self._smile_api.set_number(key, temperature, dev_id) diff --git a/plugwise/legacy/smile.py b/plugwise/legacy/smile.py index a46ed8b61..24761a9da 100644 --- a/plugwise/legacy/smile.py +++ b/plugwise/legacy/smile.py @@ -156,9 +156,9 @@ async def set_gateway_mode(self, mode: str) -> None: async def set_number( self, + dev_id: str, key: str, temperature: float, - dev_id: str, ) -> None: """Set-function placeholder for legacy devices.""" diff --git a/plugwise/smile.py b/plugwise/smile.py index bafb003da..555c8679d 100644 --- a/plugwise/smile.py +++ b/plugwise/smile.py @@ -184,9 +184,9 @@ async def set_gateway_mode(self, mode: str) -> None: async def set_number( self, + dev_id: str, key: str, temperature: float, - dev_id: str, ) -> None: """Set the maximum boiler- or DHW-setpoint on the Central Heating boiler or the temperature-offset on a Thermostat.""" if key == "temperature_offset": diff --git a/tests/test_init.py b/tests/test_init.py index 69a7502e7..c489e7502 100644 --- a/tests/test_init.py +++ b/tests/test_init.py @@ -876,7 +876,7 @@ async def tinker_max_boiler_temp(smile): _LOGGER.info("- Adjusting temperature to %s", new_temp) for test in ["maximum_boiler_temperature", "bogus_temperature"]: try: - await smile.set_number(test, new_temp, "dummy") + await smile.set_number("dummy", test, new_temp) _LOGGER.info(" + tinker_max_boiler_temp worked as intended") except pw_exceptions.PlugwiseError: _LOGGER.info(" + tinker_max_boiler_temp failed as intended") @@ -887,7 +887,7 @@ async def tinker_temp_offset(smile, dev_id): new_offset = 1.0 _LOGGER.info("- Adjusting temperature offset to %s", new_offset) try: - await smile.set_number("temperature_offset", new_offset, dev_id) + await smile.set_number(dev_id, "temperature_offset", new_offset) _LOGGER.info(" + tinker_temp_offset worked as intended") return True except pw_exceptions.PlugwiseError: From af526ead1103bcf913967aafddb0826dedaf7a85 Mon Sep 17 00:00:00 2001 From: Bouwe Westerdijk Date: Mon, 13 May 2024 20:13:07 +0200 Subject: [PATCH 9/9] Fix missed --- plugwise/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugwise/__init__.py b/plugwise/__init__.py index 10b3638d5..d9e575cc8 100644 --- a/plugwise/__init__.py +++ b/plugwise/__init__.py @@ -330,7 +330,7 @@ async def set_number( temperature: float, ) -> None: """Set the max. Boiler or DHW setpoint on the Central Heating boiler.""" - await self._smile_api.set_number(key, temperature, dev_id) + await self._smile_api.set_number(dev_id, key, temperature) async def set_switch_state( self, appl_id: str, members: list[str] | None, model: str, state: str