PyPlumIO 0.5.22__py3-none-any.whl → 0.5.24__py3-none-any.whl

pyplumio/structures/mixer_parameters.py

@@ -6,6 +6,8 @@ from collections.abc import Generator
 from dataclasses import dataclass
 from typing import TYPE_CHECKING, Any, Final
 
+from dataslots import dataslots
+
 from pyplumio.const import (
     ATTR_DEVICE_INDEX,
     ATTR_INDEX,
@@ -16,12 +18,14 @@ from pyplumio.const import (
 )
 from pyplumio.frames import Request
 from pyplumio.helpers.parameter import (
-    BinaryParameter,
-    BinaryParameterDescription,
+    SET_RETRIES,
+    Number,
+    NumberDescription,
     Parameter,
     ParameterDescription,
     ParameterValues,
-    ParameterValueType,
+    Switch,
+    SwitchDescription,
     unpack_parameter,
 )
 from pyplumio.structures import StructureDecoder
@@ -35,8 +39,18 @@ ATTR_MIXER_PARAMETERS: Final = "mixer_parameters"
 MIXER_PARAMETER_SIZE: Final = 3
 
 
+@dataclass
+class MixerParameterDescription(ParameterDescription):
+    """Represents a mixer parameter description."""
+
+    __slots__ = ()
+
+    multiplier: float = 1.0
+    offset: int = 0
+
+
 class MixerParameter(Parameter):
-    """Represents a mixer parameter."""
+    """Represent a mixer parameter."""
 
     __slots__ = ()
 
@@ -55,186 +69,191 @@ class MixerParameter(Parameter):
             },
         )
 
-    async def set(self, value: ParameterValueType, retries: int = 5) -> bool:
-        """Set a parameter value."""
-        if isinstance(value, (int, float)):
-            value = int((value + self.description.offset) / self.description.multiplier)
 
+@dataslots
+@dataclass
+class MixerNumberDescription(MixerParameterDescription, NumberDescription):
+    """Represent a mixer number description."""
+
+
+class MixerNumber(MixerParameter, Number):
+    """Represents a mixer number."""
+
+    __slots__ = ()
+
+    description: MixerNumberDescription
+
+    async def set(self, value: int | float, retries: int = SET_RETRIES) -> bool:
+        """Set a parameter value."""
+        value = (value + self.description.offset) / self.description.multiplier
         return await super().set(value, retries)
 
     @property
-    def value(self) -> ParameterValueType:
+    def value(self) -> float:
         """Return the parameter value."""
         return (
             self.values.value - self.description.offset
         ) * self.description.multiplier
 
     @property
-    def min_value(self) -> ParameterValueType:
+    def min_value(self) -> float:
         """Return the minimum allowed value."""
         return (
             self.values.min_value - self.description.offset
         ) * self.description.multiplier
 
     @property
-    def max_value(self) -> ParameterValueType:
+    def max_value(self) -> float:
         """Return the maximum allowed value."""
         return (
             self.values.max_value - self.description.offset
         ) * self.description.multiplier
 
 
-class MixerBinaryParameter(BinaryParameter, MixerParameter):
-    """Represents a mixer binary parameter."""
-
-    __slots__ = ()
-
-
+@dataslots
 @dataclass
-class MixerParameterDescription(ParameterDescription):
-    """Represents a mixer parameter description."""
+class MixerSwitchDescription(MixerParameterDescription, SwitchDescription):
+    """Represents a mixer switch description."""
 
-    multiplier: float = 1
-    offset: int = 0
 
+class MixerSwitch(MixerParameter, Switch):
+    """Represents a mixer switch."""
 
