PyPlumIO 0.5.41__py3-none-any.whl → 0.5.42__py3-none-any.whl

pyplumio/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.5.41'
-__version_tuple__ = version_tuple = (0, 5, 41)
+__version__ = version = '0.5.42'
+__version_tuple__ = version_tuple = (0, 5, 42)

pyplumio/helpers/parameter.py

@@ -13,6 +13,7 @@ from typing_extensions import TypeAlias
 
 from pyplumio.const import BYTE_UNDEFINED, STATE_OFF, STATE_ON, State, UnitOfMeasurement
 from pyplumio.frames import Request
+from pyplumio.utils import is_divisible
 
 if TYPE_CHECKING:
     from pyplumio.devices import Device
@@ -286,6 +287,8 @@ class Parameter(ABC):
 class NumberDescription(ParameterDescription):
     """Represents a parameter description."""
 
+    step: float = 1.0
+    precision: int = 6
     unit_of_measurement: UnitOfMeasurement | Literal["%"] | None = None
 
 
@@ -298,18 +301,24 @@ class Number(Parameter):
 
     def _pack_value(self, value: NumericType) -> int:
         """Pack the parameter value."""
-        return int(value)
+        return int(round(value / self.description.step))
 
     def _unpack_value(self, value: int) -> NumericType:
         """Unpack the parameter value."""
-        return value
+        return round(value * self.description.step, self.description.precision)
 
     def validate(self, value: Any) -> bool:
         """Validate a parameter value."""
         if value < self.min_value or value > self.max_value:
             raise ValueError(
-                f"Invalid number value: {value}. Must be between "
-                f"{self.min_value} and {self.max_value}."
+                f"Invalid value: {value}. The value must be between {self.min_value} "
+                f"and {self.max_value}."
+            )
+
+        if not is_divisible(value, self.description.step, self.description.precision):
+            raise ValueError(
+                f"Invalid value: {value}. The value must be adjusted in increments of "
+                f"{self.description.step}."
             )
 
         return True

pyplumio/structures/ecomax_parameters.py

@@ -33,7 +33,7 @@ from pyplumio.helpers.parameter import (
 )
 from pyplumio.structures import StructureDecoder
 from pyplumio.structures.thermostat_parameters import ATTR_THERMOSTAT_PROFILE
-from pyplumio.utils import ensure_dict, is_divisible
+from pyplumio.utils import ensure_dict
 
 if TYPE_CHECKING:
     from pyplumio.devices.ecomax import EcoMAX
@@ -90,9 +90,7 @@ class EcomaxParameter(Parameter):
 class EcomaxNumberDescription(EcomaxParameterDescription, NumberDescription):
     """Represents an ecoMAX number description."""
 
-    step: float = 1.0
     offset: int = 0
-    precision: int = 6
 
 
 class EcomaxNumber(EcomaxParameter, Number):
@@ -102,25 +100,13 @@ class EcomaxNumber(EcomaxParameter, Number):
 
     description: EcomaxNumberDescription
 
-    def validate(self, value: NumericType) -> bool:
-        """Validate the parameter value."""
-        if not is_divisible(value, self.description.step, self.description.precision):
-            raise ValueError(
-                f"Invalid value: {value}. The value must be adjusted in increments of "
-                f"{self.description.step}."
-            )
-
-        return super().validate(value)
-
     def _pack_value(self, value: NumericType) -> int:
         """Pack the parameter value."""
-        value += self.description.offset
-        return round(value / self.description.step)
+        return super()._pack_value(value + self.description.offset)
 
     def _unpack_value(self, value: int) -> NumericType:
         """Unpack the parameter value."""
-        value -= self.description.offset
-        return round(value * self.description.step, self.description.precision)
+        return super()._unpack_value(value - self.description.offset)
 
 
 @dataslots

pyplumio/structures/mixer_parameters.py

@@ -29,7 +29,7 @@ from pyplumio.helpers.parameter import (
     unpack_parameter,
 )
 from pyplumio.structures import StructureDecoder
-from pyplumio.utils import ensure_dict, is_divisible
+from pyplumio.utils import ensure_dict
 
 if TYPE_CHECKING:
     from pyplumio.devices.mixer import Mixer
@@ -72,9 +72,7 @@ class MixerParameter(Parameter):
 class MixerNumberDescription(MixerParameterDescription, NumberDescription):
     """Represent a mixer number description."""
 
-    step: float = 1.0
     offset: int = 0
-    precision: int = 6
 
 
 class MixerNumber(MixerParameter, Number):
