diff --git a/CHANGELOG.md b/CHANGELOG.md index 3490646b4..473a4c35a 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 +- Add setting the thermostat temperature_offset to the 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 diff --git a/plugwise/__init__.py b/plugwise/__init__.py index cc886c27d..d9e575cc8 100644 --- a/plugwise/__init__.py +++ b/plugwise/__init__.py @@ -325,12 +325,12 @@ 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 = None, ) -> 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 diff --git a/plugwise/legacy/smile.py b/plugwise/legacy/smile.py index d3277ed04..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, ) -> None: """Set-function placeholder for legacy devices.""" diff --git a/plugwise/smile.py b/plugwise/smile.py index 6437ba47e..555c8679d 100644 --- a/plugwise/smile.py +++ b/plugwise/smile.py @@ -184,12 +184,12 @@ 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, ) -> 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 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" diff --git a/tests/test_init.py b/tests/test_init.py index 94e489248..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) + 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("dummy", new_offset, dev_id=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: