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

pyplumio/structures/fan_power.py

@@ -5,7 +5,7 @@ from __future__ import annotations
 import math
 from typing import Any, Final
 
-from pyplumio.helpers.data_types import Float
+from pyplumio.data_types import Float
 from pyplumio.structures import StructureDecoder
 from pyplumio.utils import ensure_dict
 
@@ -28,3 +28,6 @@ class FanPowerStructure(StructureDecoder):
             return ensure_dict(data), offset
 
         return ensure_dict(data, {ATTR_FAN_POWER: fan_power.value}), offset
+
+
+__all__ = ["ATTR_FAN_POWER", "FanPowerStructure"]

pyplumio/structures/frame_versions.py

@@ -6,7 +6,7 @@ from contextlib import suppress
 from typing import Any, Final
 
 from pyplumio.const import FrameType
-from pyplumio.helpers.data_types import UnsignedShort
+from pyplumio.data_types import UnsignedShort
 from pyplumio.structures import StructureDecoder
 from pyplumio.utils import ensure_dict
 
@@ -48,3 +48,6 @@ class FrameVersionsStructure(StructureDecoder):
             ),
             self._offset,
         )
+
+
+__all__ = ["ATTR_FRAME_VERSIONS", "FrameVersionsStructure"]

pyplumio/structures/fuel_consumption.py

@@ -5,7 +5,7 @@ from __future__ import annotations
 import math
 from typing import Any, Final
 
-from pyplumio.helpers.data_types import Float
+from pyplumio.data_types import Float
 from pyplumio.structures import StructureDecoder
 from pyplumio.utils import ensure_dict
 
@@ -31,3 +31,6 @@ class FuelConsumptionStructure(StructureDecoder):
             ensure_dict(data, {ATTR_FUEL_CONSUMPTION: fuel_consumption.value}),
             offset,
         )
+
+
+__all__ = ["ATTR_FUEL_CONSUMPTION", "FuelConsumptionStructure"]

pyplumio/structures/fuel_level.py

@@ -34,3 +34,6 @@ class FuelLevelStructure(StructureDecoder):
             fuel_level -= FUEL_LEVEL_OFFSET
 
         return (ensure_dict(data, {ATTR_FUEL_LEVEL: fuel_level}), offset)
+
+
+__all__ = ["ATTR_FUEL_LEVEL", "FuelLevelStructure"]

pyplumio/structures/lambda_sensor.py

@@ -7,7 +7,7 @@ import math
 from typing import Any, Final
 
 from pyplumio.const import BYTE_UNDEFINED, LambdaState
-from pyplumio.helpers.data_types import UnsignedShort
+from pyplumio.data_types import UnsignedShort
 from pyplumio.structures import StructureDecoder
 from pyplumio.utils import ensure_dict
 
@@ -50,3 +50,11 @@ class LambdaSensorStructure(StructureDecoder):
             ),
             offset,
         )
+
+
+__all__ = [
+    "ATTR_LAMBDA_STATE",
+    "ATTR_LAMBDA_TARGET",
+    "ATTR_LAMBDA_LEVEL",
+    "LambdaSensorStructure",
+]

pyplumio/structures/mixer_parameters.py

@@ -3,245 +3,17 @@
 from __future__ import annotations
 
 from collections.abc import Generator
-from dataclasses import dataclass
-from typing import TYPE_CHECKING, Any, Final
+from typing import Any, Final
 
-from dataslots import dataslots
-
-from pyplumio.const import (
-    ATTR_DEVICE_INDEX,
-    ATTR_INDEX,
-    ATTR_VALUE,
-    FrameType,
-    ProductType,
-    UnitOfMeasurement,
-)
-from pyplumio.frames import Request
-from pyplumio.helpers.parameter import (
-    Number,
-    NumberDescription,
-    NumericType,
-    Parameter,
-    ParameterDescription,
-    ParameterValues,
-    Switch,
-    SwitchDescription,
-    unpack_parameter,
-)
+from pyplumio.parameters import ParameterValues, unpack_parameter
 from pyplumio.structures import StructureDecoder
 from pyplumio.utils import ensure_dict
 
-if TYPE_CHECKING:
-    from pyplumio.devices.mixer import Mixer
-
 ATTR_MIXER_PARAMETERS: Final = "mixer_parameters"
 
 MIXER_PARAMETER_SIZE: Final = 3
 
 
