PyPlumIO 0.5.29__py3-none-any.whl → 0.5.31__py3-none-any.whl

{PyPlumIO-0.5.29.dist-info → PyPlumIO-0.5.31.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: PyPlumIO
-Version: 0.5.29
+Version: 0.5.31
 Summary: PyPlumIO is a native ecoNET library for Plum ecoMAX controllers.
 Author-email: Denis Paavilainen <denpa@denpa.pro>
 License: MIT License
@@ -17,32 +17,33 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Home Automation
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: dataslots ==1.2.0
-Requires-Dist: pyserial-asyncio ==0.6
-Requires-Dist: typing-extensions ==4.12.2
-Provides-Extra: dev
-Requires-Dist: pyplumio[docs,test] ; extra == 'dev'
-Requires-Dist: pre-commit ==4.0.1 ; extra == 'dev'
-Requires-Dist: tomli ==2.0.2 ; extra == 'dev'
-Provides-Extra: docs
-Requires-Dist: sphinx ==8.1.3 ; extra == 'docs'
-Requires-Dist: sphinx-rtd-theme ==3.0.1 ; extra == 'docs'
-Requires-Dist: readthedocs-sphinx-search ==0.3.2 ; extra == 'docs'
+Requires-Dist: dataslots==1.2.0
+Requires-Dist: pyserial-asyncio==0.6
+Requires-Dist: typing-extensions==4.12.2
 Provides-Extra: test
-Requires-Dist: codespell ==2.3.0 ; extra == 'test'
-Requires-Dist: coverage ==7.6.4 ; extra == 'test'
-Requires-Dist: mypy ==1.13.0 ; extra == 'test'
-Requires-Dist: pyserial-asyncio-fast ==0.14 ; extra == 'test'
-Requires-Dist: pytest ==8.3.3 ; extra == 'test'
-Requires-Dist: pytest-asyncio ==0.24.0 ; extra == 'test'
-Requires-Dist: ruff ==0.7.1 ; extra == 'test'
-Requires-Dist: tox ==4.23.2 ; extra == 'test'
-Requires-Dist: types-pyserial ==3.5.0.20240826 ; extra == 'test'
+Requires-Dist: codespell==2.3.0; extra == "test"
+Requires-Dist: coverage==7.6.10; extra == "test"
+Requires-Dist: mypy==1.14.1; extra == "test"
+Requires-Dist: pyserial-asyncio-fast==0.14; extra == "test"
+Requires-Dist: pytest==8.3.4; extra == "test"
+Requires-Dist: pytest-asyncio==0.25.2; extra == "test"
+Requires-Dist: ruff==0.9.2; extra == "test"
+Requires-Dist: tox==4.23.2; extra == "test"
+Requires-Dist: types-pyserial==3.5.0.20241221; extra == "test"
+Provides-Extra: docs
+Requires-Dist: sphinx==8.1.3; extra == "docs"
+Requires-Dist: sphinx_rtd_theme==3.0.2; extra == "docs"
+Requires-Dist: readthedocs-sphinx-search==0.3.2; extra == "docs"
+Provides-Extra: dev
+Requires-Dist: pyplumio[docs,test]; extra == "dev"
+Requires-Dist: pre-commit==4.0.1; extra == "dev"
+Requires-Dist: tomli==2.2.1; extra == "dev"
 
 # PyPlumIO is a native ecoNET library for Plum ecoMAX controllers.
 [![PyPI version](https://badge.fury.io/py/PyPlumIO.svg)](https://badge.fury.io/py/PyPlumIO)

{PyPlumIO-0.5.29.dist-info → PyPlumIO-0.5.31.dist-info}/RECORD

@@ -1,16 +1,16 @@
 pyplumio/__init__.py,sha256=ditJTIOFGJDg60atHzOpiggdUrZHpSynno7MtpZUGVk,3299
 pyplumio/__main__.py,sha256=3IwHHSq-iay5FaeMc95klobe-xv82yydSKcBE7BFZ6M,500
-pyplumio/_version.py,sha256=YLYDNYQKnQz5-FefYBZUB86Rwzn5G_lMcWd9gf_aubQ,413
+pyplumio/_version.py,sha256=Kr7Tq9KjyxEp8tm444HGzXvFWTTLR8xyIJ5ABXwwKGA,413
 pyplumio/connection.py,sha256=6mUbcjGxxEhMVIbzZgCqH-Ez-fcYoRj7ZbVSzpikpNA,5949
 pyplumio/const.py,sha256=LyXa5aVy2KxnZq7H7F8s5SYsAgEC2UzZYMMRauliB2E,5502
 pyplumio/exceptions.py,sha256=Wn-y5AJ5xfaBlHhTUVKB27_0Us8_OVHqh-sicnr9sYA,700
-pyplumio/filters.py,sha256=KK_AV_EHy5gj9s9BNZbn9i0RnT3uZsdEg6gdve1WYrY,11152
+pyplumio/filters.py,sha256=AMW1zHQ1YjJfHX7e87Dhv7AGixJ3y9Vn-_JAQn7vIsg,12526
 pyplumio/protocol.py,sha256=VRxrj8vZ1FMawqblKkyxg_V61TBSvVynd9u0JXYnMUU,8090
 pyplumio/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyplumio/stream.py,sha256=mtMpnUR3TfEmL5JUGXr6GnpPGBwzCokqIKDWp4vYiVg,4654
 pyplumio/utils.py,sha256=TnBzRopinyp92wruguijxcIYmaeyNVTFX0dygI5FCMU,823
-pyplumio/devices/__init__.py,sha256=0tDa30WPvI53uSLUu2PStIgvbst-cUvYLe3SSCRHDZc,6551
-pyplumio/devices/ecomax.py,sha256=CEdU7nMyJGGVNMANEwN4fgAzf6O8ufuIN0_CQcGqO3k,16886
+pyplumio/devices/__init__.py,sha256=BEUpL2XxEk4YDfp4w0VX_LI4JQwK27eGWoJ6al_e1nE,8038
+pyplumio/devices/ecomax.py,sha256=ybFLJN7O3unBcyzuVmYTssBv86bPiiTGvFpFJezwUE4,15478
 pyplumio/devices/ecoster.py,sha256=jNWli7ye9T6yfkcFJZhhUHH7KOv-L6AgYFp_dKyv3OM,263
 pyplumio/devices/mixer.py,sha256=CnHWrJELtFgs2YTHGpQwKr2UTRdetX76OvLBA2PH-fs,3207
 pyplumio/devices/thermostat.py,sha256=-CZNRyywoDU6csFu85KSmQ5woVXY0x6peXkeOsi_fqg,2617
@@ -22,7 +22,7 @@ pyplumio/helpers/__init__.py,sha256=H2xxdkF-9uADLwEbfBUoxNTdwru3L5Z2cfJjgsuRsn0,
 pyplumio/helpers/data_types.py,sha256=nB3afOLmppgSCWkZoX1-1yWPNMMNSem77x7XQ1Mi8H8,9103
 pyplumio/helpers/event_manager.py,sha256=xQOfiP_nP1Pz5zhB6HU5gXyyJXjhisYshL8_HRxDgt8,6412
 pyplumio/helpers/factory.py,sha256=6ArzJDq3MiiMaRpMEP0kC6wJWsoqOqe32V1RCxg1478,1005
-pyplumio/helpers/parameter.py,sha256=iCtKkYXJI0Zj4ifU3HCwoq_qqSE03giblSP1rqsWzcY,11463
+pyplumio/helpers/parameter.py,sha256=hOGYkhd7-MG1euNdbHYN_2vXFlWPi-XLy_yAotYSyck,12311
 pyplumio/helpers/schedule.py,sha256=PnVEkgthg6tHpHvZK9fXJz9VKNDyQ_7BFT4TTVEwNhI,5310
 pyplumio/helpers/task_manager.py,sha256=HAd69yGTRL0zQsu-ywnbLu1UXiJzgHWuhYWA--vs4lQ,1181
 pyplumio/helpers/timeout.py,sha256=JAhWNtIpcXyVILIwHWVy5mYofqbbRDGKLdTUKkQuajs,772
@@ -31,7 +31,7 @@ pyplumio/structures/__init__.py,sha256=EjK-5qJZ0F7lpP2b6epvTMg9cIBl4Kn91nqNkEcLw
 pyplumio/structures/alerts.py,sha256=8ievMl5_tUBlnTLCiZoIloucIngCcoAYy6uI9sSXrt0,3664
 pyplumio/structures/boiler_load.py,sha256=p3mOzZUU-g7A2tG_yp8podEqpI81hlsOZmHELyPNRY8,838
 pyplumio/structures/boiler_power.py,sha256=72qsvccg49FdRdXv2f2K5sGpjT7wAOLFjlIGWpO-DVg,901
-pyplumio/structures/ecomax_parameters.py,sha256=OYQZ0XJF-lqV_GdMaLTek4Gd6etIwhEJIyZyBS189O4,27959
+pyplumio/structures/ecomax_parameters.py,sha256=wLwhTdKee-UtCU5NuRfOHRPvnjDOtDNUDeUgeO0VH8w,27974
 pyplumio/structures/fan_power.py,sha256=Q5fv-7_2NVuLeQPIVIylvgN7M8-a9D8rRUE0QGjyS3w,871
 pyplumio/structures/frame_versions.py,sha256=hbcVuhuPNy5qd39Vk7w4WdPCW-TNx1cAYWzA2mXocyk,1548
 pyplumio/structures/fuel_consumption.py,sha256=_p2dI4H67Eopn7IF0Gj77A8c_8lNKhhDDAtmugxLd4s,976
@@ -48,13 +48,13 @@ pyplumio/structures/product_info.py,sha256=uiEN6DFQlzmBvQByTirFzXQShoex0YGdFS9WI
 pyplumio/structures/program_version.py,sha256=R-medELYHDlk_ALsw5HOVbZRb7JD3yBUsGwqwVCjrkU,2550
 pyplumio/structures/regulator_data.py,sha256=z2mSE-cxImn8YRr_yZCcDlIbXnKdETkN7GigV5vEJqA,2265
 pyplumio/structures/regulator_data_schema.py,sha256=XM6M9ep3NyogbLPqp88mMTg8Sa9e5SFzV5I5pSYw5GY,1487
-pyplumio/structures/schedules.py,sha256=YzlfgprZq4pDfl-NBHl-EblhxatmDYr0UOkkHBW0Jok,6707
+pyplumio/structures/schedules.py,sha256=_D8HmxMVvAAPb0cc_xSxXFRNwR9u-RWuyTy0Z5KscUk,6717
 pyplumio/structures/statuses.py,sha256=wkoynyMRr1VREwfBC6vU48kPA8ZQ83pcXuciy2xHJrk,1166
 pyplumio/structures/temperatures.py,sha256=1CDzehNmbALz1Jyt_9gZNIk52q6Wv-xQXjijVDCVYec,2337
-pyplumio/structures/thermostat_parameters.py,sha256=SewPHuw7f4PTvzKXcOQA8SNjQyuyBWNIk6jsUJX82BI,8321
+pyplumio/structures/thermostat_parameters.py,sha256=QA-ZyulBG3P10sqgdI7rmpQYlKm9SJIXxBxAXs8Bwow,8295
 pyplumio/structures/thermostat_sensors.py,sha256=8e1TxYIJTQKT0kIGO9gG4hGdLOBUpIhiPToQyOMyeNE,3237
-PyPlumIO-0.5.29.dist-info/LICENSE,sha256=m-UuZFjXJ22uPTGm9kSHS8bqjsf5T8k2wL9bJn1Y04o,1088
-PyPlumIO-0.5.29.dist-info/METADATA,sha256=lRGUv-VdjhGInA3PozigXBjMGH8mJg_TquWmaUSvdFA,5490
-PyPlumIO-0.5.29.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-PyPlumIO-0.5.29.dist-info/top_level.txt,sha256=kNBz9UPPkPD9teDn3U_sEy5LjzwLm9KfADCXtBlbw8A,9
-PyPlumIO-0.5.29.dist-info/RECORD,,
+PyPlumIO-0.5.31.dist-info/LICENSE,sha256=m-UuZFjXJ22uPTGm9kSHS8bqjsf5T8k2wL9bJn1Y04o,1088
+PyPlumIO-0.5.31.dist-info/METADATA,sha256=thPWL1GWRLLFkIdMOBz4CUN4LZmGxEA_BvvWYKjR-xA,5510
+PyPlumIO-0.5.31.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+PyPlumIO-0.5.31.dist-info/top_level.txt,sha256=kNBz9UPPkPD9teDn3U_sEy5LjzwLm9KfADCXtBlbw8A,9
+PyPlumIO-0.5.31.dist-info/RECORD,,

{PyPlumIO-0.5.29.dist-info → PyPlumIO-0.5.31.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.3.0)
+Generator: setuptools (75.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

pyplumio/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.5.29'
-__version_tuple__ = version_tuple = (0, 5, 29)
+__version__ = version = '0.5.31'
+__version_tuple__ = version_tuple = (0, 5, 31)

pyplumio/devices/__init__.py

@@ -5,17 +5,21 @@ from __future__ import annotations
 from abc import ABC
 import asyncio
 from functools import cache
+import logging
 from typing import Any, ClassVar
 
 from pyplumio.const import ATTR_FRAME_ERRORS, ATTR_LOADED, DeviceType, FrameType
 from pyplumio.exceptions import UnknownDeviceError
-from pyplumio.frames import DataFrameDescription, Frame, Request
+from pyplumio.frames import DataFrameDescription, Frame, Request, is_known_frame_type
 from pyplumio.helpers.event_manager import EventManager
 from pyplumio.helpers.factory import create_instance
 from pyplumio.helpers.parameter import Parameter, ParameterValue
+from pyplumio.structures.frame_versions import ATTR_FRAME_VERSIONS
 from pyplumio.structures.network_info import NetworkInfo
 from pyplumio.utils import to_camelcase
 
+_LOGGER = logging.getLogger(__name__)
+
 
 @cache
 def is_known_device_type(device_type: int) -> bool:
@@ -103,9 +107,6 @@ class Device(ABC, EventManager):
             this value is used to determine failure when
             retrying and doesn't block, defaults to `None`
         :type timeout: float, optional
-        :return: `True` if parameter was successfully set, `False`
-            otherwise.
-        :rtype: bool
         """
         self.create_task(self.set(name, value, retries, timeout))
 
@@ -125,11 +126,44 @@ class PhysicalDevice(Device, ABC):
     address: ClassVar[int]
     _network: NetworkInfo
     _setup_frames: tuple[DataFrameDescription, ...]
+    _frame_versions: dict[int, int]
 
     def __init__(self, queue: asyncio.Queue[Frame], network: NetworkInfo) -> None:
         """Initialize a new physical device."""
         super().__init__(queue)
         self._network = network
+        self._frame_versions = {}
+
+        async def update_frame_versions(versions: dict[int, int]) -> None:
+            """Check frame versions and update outdated frames."""
+            for frame_type, version in versions.items():
+                if (
+                    is_known_frame_type(frame_type)
+                    and self.supports_frame_type(frame_type)
+                    and not self.has_frame_version(frame_type, version)
+                ):
+                    _LOGGER.debug(
+                        "Updating frame %s to version %i", repr(frame_type), version
+                    )
+                    request = await Request.create(frame_type, recipient=self.address)
+                    self.queue.put_nowait(request)
+                    self._frame_versions[frame_type] = version
+
+        self.subscribe(ATTR_FRAME_VERSIONS, update_frame_versions)
+
+    def has_frame_version(self, frame_type: int, version: int | None = None) -> bool:
+        """Return True if frame data is up to date, False otherwise."""
+        if frame_type not in self._frame_versions:
+            return False
+
+        if version is None or self._frame_versions[frame_type] == version:
+            return True
+
+        return False
+
+    def supports_frame_type(self, frame_type: int) -> bool:
+        """Check if frame type is supported by the device."""
+        return frame_type not in self.data.get(ATTR_FRAME_ERRORS, [])
 
     def handle_frame(self, frame: Frame) -> None:
         """Handle frame received from the device."""

pyplumio/devices/ecomax.py

@@ -9,7 +9,6 @@ import time
 from typing import Any, Final
 
 from pyplumio.const import (
-    ATTR_FRAME_ERRORS,
     ATTR_PASSWORD,
     ATTR_SENSORS,
     ATTR_STATE,
@@ -21,7 +20,7 @@ from pyplumio.devices import PhysicalDevice
 from pyplumio.devices.mixer import Mixer
 from pyplumio.devices.thermostat import Thermostat
 from pyplumio.filters import on_change
-from pyplumio.frames import DataFrameDescription, Frame, Request, is_known_frame_type
+from pyplumio.frames import DataFrameDescription, Frame, Request
 from pyplumio.helpers.parameter import ParameterValues
 from pyplumio.helpers.schedule import Schedule, ScheduleDay
 from pyplumio.structures.alerts import ATTR_TOTAL_ALERTS
@@ -35,7 +34,6 @@ from pyplumio.structures.ecomax_parameters import (
     EcomaxSwitch,
     EcomaxSwitchDescription,
 )
-from pyplumio.structures.frame_versions import ATTR_FRAME_VERSIONS
 from pyplumio.structures.fuel_consumption import ATTR_FUEL_CONSUMPTION
 from pyplumio.structures.mixer_parameters import ATTR_MIXER_PARAMETERS
 from pyplumio.structures.mixer_sensors import ATTR_MIXER_SENSORS
@@ -106,17 +104,14 @@ class EcoMAX(PhysicalDevice):
 
     address = DeviceType.ECOMAX
 
-    _frame_versions: dict[int, int]
     _fuel_burned_timestamp_ns: int
     _setup_frames = SETUP_FRAME_TYPES
 
     def __init__(self, queue: asyncio.Queue[Frame], network: NetworkInfo) -> None:
         """Initialize a new ecoMAX controller."""
         super().__init__(queue, network)
-        self._frame_versions = {}
         self._fuel_burned_timestamp_ns = time.perf_counter_ns()
         self.subscribe(ATTR_ECOMAX_PARAMETERS, self._handle_ecomax_parameters)
-        self.subscribe(ATTR_FRAME_VERSIONS, self._update_frame_versions)
         self.subscribe(ATTR_FUEL_CONSUMPTION, self._add_burned_fuel_counter)
         self.subscribe(ATTR_MIXER_PARAMETERS, self._handle_mixer_parameters)
         self.subscribe(ATTR_MIXER_SENSORS, self._handle_mixer_sensors)
@@ -142,17 +137,6 @@ class EcoMAX(PhysicalDevice):
 
         super().handle_frame(frame)
 
-    def _has_frame_version(self, frame_type: FrameType | int, version: int) -> bool:
-        """Check if ecoMAX controller has this version of the frame."""
-        return (
-            frame_type in self._frame_versions
-            and self._frame_versions[frame_type] == version
-        )
-
-    def _frame_is_supported(self, frame_type: FrameType | int) -> bool:
-        """Check if frame is supported by the device."""
-        return frame_type not in self.data.get(ATTR_FRAME_ERRORS, [])
-
     def _mixers(self, indexes: Iterable[int]) -> Generator[Mixer, None, None]:
         """Iterate through the mixer indexes.
 
@@ -224,19 +208,6 @@ class EcoMAX(PhysicalDevice):
         await asyncio.gather(*_ecomax_parameter_events())
         return True
 
-    async def _update_frame_versions(self, versions: dict[int, int]) -> None:
-        """Check frame versions and update outdated frames."""
-        for frame_type, version in versions.items():
-            if (
-                is_known_frame_type(frame_type)
-                and self._frame_is_supported(frame_type)
-                and not self._has_frame_version(frame_type, version)
-            ):
-                # We don't have this frame or it's version has changed.
-                request = await Request.create(frame_type, recipient=self.address)
-                self.queue.put_nowait(request)
-                self._frame_versions[frame_type] = version
-
     async def _add_burned_fuel_counter(self, fuel_consumption: float) -> None:
         """Calculate fuel burned since last sensor's data message."""
         current_timestamp_ns = time.perf_counter_ns()

pyplumio/filters.py

@@ -125,6 +125,52 @@ class Filter(ABC):
         """Set a new value for the callback."""
 
 
+class _Clamp(Filter):
+    """Represents a clamp filter.
+
+    Calls callback with a value clamped between specified boundaries.
+    """
+
+    __slots__ = ("_min_value", "_max_value")
+
+    _min_value: float
+    _max_value: float
+
+    def __init__(self, callback: Callback, min_value: float, max_value: float) -> None:
+        """Initialize a new clamp filter."""
+        super().__init__(callback)
+        self._min_value = min_value
+        self._max_value = max_value
+
+    async def __call__(self, new_value: Any) -> Any:
+        """Set a new value for the callback."""
+        if new_value < self._min_value:
+            return await self._callback(self._min_value)
+
+        if new_value > self._max_value:
+            return await self._callback(self._max_value)
+
+        return await self._callback(new_value)
+
+
+def clamp(callback: Callback, min_value: float, max_value: float) -> _Clamp:
+    """Return a clamp filter.
+
+    A callback function will be called with value clamped between
+    specified boundaries.
+
+    :param callback: A callback function to be awaited on new value
+    :type callback: Callback
+    :param min_value: A lower boundary
+    :type min_value: float
+    :param max_value: An upper boundary
+    :type max_value: float
+    :return: An instance of callable filter
+    :rtype: _Clamp
+    """
+    return _Clamp(callback, min_value, max_value)
+
+
 class _OnChange(Filter):
     """Represents a value changed filter.
 
@@ -151,7 +197,7 @@ def on_change(callback: Callback) -> _OnChange:
 
     :param callback: A callback function to be awaited on value change
     :type callback: Callback
-    :return: A instance of callable filter
+    :return: An instance of callable filter
     :rtype: _OnChange
     """
     return _OnChange(callback)
@@ -201,7 +247,7 @@ def debounce(callback: Callback, min_calls: int) -> _Debounce:
     :param min_calls: Value shouldn't change for this amount of
         filter calls
     :type min_calls: int
-    :return: A instance of callable filter
+    :return: An instance of callable filter
     :rtype: _Debounce
     """
     return _Debounce(callback, min_calls)
@@ -248,7 +294,7 @@ def throttle(callback: Callback, seconds: float) -> _Throttle:
     :param seconds: A callback will be awaited at most once per
         this amount of seconds
     :type seconds: float
-    :return: A instance of callable filter
+    :return: An instance of callable filter
     :rtype: _Throttle
     """
     return _Throttle(callback, seconds)
@@ -285,7 +331,7 @@ def delta(callback: Callback) -> _Delta:
     :param callback: A callback function that will be awaited with
         difference between values in two subsequent calls
     :type callback: Callback
-    :return: A instance of callable filter
+    :return: An instance of callable filter
     :rtype: _Delta
     """
     return _Delta(callback)
@@ -340,7 +386,7 @@ def aggregate(callback: Callback, seconds: float) -> _Aggregate:
     :param seconds: A callback will be awaited with a sum of values
         aggregated over this amount of seconds.
     :type seconds: float
-    :return: A instance of callable filter
+    :return: An instance of callable filter
     :rtype: _Aggregate
     """
     return _Aggregate(callback, seconds)
@@ -382,7 +428,7 @@ def custom(callback: Callback, filter_fn: Callable[[Any], bool]) -> _Custom:
     :param filter_fn: Filter function, that will be called with a
         value and should return `True` to await filter's callback
     :type filter_fn: Callable[[Any], bool]
-    :return: A instance of callable filter
+    :return: An instance of callable filter
     :rtype: _Custom
     """
     return _Custom(callback, filter_fn)

pyplumio/helpers/parameter.py

@@ -77,11 +77,19 @@ class ParameterDescription:
 class Parameter(ABC):
     """Represents a base parameter."""
 
-    __slots__ = ("device", "description", "_pending_update", "_index", "_values")
+    __slots__ = (
+        "device",
+        "description",
+        "_pending_update",
+        "_previous_value",
+        "_index",
+        "_values",
+    )
 
     device: Device
     description: ParameterDescription
     _pending_update: bool
+    _previous_value: int
     _index: int
     _values: ParameterValues
 
@@ -96,6 +104,7 @@ class Parameter(ABC):
         self.device = device
         self.description = description
         self._pending_update = False
+        self._previous_value = 0
         self._index = index
         self._values = values if values else ParameterValues(0, 0, 0)
 
@@ -175,16 +184,32 @@ class Parameter(ABC):
         )
         return type(self)(self.device, self.description, values)
 
-    async def set(self, value: Any, retries: int = 5, timeout: float = 5.0) -> bool:
-        """Set a parameter value."""
-        if (value := _normalize_parameter_value(value)) == self.values.value:
-            return True
+    def validate(self, value: ParameterValue) -> int:
+        """Validate a parameter value."""
+        value = _normalize_parameter_value(value)
+        if value == self.values.value:
+            raise ValueError("Parameter value is unchanged.")
 
         if value < self.values.min_value or value > self.values.max_value:
             raise ValueError(
                 f"Value must be between '{self.min_value}' and '{self.max_value}'"
             )
 
+        return value
+
+    async def set(self, value: Any, retries: int = 5, timeout: float = 5.0) -> bool:
+        """Set a parameter value."""
+        return await self._try_set(self.validate(value), retries, timeout)
+
+    def set_nowait(self, value: Any, retries: int = 5, timeout: float = 5.0) -> None:
+        """Set a parameter value without waiting."""
+        self.device.create_task(self._try_set(self.validate(value), retries, timeout))
+
+    async def _try_set(
+        self, value: Any, retries: int = 5, timeout: float = 5.0
+    ) -> bool:
+        """Try to set a parameter value."""
+        self._previous_value = self._values.value
         self._values.value = value
         self._pending_update = True
         while self.pending_update:
@@ -203,8 +228,10 @@ class Parameter(ABC):
 
     def update(self, values: ParameterValues) -> None:
         """Update the parameter values."""
+        if self.pending_update and self._previous_value != values.value:
+            self._pending_update = False
+
         self._values = values
-        self._pending_update = False
 
     @property
     def pending_update(self) -> bool:
@@ -280,7 +307,7 @@ class Number(Parameter):
         self, value: int | float, retries: int = 5, timeout: float = 5.0
     ) -> None:
         """Set a parameter value without waiting."""
-        self.device.create_task(self.set(value, retries, timeout))
+        super().set_nowait(value, retries, timeout)
 
     async def create_request(self) -> Request:
         """Create a request to change the number."""
@@ -330,7 +357,7 @@ class Switch(Parameter):
         self, value: bool | Literal["off", "on"], retries: int = 5, timeout: float = 5.0
     ) -> None:
         """Set a switch value without waiting."""
-        self.device.create_task(self.set(value, retries, timeout))
+        super().set_nowait(value, retries, timeout)
 
     async def turn_on(self) -> bool:
         """Set a switch value to 'on'.

pyplumio/structures/ecomax_parameters.py

@@ -5,7 +5,7 @@ from __future__ import annotations
 from collections.abc import Generator
 from dataclasses import dataclass
 from functools import partial
-from typing import Any, Final
+from typing import TYPE_CHECKING, Any, Final
 
 from dataslots import dataslots
 
@@ -19,7 +19,6 @@ from pyplumio.const import (
     ProductType,
     UnitOfMeasurement,
 )
-from pyplumio.devices import PhysicalDevice
 from pyplumio.frames import Request
 from pyplumio.helpers.parameter import (
     Number,
@@ -35,6 +34,9 @@ from pyplumio.structures import StructureDecoder
 from pyplumio.structures.thermostat_parameters import ATTR_THERMOSTAT_PROFILE
 from pyplumio.utils import ensure_dict
 
+if TYPE_CHECKING:
+    from pyplumio.devices.ecomax import EcoMAX
+
 ATTR_ECOMAX_CONTROL: Final = "ecomax_control"
 ATTR_ECOMAX_PARAMETERS: Final = "ecomax_parameters"
 
@@ -53,7 +55,7 @@ class EcomaxParameter(Parameter):
 
     __slots__ = ()
 
-    device: PhysicalDevice
+    device: EcoMAX
     description: EcomaxParameterDescription
 
     async def create_request(self) -> Request:
@@ -466,8 +468,8 @@ ECOMAX_PARAMETERS: dict[ProductType, tuple[EcomaxParameterDescription, ...]] = {
         ),
         EcomaxNumberDescription(
             name="max_fuel_flow",
-            multiplier=0.1,
-            unit_of_measurement=UnitOfMeasurement.KILOGRAMS_PER_HOUR,
+            multiplier=20,
+            unit_of_measurement=UnitOfMeasurement.GRAMS,
         ),
         EcomaxNumberDescription(
             name="feeder_calibration",

pyplumio/structures/schedules.py

@@ -100,7 +100,7 @@ class ScheduleParameter(Parameter):
 
     async def create_request(self) -> Request:
         """Create a request to change the parameter."""
-        schedule_name, _ = self.description.name.split("_schedule_", 1)
+        schedule_name = self.description.name.split("_schedule_", 1)[0]
         return await Request.create(
             FrameType.REQUEST_SET_SCHEDULE,
             recipient=self.device.address,
@@ -163,7 +163,7 @@ def _split_byte(byte: int) -> list[bool]:
 
 def _join_bits(bits: Sequence[int | bool]) -> int:
     """Join eight bits into a single byte."""
-    return reduce(lambda x, y: (x << 1) | y, bits)
+    return reduce(lambda bit, byte: (bit << 1) | byte, bits)
 
 
 class SchedulesStructure(Structure):

pyplumio/structures/thermostat_parameters.py

@@ -113,25 +113,20 @@ class ThermostatNumber(ThermostatParameter, Number):
     @property
     def value(self) -> float:
         """Return the value."""
-        return round(
-            self.values.value * self.description.multiplier, self.description.precision
-        )
+        value = self.values.value * self.description.multiplier
+        return round(value, self.description.precision)
 
     @property
     def min_value(self) -> float:
         """Return the minimum allowed value."""
-        return round(
-            self.values.min_value * self.description.multiplier,
-            self.description.precision,
-        )
+        value = self.values.min_value * self.description.multiplier
+        return round(value, self.description.precision)
 
     @property
     def max_value(self) -> float:
         """Return the maximum allowed value."""
-        return round(
-            self.values.max_value * self.description.multiplier,
-            self.description.precision,
-        )
+        value = self.values.max_value * self.description.multiplier
+        return round(value, self.description.precision)
 
 
 @dataslots