@@ -84,25 +82,13 @@ class MixerNumber(MixerParameter, Number):
 
     description: MixerNumberDescription
 
-    def validate(self, value: NumericType) -> bool:
-        """Validate the parameter value."""
-        if not is_divisible(value, self.description.step, self.description.precision):
-            raise ValueError(
-                f"Invalid value: {value}. The value must be adjusted in increments of "
-                f"{self.description.step}."
-            )
-
-        return super().validate(value)
-
     def _pack_value(self, value: NumericType) -> int:
         """Pack the parameter value."""
-        value += self.description.offset
-        return round(value / self.description.step)
+        return super()._pack_value(value + self.description.offset)
 
     def _unpack_value(self, value: int) -> NumericType:
         """Unpack the parameter value."""
-        value -= self.description.offset
-        return round(value * self.description.step, self.description.precision)
+        return super()._unpack_value(value - self.description.offset)
 
 
 @dataslots

pyplumio/structures/thermostat_parameters.py

@@ -20,7 +20,6 @@ from pyplumio.frames import Request
 from pyplumio.helpers.parameter import (
     Number,
     NumberDescription,
-    NumericType,
     Parameter,
     ParameterDescription,
     ParameterValues,
@@ -30,7 +29,7 @@ from pyplumio.helpers.parameter import (
 )
 from pyplumio.structures import StructureDecoder
 from pyplumio.structures.thermostat_sensors import ATTR_THERMOSTATS_AVAILABLE
-from pyplumio.utils import ensure_dict, is_divisible
+from pyplumio.utils import ensure_dict
 
 if TYPE_CHECKING:
     from pyplumio.devices.thermostat import Thermostat
@@ -93,9 +92,6 @@ class ThermostatParameter(Parameter):
 class ThermostatNumberDescription(ThermostatParameterDescription, NumberDescription):
     """Represent a thermostat number description."""
 
-    step: float = 1.0
-    precision: int = 6
-
 
 class ThermostatNumber(ThermostatParameter, Number):
     """Represents a thermostat number."""
@@ -104,24 +100,6 @@ class ThermostatNumber(ThermostatParameter, Number):
 
     description: ThermostatNumberDescription
 
-    def validate(self, value: NumericType) -> bool:
-        """Validate the parameter value."""
-        if not is_divisible(value, self.description.step, self.description.precision):
-            raise ValueError(
-                f"Invalid value: {value}. The value must be adjusted in increments of "
-                f"{self.description.step}."
-            )
-
-        return super().validate(value)
-
-    def _pack_value(self, value: NumericType) -> int:
-        """Pack the parameter value."""
-        return round(value / self.description.step)
-
-    def _unpack_value(self, value: int) -> NumericType:
-        """Unpack the parameter value."""
-        return round(value * self.description.step, self.description.precision)
-
 
 @dataslots
 @dataclass

{pyplumio-0.5.41.dist-info → pyplumio-0.5.42.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyPlumIO
-Version: 0.5.41
+Version: 0.5.42
 Summary: PyPlumIO is a native ecoNET library for Plum ecoMAX controllers.
 Author-email: Denis Paavilainen <denpa@denpa.pro>
 License: MIT License

{pyplumio-0.5.41.dist-info → pyplumio-0.5.42.dist-info}/RECORD

@@ -1,6 +1,6 @@
 pyplumio/__init__.py,sha256=3ibJ43RIdfFrWp1PAsQixybAA--NPRw43B5OdLOwsU8,3319
 pyplumio/__main__.py,sha256=3IwHHSq-iay5FaeMc95klobe-xv82yydSKcBE7BFZ6M,500
-pyplumio/_version.py,sha256=TuHCjk-kMeHq9XPeWUeIY_Liz22Ivd6BQxf4Zhp3zGg,513
+pyplumio/_version.py,sha256=a_t6VzKNKwRmdztAoxQ2F5XjG1X3ma68qioTXtwboxc,513
 pyplumio/connection.py,sha256=-dbrIK6ewoYNeBQod9ZmXT8JkxMKbcS6nosINFsg9RI,5972
 pyplumio/const.py,sha256=26s1TJF7IJa6o1pjDmHaAzPgMJ5c-fb0jeSkzDQ6Bic,5577
 pyplumio/exceptions.py,sha256=_B_0EgxDxd2XyYv3WpZM733q0cML5m6J-f55QOvYRpI,996
@@ -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=9uXUmVRvPkg9IyrfYYVbz9wsYAXltMTXkm1x82dhMyA,1126
-pyplumio/helpers/parameter.py,sha256=j-t2Yj8NhQzqGSRN9DFtsWVuoh49Lq7I5_8CY5dqaU8,13587
+pyplumio/helpers/parameter.py,sha256=pvZPT06o7jbpmFo3C0OtHq8OAJPo-gbXFPo7yvL3DYc,14029
 pyplumio/helpers/schedule.py,sha256=Dl28p3iz8okr5AT5v78WiJv6ggYlO-f2Jk6r5t1wY0A,5266
 pyplumio/helpers/task_manager.py,sha256=HAd69yGTRL0zQsu-ywnbLu1UXiJzgHWuhYWA--vs4lQ,1181
 pyplumio/helpers/timeout.py,sha256=JAhWNtIpcXyVILIwHWVy5mYofqbbRDGKLdTUKkQuajs,772
@@ -31,13 +31,13 @@ pyplumio/structures/__init__.py,sha256=EjK-5qJZ0F7lpP2b6epvTMg9cIBl4Kn91nqNkEcLw
 pyplumio/structures/alerts.py,sha256=O4P0sbBu1g7AN_AApcViy9CcrY5Vry_LZJgidNUF7Co,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=ysnHYa0OscL8fxrkpIn2VxqOdNXZdEDD12N2HZ39kQU,27760
+pyplumio/structures/ecomax_parameters.py,sha256=_QWlwJm_IhQJ744vx6-WZb96kxjrEKleNteiE0wqLZE,27225
 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
 pyplumio/structures/fuel_level.py,sha256=mJpp1dnRD1wXi_6EyNX7TNXosjcr905rSHOnuZ5VD74,1069
 pyplumio/structures/lambda_sensor.py,sha256=JNSCiBJoM8Uk3OGbmFIigaLOntQST5U_UrmCpaQBlM0,1595
-pyplumio/structures/mixer_parameters.py,sha256=MZ97_g14krUdMPlyrOLqKcwEfq8PYq7f7AzJDbcM0O0,8840
+pyplumio/structures/mixer_parameters.py,sha256=-ZevCkrcUemmK7RIhGtVJyVgMNc4-Kxfk5ZEUvQ1wTw,8305
 pyplumio/structures/mixer_sensors.py,sha256=-cN7U-Fr2fmAQ5McQL7bZUC8CFlb1y8TN0f_dqy3UK0,2312
 pyplumio/structures/modules.py,sha256=oXUIqrOAV1dZzBV5zUH3HDUSFvNOjpUSx0TF9nZVnbs,2569
 pyplumio/structures/network_info.py,sha256=kPxmIaDGm5SyLRKVFzcrODlUtB0u5JjiZqekoKSyDpA,4159
@@ -51,10 +51,10 @@ pyplumio/structures/regulator_data_schema.py,sha256=XM6M9ep3NyogbLPqp88mMTg8Sa9e
 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=j7uyw5eIgMgXxndaqV-XKFne6DL2_RFtU_BeJcOo9sk,8075
+pyplumio/structures/thermostat_parameters.py,sha256=Hy07KU7wbUBtpX4pkPlnT7lIxiqtj6pEkGxRArfsIfc,7272
 pyplumio/structures/thermostat_sensors.py,sha256=8e1TxYIJTQKT0kIGO9gG4hGdLOBUpIhiPToQyOMyeNE,3237
-pyplumio-0.5.41.dist-info/licenses/LICENSE,sha256=m-UuZFjXJ22uPTGm9kSHS8bqjsf5T8k2wL9bJn1Y04o,1088
-pyplumio-0.5.41.dist-info/METADATA,sha256=HyZfZdbTrMXlAbh4-CTtIJxM3NZRLXKm_8AfK37RkzM,5532
-pyplumio-0.5.41.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-pyplumio-0.5.41.dist-info/top_level.txt,sha256=kNBz9UPPkPD9teDn3U_sEy5LjzwLm9KfADCXtBlbw8A,9
-pyplumio-0.5.41.dist-info/RECORD,,
+pyplumio-0.5.42.dist-info/licenses/LICENSE,sha256=m-UuZFjXJ22uPTGm9kSHS8bqjsf5T8k2wL9bJn1Y04o,1088
+pyplumio-0.5.42.dist-info/METADATA,sha256=oj8ixR7GtUtp7-7RHf1TQ7ByQ8TVm-_vkinabJ8vkE0,5532
+pyplumio-0.5.42.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+pyplumio-0.5.42.dist-info/top_level.txt,sha256=kNBz9UPPkPD9teDn3U_sEy5LjzwLm9KfADCXtBlbw8A,9
+pyplumio-0.5.42.dist-info/RECORD,,