-@dataclass
-class MixerParameterDescription(ParameterDescription):
-    """Represents a mixer parameter description."""
-
-    __slots__ = ()
-
-
-class MixerParameter(Parameter):
-    """Represent a mixer parameter."""
-
-    __slots__ = ()
-
-    device: Mixer
-    description: MixerParameterDescription
-
-    async def create_request(self) -> Request:
-        """Create a request to change the parameter."""
-        return await Request.create(
-            FrameType.REQUEST_SET_MIXER_PARAMETER,
-            recipient=self.device.parent.address,
-            data={
-                ATTR_INDEX: self._index,
-                ATTR_VALUE: self.values.value,
-                ATTR_DEVICE_INDEX: self.device.index,
-            },
-        )
-
-
-@dataslots
-@dataclass
-class MixerNumberDescription(MixerParameterDescription, NumberDescription):
-    """Represent a mixer number description."""
-
-    offset: int = 0
-
-
-class MixerNumber(MixerParameter, Number):
-    """Represents a mixer number."""
-
-    __slots__ = ()
-
-    description: MixerNumberDescription
-
-    def _pack_value(self, value: NumericType) -> int:
-        """Pack the parameter value."""
-        return super()._pack_value(value + self.description.offset)
-
-    def _unpack_value(self, value: int) -> NumericType:
-        """Unpack the parameter value."""
-        return super()._unpack_value(value - self.description.offset)
-
-
-@dataslots
-@dataclass
-class MixerSwitchDescription(MixerParameterDescription, SwitchDescription):
-    """Represents a mixer switch description."""
-
-
-class MixerSwitch(MixerParameter, Switch):
-    """Represents a mixer switch."""
-
-    __slots__ = ()
-
-    description: MixerSwitchDescription
-
-
-MIXER_PARAMETERS: dict[ProductType, tuple[MixerParameterDescription, ...]] = {
-    ProductType.ECOMAX_P: (
-        MixerNumberDescription(
-            name="mixer_target_temp",
-            unit_of_measurement=UnitOfMeasurement.CELSIUS,
-        ),
-        MixerNumberDescription(
-            name="min_target_temp",
-            unit_of_measurement=UnitOfMeasurement.CELSIUS,
-        ),
-        MixerNumberDescription(
-            name="max_target_temp",
-            unit_of_measurement=UnitOfMeasurement.CELSIUS,
-        ),
-        MixerNumberDescription(
-            name="thermostat_decrease_target_temp",
-            unit_of_measurement=UnitOfMeasurement.CELSIUS,
-        ),
-        MixerSwitchDescription(
-            name="weather_control",
-        ),
-        MixerNumberDescription(
-            name="heating_curve",
-            step=0.1,
-        ),
-        MixerNumberDescription(
-            name="heating_curve_shift",
-            offset=20,
-            unit_of_measurement=UnitOfMeasurement.CELSIUS,
-        ),
-        MixerNumberDescription(
-            name="weather_factor",
-        ),
-        MixerNumberDescription(
-            name="work_mode",
-        ),
-        MixerNumberDescription(
-            name="mixer_input_dead_zone",
-            step=0.1,
-            unit_of_measurement=UnitOfMeasurement.CELSIUS,
-        ),
-        MixerSwitchDescription(
-            name="thermostat_operation",
-        ),
-        MixerNumberDescription(
-            name="thermostat_mode",
-        ),
-        MixerSwitchDescription(
-            name="disable_pump_on_thermostat",
-        ),
-        MixerSwitchDescription(
-            name="summer_work",
-        ),
-    ),
-    ProductType.ECOMAX_I: (
-        MixerNumberDescription(
-            name="work_mode",
-        ),
-        MixerNumberDescription(
-            name="circuit_target_temp",
-            unit_of_measurement=UnitOfMeasurement.CELSIUS,
-        ),
-        MixerNumberDescription(
-            name="day_target_temp",
-            unit_of_measurement=UnitOfMeasurement.CELSIUS,
-        ),
-        MixerNumberDescription(
-            name="night_target_temp",
-            unit_of_measurement=UnitOfMeasurement.CELSIUS,
-        ),
-        MixerNumberDescription(
-            name="min_target_temp",
-            unit_of_measurement=UnitOfMeasurement.CELSIUS,
-        ),
-        MixerNumberDescription(
-            name="max_target_temp",
-            unit_of_measurement=UnitOfMeasurement.CELSIUS,
-        ),
-        MixerSwitchDescription(
-            name="summer_work",
-        ),
-        MixerSwitchDescription(
-            name="weather_control",
-        ),
-        MixerNumberDescription(
-            name="enable_circuit",
-        ),
-        MixerNumberDescription(
-            name="constant_water_preset_temp",
-            unit_of_measurement=UnitOfMeasurement.CELSIUS,
-        ),
-        MixerNumberDescription(
-            name="thermostat_decrease_temp",
-            unit_of_measurement=UnitOfMeasurement.CELSIUS,
-        ),
-        MixerNumberDescription(
-            name="thermostat_correction",
-            unit_of_measurement=UnitOfMeasurement.CELSIUS,
-        ),
-        MixerSwitchDescription(
-            name="thermostat_pump_lock",
-        ),
-        MixerNumberDescription(
-            name="valve_opening_time",
-            unit_of_measurement=UnitOfMeasurement.SECONDS,
-        ),
-        MixerNumberDescription(
-            name="mixer_input_dead_zone",
-            step=0.1,
-            unit_of_measurement=UnitOfMeasurement.CELSIUS,
-        ),
-        MixerNumberDescription(
-            name="proportional_range",
-        ),
-        MixerNumberDescription(
-            name="integration_time_constant",
-        ),
-        MixerNumberDescription(
-            name="heating_curve",
-            step=0.1,
-        ),
-        MixerNumberDescription(
-            name="heating_curve_shift",
-            offset=20,
-            unit_of_measurement=UnitOfMeasurement.CELSIUS,
-        ),
-        MixerNumberDescription(
-            name="thermostat_mode",
-        ),
-        MixerNumberDescription(
-            name="decreasing_constant_water_temp",
-            unit_of_measurement=UnitOfMeasurement.CELSIUS,
-        ),
-    ),
-}
-
-
 class MixerParametersStructure(StructureDecoder):
     """Represents a mixer parameters data structure."""
 