-@dataclass
-class MixerBinaryParameterDescription(
-    MixerParameterDescription, BinaryParameterDescription
-):
-    """Represents a mixer binary parameter description."""
+    __slots__ = ()
+
+    description: MixerSwitchDescription
 
 
 MIXER_PARAMETERS: dict[ProductType, tuple[MixerParameterDescription, ...]] = {
     ProductType.ECOMAX_P: (
-        MixerParameterDescription(
+        MixerNumberDescription(
             name="mixer_target_temp",
             unit_of_measurement=UnitOfMeasurement.CELSIUS,
         ),
-        MixerParameterDescription(
+        MixerNumberDescription(
             name="min_target_temp",
             unit_of_measurement=UnitOfMeasurement.CELSIUS,
         ),
-        MixerParameterDescription(
+        MixerNumberDescription(
             name="max_target_temp",
             unit_of_measurement=UnitOfMeasurement.CELSIUS,
         ),
-        MixerParameterDescription(
+        MixerNumberDescription(
             name="thermostat_decrease_target_temp",
             unit_of_measurement=UnitOfMeasurement.CELSIUS,
         ),
-        MixerBinaryParameterDescription(
+        MixerSwitchDescription(
             name="weather_control",
         ),
-        MixerParameterDescription(
+        MixerNumberDescription(
             name="heating_curve",
             multiplier=0.1,
         ),
-        MixerParameterDescription(
+        MixerNumberDescription(
             name="heating_curve_shift",
             offset=20,
             unit_of_measurement=UnitOfMeasurement.CELSIUS,
         ),
-        MixerParameterDescription(
+        MixerNumberDescription(
             name="weather_factor",
         ),
-        MixerParameterDescription(
+        MixerNumberDescription(
             name="work_mode",
         ),
-        MixerParameterDescription(
+        MixerNumberDescription(
             name="mixer_input_dead_zone",
             multiplier=0.1,
             unit_of_measurement=UnitOfMeasurement.CELSIUS,
         ),
-        MixerBinaryParameterDescription(
+        MixerSwitchDescription(
             name="thermostat_operation",
         ),
-        MixerParameterDescription(
+        MixerNumberDescription(
             name="thermostat_mode",
         ),
-        MixerBinaryParameterDescription(
+        MixerSwitchDescription(
             name="disable_pump_on_thermostat",
         ),
-        MixerBinaryParameterDescription(
+        MixerSwitchDescription(
             name="summer_work",
         ),
     ),
     ProductType.ECOMAX_I: (
-        MixerParameterDescription(
+        MixerNumberDescription(
             name="work_mode",
         ),
-        MixerParameterDescription(
+        MixerNumberDescription(
             name="circuit_target_temp",
             unit_of_measurement=UnitOfMeasurement.CELSIUS,
         ),
-        MixerParameterDescription(
+        MixerNumberDescription(
             name="day_target_temp",
             unit_of_measurement=UnitOfMeasurement.CELSIUS,
         ),
-        MixerParameterDescription(
+        MixerNumberDescription(
             name="night_target_temp",
             unit_of_measurement=UnitOfMeasurement.CELSIUS,
         ),
-        MixerParameterDescription(
+        MixerNumberDescription(
             name="min_target_temp",
             unit_of_measurement=UnitOfMeasurement.CELSIUS,
         ),
-        MixerParameterDescription(
+        MixerNumberDescription(
             name="max_target_temp",
             unit_of_measurement=UnitOfMeasurement.CELSIUS,
         ),
-        MixerBinaryParameterDescription(
+        MixerSwitchDescription(
             name="summer_work",
         ),
-        MixerBinaryParameterDescription(
+        MixerSwitchDescription(
             name="weather_control",
         ),
-        MixerParameterDescription(
+        MixerNumberDescription(
             name="enable_circuit",
         ),
-        MixerParameterDescription(
+        MixerNumberDescription(
             name="constant_water_preset_temp",
             unit_of_measurement=UnitOfMeasurement.CELSIUS,
         ),
-        MixerParameterDescription(
+        MixerNumberDescription(
             name="thermostat_decrease_temp",
             unit_of_measurement=UnitOfMeasurement.CELSIUS,
         ),
-        MixerParameterDescription(
+        MixerNumberDescription(
             name="thermostat_correction",
             unit_of_measurement=UnitOfMeasurement.CELSIUS,
         ),
-        MixerBinaryParameterDescription(
+        MixerSwitchDescription(
             name="thermostat_pump_lock",
         ),
-        MixerParameterDescription(
+        MixerNumberDescription(
             name="valve_opening_time",
             unit_of_measurement=UnitOfMeasurement.SECONDS,
         ),
-        MixerParameterDescription(
+        MixerNumberDescription(
             name="mixer_input_dead_zone",
             multiplier=0.1,
             unit_of_measurement=UnitOfMeasurement.CELSIUS,
         ),
-        MixerParameterDescription(
+        MixerNumberDescription(
             name="proportional_range",
         ),
-        MixerParameterDescription(
+        MixerNumberDescription(
             name="integration_time_constant",
         ),
-        MixerParameterDescription(
+        MixerNumberDescription(
             name="heating_curve",
             multiplier=0.1,
         ),
-        MixerParameterDescription(
+        MixerNumberDescription(
             name="heating_curve_shift",
             offset=20,
             unit_of_measurement=UnitOfMeasurement.CELSIUS,
         ),
-        MixerParameterDescription(
+        MixerNumberDescription(
             name="thermostat_mode",
         ),
-        MixerParameterDescription(
+        MixerNumberDescription(
             name="decreasing_constant_water_temp",
             unit_of_measurement=UnitOfMeasurement.CELSIUS,
         ),

pyplumio/structures/schedules.py

@@ -8,6 +8,8 @@ from functools import reduce
 from itertools import chain
 from typing import Any, Final
 
+from dataslots import dataslots
+
 from pyplumio.const import (
     ATTR_PARAMETER,
     ATTR_SCHEDULE,
@@ -19,11 +21,13 @@ from pyplumio.devices import AddressableDevice, Device
 from pyplumio.exceptions import FrameDataError
 from pyplumio.frames import Request
 from pyplumio.helpers.parameter import (
-    BinaryParameter,
-    BinaryParameterDescription,
+    Number,
+    NumberDescription,
     Parameter,
     ParameterDescription,
     ParameterValues,
+    Switch,
+    SwitchDescription,
     unpack_parameter,
 )
 from pyplumio.structures import Structure
@@ -80,12 +84,20 @@ SCHEDULES: tuple[str, ...] = (
 )
 
 
+@dataclass
+class ScheduleParameterDescription(ParameterDescription):
+    """Represent a schedule parameter description."""
+
+    __slots__ = ()
+
+
 class ScheduleParameter(Parameter):
     """Represents a schedule parameter."""
 
     __slots__ = ()
 
     device: AddressableDevice
+    description: ScheduleParameterDescription
 
     async def create_request(self) -> Request:
         """Create a request to change the parameter."""
@@ -97,32 +109,40 @@ class ScheduleParameter(Parameter):
         )
 
 
-class ScheduleBinaryParameter(ScheduleParameter, BinaryParameter):
-    """Represents a schedule binary parameter."""
+@dataslots
+@dataclass
+class ScheduleNumberDescription(ScheduleParameterDescription, NumberDescription):
+    """Represents a schedule number description."""
+
+
+class ScheduleNumber(ScheduleParameter, Number):
+    """Represents a schedule number."""
 
     __slots__ = ()
 
+    description: ScheduleNumberDescription
 
+
+@dataslots
 @dataclass
-class ScheduleParameterDescription(ParameterDescription):
-    """Represents a schedule parameter description."""
+class ScheduleSwitchDescription(ScheduleParameterDescription, SwitchDescription):
+    """Represents a schedule switch description."""
 
 
-@dataclass
-class ScheduleBinaryParameterDescription(
-    BinaryParameterDescription, ScheduleParameterDescription
-):
-    """Represents a schedule binary parameter description."""
+class ScheduleSwitch(ScheduleParameter, Switch):
+    """Represents a schedule switch."""
+
+    __slots__ = ()
+
+    description: ScheduleSwitchDescription
 
 
 SCHEDULE_PARAMETERS: list[ScheduleParameterDescription] = list(
     chain.from_iterable(
         [
             [
-                ScheduleBinaryParameterDescription(
-                    name=f"{name}_{ATTR_SCHEDULE_SWITCH}"
-                ),
-                ScheduleParameterDescription(name=f"{name}_{ATTR_SCHEDULE_PARAMETER}"),
+                ScheduleSwitchDescription(name=f"{name}_{ATTR_SCHEDULE_SWITCH}"),
+                ScheduleNumberDescription(name=f"{name}_{ATTR_SCHEDULE_PARAMETER}"),
             ]
             for name in SCHEDULES
         ]

pyplumio/structures/thermostat_parameters.py

@@ -6,6 +6,8 @@ from collections.abc import Generator
 from dataclasses import dataclass
 from typing import TYPE_CHECKING, Any, Final
 
+from dataslots import dataslots
+
 from pyplumio.const import (
     ATTR_INDEX,
     ATTR_OFFSET,
@@ -16,12 +18,14 @@ from pyplumio.const import (
 )
 from pyplumio.frames import Request
 from pyplumio.helpers.parameter import (
-    BinaryParameter,
-    BinaryParameterDescription,
+    SET_TIMEOUT,
+    Number,
+    NumberDescription,
     Parameter,
     ParameterDescription,
     ParameterValues,
-    ParameterValueType,
+    Switch,
+    SwitchDescription,
     unpack_parameter,
 )
 from pyplumio.structures import StructureDecoder
@@ -38,6 +42,16 @@ ATTR_THERMOSTAT_PARAMETERS: Final = "thermostat_parameters"
 THERMOSTAT_PARAMETER_SIZE: Final = 3
 
 
+@dataclass
+class ThermostatParameterDescription(ParameterDescription):
+    """Represents a thermostat parameter description."""
+
+    __slots__ = ()
+
+    multiplier: float = 1.0
+    size: int = 1
+
+
 class ThermostatParameter(Parameter):
     """Represents a thermostat parameter."""
 
@@ -50,7 +64,7 @@ class ThermostatParameter(Parameter):
     def __init__(
         self,
         device: Thermostat,
-        description: ParameterDescription,
+        description: ThermostatParameterDescription,
         values: ParameterValues | None = None,
         index: int = 0,
         offset: int = 0,
@@ -74,119 +88,124 @@ class ThermostatParameter(Parameter):
             },
         )
 
-    async def set(self, value: ParameterValueType, retries: int = 5) -> bool:
-        """Set a parameter value."""
-        if isinstance(value, (int, float)):
-            value = int(value / self.description.multiplier)
 
+@dataslots
+@dataclass
+class ThermostatNumberDescription(ThermostatParameterDescription, NumberDescription):
+    """Represent a thermostat number description."""
+
+
+class ThermostatNumber(ThermostatParameter, Number):
+    """Represents a thermostat number."""
+
+    __slots__ = ()
+
+    description: ThermostatNumberDescription
+
+    async def set(self, value: int | float, retries: int = SET_TIMEOUT) -> bool:
+        """Set a parameter value."""
+        value = value / self.description.multiplier
         return await super().set(value, retries)
 
     @property
-    def value(self) -> ParameterValueType:
-        """Return the parameter value."""
+    def value(self) -> float:
+        """Return the value."""
         return self.values.value * self.description.multiplier
 
     @property
-    def min_value(self) -> ParameterValueType:
+    def min_value(self) -> float:
         """Return the minimum allowed value."""
         return self.values.min_value * self.description.multiplier
 
     @property
-    def max_value(self) -> ParameterValueType:
+    def max_value(self) -> float:
         """Return the maximum allowed value."""
         return self.values.max_value * self.description.multiplier
 
 
-class ThermostatBinaryParameter(BinaryParameter, ThermostatParameter):
-    """Represents a thermostat binary parameter."""
-
-    __slots__ = ()
-
-
+@dataslots
 @dataclass
-class ThermostatParameterDescription(ParameterDescription):
-    """Represents a thermostat parameter description."""
+class ThermostatSwitchDescription(ThermostatParameterDescription, SwitchDescription):
+    """Represents a thermostat switch description."""
 
-    multiplier: float = 1.0
-    size: int = 1
 
+class ThermostatSwitch(ThermostatParameter, Switch):
+    """Represents a thermostat switch."""
 
-@dataclass
-class ThermostatBinaryParameterDescription(
-    ThermostatParameterDescription, BinaryParameterDescription
-):
-    """Represents a thermostat binary parameter description."""
+    __slots__ = ()
+
+    description: ThermostatSwitchDescription
 
 
 THERMOSTAT_PARAMETERS: tuple[ThermostatParameterDescription, ...] = (
-    ThermostatParameterDescription(
+    ThermostatNumberDescription(
         name="mode",
     ),
-    ThermostatParameterDescription(
+    ThermostatNumberDescription(
         name="party_target_temp",
         size=2,
         multiplier=0.1,
         unit_of_measurement=UnitOfMeasurement.CELSIUS,
     ),
-    ThermostatParameterDescription(
+    ThermostatNumberDescription(
         name="holidays_target_temp",
         size=2,
         multiplier=0.1,
         unit_of_measurement=UnitOfMeasurement.CELSIUS,
     ),
-    ThermostatParameterDescription(
+    ThermostatNumberDescription(
         name="correction",
         unit_of_measurement=UnitOfMeasurement.CELSIUS,
     ),
-    ThermostatParameterDescription(
+    ThermostatNumberDescription(
         name="away_timer",
         unit_of_measurement=UnitOfMeasurement.DAYS,
     ),
-    ThermostatParameterDescription(
+    ThermostatNumberDescription(
         name="airing_timer",
         unit_of_measurement=UnitOfMeasurement.DAYS,
     ),
-    ThermostatParameterDescription(
+    ThermostatNumberDescription(
         name="party_timer",
         unit_of_measurement=UnitOfMeasurement.DAYS,
     ),
-    ThermostatParameterDescription(
+    ThermostatNumberDescription(
         name="holidays_timer",
         unit_of_measurement=UnitOfMeasurement.DAYS,
     ),
-    ThermostatParameterDescription(
+    ThermostatNumberDescription(
         name="hysteresis",
         multiplier=0.1,
         unit_of_measurement=UnitOfMeasurement.CELSIUS,
     ),
-    ThermostatParameterDescription(
+    ThermostatNumberDescription(
         name="day_target_temp",
         size=2,
         multiplier=0.1,
         unit_of_measurement=UnitOfMeasurement.CELSIUS,
     ),
-    ThermostatParameterDescription(
+    ThermostatNumberDescription(
         name="night_target_temp",
         size=2,
         multiplier=0.1,
         unit_of_measurement=UnitOfMeasurement.CELSIUS,
     ),
-    ThermostatParameterDescription(
+    ThermostatNumberDescription(
         name="antifreeze_target_temp",
         size=2,
         multiplier=0.1,
         unit_of_measurement=UnitOfMeasurement.CELSIUS,
     ),
-    ThermostatParameterDescription(
+    ThermostatNumberDescription(
         name="heating_target_temp",
         size=2,
         multiplier=0.1,
         unit_of_measurement=UnitOfMeasurement.CELSIUS,
     ),
-    ThermostatParameterDescription(
+    ThermostatNumberDescription(
         name="heating_timer",
     ),
-    ThermostatParameterDescription(
+    ThermostatNumberDescription(
         name="off_timer",
     ),
 )