@@ -286,3 +58,9 @@ class MixerParametersStructure(StructureDecoder):
             ),
             self._offset,
         )
+
+
+__all__ = [
+    "ATTR_MIXER_PARAMETERS",
+    "MixerParametersStructure",
+]

pyplumio/structures/mixer_sensors.py

@@ -7,7 +7,7 @@ import math
 from typing import Any, Final
 
 from pyplumio.const import ATTR_CURRENT_TEMP, ATTR_TARGET_TEMP
-from pyplumio.helpers.data_types import Float
+from pyplumio.data_types import Float
 from pyplumio.structures import StructureDecoder
 from pyplumio.utils import ensure_dict
 
@@ -69,3 +69,12 @@ class MixerSensorsStructure(StructureDecoder):
             ),
             self._offset,
         )
+
+
+__all__ = [
+    "ATTR_PUMP",
+    "ATTR_MIXERS_AVAILABLE",
+    "ATTR_MIXERS_CONNECTED",
+    "ATTR_MIXER_SENSORS",
+    "MixerSensorsStructure",
+]

pyplumio/structures/modules.py

@@ -89,3 +89,17 @@ class ModulesStructure(StructureDecoder):
             ),
             self._offset,
         )
+
+
+__all__ = [
+    "ATTR_MODULES",
+    "ATTR_MODULE_A",
+    "ATTR_MODULE_B",
+    "ATTR_MODULE_C",
+    "ATTR_ECOLAMBDA",
+    "ATTR_ECOSTER",
+    "ATTR_PANEL",
+    "MODULES",
+    "ConnectedModules",
+    "ModulesStructure",
+]

pyplumio/structures/network_info.py

@@ -6,7 +6,7 @@ from dataclasses import dataclass, field
 from typing import Any, Final
 
 from pyplumio.const import EncryptionType
-from pyplumio.helpers.data_types import IPv4, VarString
+from pyplumio.data_types import IPv4, VarString
 from pyplumio.structures import Structure
 from pyplumio.utils import ensure_dict
 
@@ -114,3 +114,14 @@ class NetworkInfoStructure(Structure):
             ),
             offset + NETWORK_INFO_SIZE,
         )
+
+
+__all__ = [
+    "EthernetParameters",
+    "WirelessParameters",
+    "NetworkInfo",
+    "NetworkInfoStructure",
+    "ATTR_NETWORK",
+    "DEFAULT_IP",
+    "DEFAULT_NETMASK",
+]

pyplumio/structures/output_flags.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from typing import Any, Final
 
-from pyplumio.helpers.data_types import UnsignedInt
+from pyplumio.data_types import UnsignedInt
 from pyplumio.structures import StructureDecoder
 from pyplumio.utils import ensure_dict
 
@@ -36,3 +36,12 @@ class OutputFlagsStructure(StructureDecoder):
             ),
             offset + output_flags.size,
         )
+
+
+__all__ = [
+    "ATTR_HEATING_PUMP_FLAG",
+    "ATTR_WATER_HEATER_PUMP_FLAG",
+    "ATTR_CIRCULATION_PUMP_FLAG",
+    "ATTR_SOLAR_PUMP_FLAG",
+    "OutputFlagsStructure",
+]

pyplumio/structures/outputs.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from typing import Any, Final
 
-from pyplumio.helpers.data_types import UnsignedInt
+from pyplumio.data_types import UnsignedInt
 from pyplumio.structures import StructureDecoder
 from pyplumio.utils import ensure_dict
 
@@ -65,3 +65,24 @@ class OutputsStructure(StructureDecoder):
             ),
             offset + outputs.size,
         )
+
+
+__all__ = [
+    "ATTR_FAN",
+    "ATTR_FEEDER",
+    "ATTR_HEATING_PUMP",
+    "ATTR_WATER_HEATER_PUMP",
+    "ATTR_CIRCULATION_PUMP",
+    "ATTR_LIGHTER",
+    "ATTR_ALARM",
+    "ATTR_OUTER_BOILER",
+    "ATTR_FAN2_EXHAUST",
+    "ATTR_FEEDER2",
+    "ATTR_OUTER_FEEDER",
+    "ATTR_SOLAR_PUMP",
+    "ATTR_FIREPLACE_PUMP",
+    "ATTR_GCZ_CONTACT",
+    "ATTR_BLOW_FAN1",
+    "ATTR_BLOW_FAN2",
+    "OutputsStructure",
+]

pyplumio/structures/pending_alerts.py

@@ -23,3 +23,6 @@ class PendingAlertsStructure(StructureDecoder):
         return ensure_dict(data, {ATTR_PENDING_ALERTS: alerts_number}), (
             offset + alerts_number + 1
         )
+
+
+__all__ = ["ATTR_PENDING_ALERTS", "PendingAlertsStructure"]

pyplumio/structures/product_info.py

@@ -9,7 +9,7 @@ import struct
 from typing import Any, Final
 
 from pyplumio.const import ProductType
-from pyplumio.helpers.data_types import UnsignedShort, VarBytes, VarString
+from pyplumio.data_types import UnsignedShort, VarBytes, VarString
 from pyplumio.helpers.uid import unpack_uid
 from pyplumio.structures import StructureDecoder
 from pyplumio.utils import ensure_dict
@@ -20,7 +20,7 @@ ATTR_PRODUCT: Final = "product"
 @cache
 def format_model_name(model_name: str) -> str:
     """Format a device model name."""
-    if m := re.match(r"^([A-Z]+)\s{0,}([0-9]{3,})(.+)$", model_name, re.IGNORECASE):
+    if m := re.match(r"^([A-Z]+)\s*(\d{3,})(.+)$", model_name, re.IGNORECASE):
         model_device, model_number, model_suffix = m.groups()
         model_device = "ecoMAX" if model_device == "EM" else model_device
         return f"{model_device} {model_number}{model_suffix}"
@@ -28,7 +28,7 @@ def format_model_name(model_name: str) -> str:
     return model_name
 
 
-@dataclass
+@dataclass(frozen=True)
 class ProductInfo:
     """Represents a product info provided by an UID response."""
 
@@ -78,3 +78,6 @@ class ProductInfoStructure(StructureDecoder):
             ),
             offset,
         )
+
+
+__all__ = ["ATTR_PRODUCT", "ProductInfo", "ProductInfoStructure"]

pyplumio/structures/program_version.py

@@ -84,3 +84,6 @@ class ProgramVersionStructure(Structure):
             ),
             offset + VERSION_INFO_SIZE,
         )
+
+
+__all__ = ["ATTR_VERSION", "VersionInfo", "ProgramVersionStructure"]

pyplumio/structures/regulator_data.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from typing import Any, Final
 
-from pyplumio.helpers.data_types import BitArray, DataType
+from pyplumio.data_types import BitArray, DataType
 from pyplumio.structures import StructureDecoder
 from pyplumio.structures.frame_versions import FrameVersionsStructure
 from pyplumio.structures.regulator_data_schema import ATTR_REGDATA_SCHEMA
@@ -45,7 +45,7 @@ class RegulatorDataStructure(StructureDecoder):
         """Decode bytes and return message data and offset."""
         data = ensure_dict(data)
         offset += 2
-        regdata_version = f"{message[offset+1]}.{message[offset]}"
+        regdata_version = f"{message[offset + 1]}.{message[offset]}"
         if regdata_version != REGDATA_VERSION:
             return data, offset
 
@@ -63,3 +63,6 @@ class RegulatorDataStructure(StructureDecoder):
             }
 
         return data, self._offset
+
+
+__all__ = ["ATTR_REGDATA", "REGDATA_VERSION", "RegulatorDataStructure"]

pyplumio/structures/regulator_data_schema.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from typing import Any, Final
 
-from pyplumio.helpers.data_types import DATA_TYPES, DataType, UnsignedShort
+from pyplumio.data_types import DATA_TYPES, DataType, UnsignedShort
 from pyplumio.structures import StructureDecoder
 from pyplumio.utils import ensure_dict
 
@@ -45,3 +45,6 @@ class RegulatorDataSchemaStructure(StructureDecoder):
             ),
             self._offset,
         )
+
+
+__all__ = ["ATTR_REGDATA_SCHEMA", "RegulatorDataSchemaStructure"]

pyplumio/structures/schedules.py

@@ -19,7 +19,7 @@ from pyplumio.const import (
 from pyplumio.devices import Device, PhysicalDevice
 from pyplumio.exceptions import FrameDataError
 from pyplumio.frames import Request
-from pyplumio.helpers.parameter import (
+from pyplumio.parameters import (
     Number,
     NumberDescription,
     Parameter,
@@ -238,3 +238,20 @@ class SchedulesStructure(Structure):
             ),
             self._offset,
         )
+
+
+__all__ = [
+    "ATTR_SCHEDULES",
+    "ATTR_SCHEDULE_PARAMETERS",
+    "ATTR_SCHEDULE_SWITCH",
+    "ATTR_SCHEDULE_PARAMETER",
+    "ScheduleParameterDescription",
+    "ScheduleParameter",
+    "ScheduleNumberDescription",
+    "ScheduleNumber",
+    "ScheduleSwitchDescription",
+    "ScheduleSwitch",
+    "SCHEDULE_PARAMETERS",
+    "collect_schedule_data",
+    "SchedulesStructure",
+]

pyplumio/structures/statuses.py

@@ -41,3 +41,12 @@ class StatusesStructure(StructureDecoder):
             ),
             offset + STATUSES_SIZE,
         )
+
+
+__all__ = [
+    "ATTR_HEATING_TARGET",
+    "ATTR_HEATING_STATUS",
+    "ATTR_WATER_HEATER_TARGET",
+    "ATTR_WATER_HEATER_STATUS",
+    "StatusesStructure",
+]

pyplumio/structures/temperatures.py

@@ -5,7 +5,7 @@ from __future__ import annotations
 import math
 from typing import Any, Final
 
-from pyplumio.helpers.data_types import Float
+from pyplumio.data_types import Float
 from pyplumio.structures import StructureDecoder
 from pyplumio.utils import ensure_dict
 
@@ -70,3 +70,25 @@ class TemperaturesStructure(StructureDecoder):
                 data[TEMPERATURES[index]] = temp.value
 
         return data, offset
+
+
+__all__ = [
+    "ATTR_HEATING_TEMP",
+    "ATTR_FEEDER_TEMP",
+    "ATTR_WATER_HEATER_TEMP",
+    "ATTR_OUTSIDE_TEMP",
+    "ATTR_RETURN_TEMP",
+    "ATTR_EXHAUST_TEMP",
+    "ATTR_OPTICAL_TEMP",
+    "ATTR_UPPER_BUFFER_TEMP",
+    "ATTR_LOWER_BUFFER_TEMP",
+    "ATTR_UPPER_SOLAR_TEMP",
+    "ATTR_LOWER_SOLAR_TEMP",
+    "ATTR_FIREPLACE_TEMP",
+    "ATTR_TOTAL_GAIN",
+    "ATTR_HYDRAULIC_COUPLER_TEMP",
+    "ATTR_EXCHANGER_TEMP",
+    "ATTR_AIR_IN_TEMP",
+    "ATTR_AIR_OUT_TEMP",
+    "TemperaturesStructure",
+]