PyPlumIO 0.5.48__py3-none-any.whl → 0.5.50__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.48'
-__version_tuple__ = version_tuple = (0, 5, 48)
+__version__ = version = '0.5.50'
+__version_tuple__ = version_tuple = (0, 5, 50)

pyplumio/const.py

@@ -184,6 +184,7 @@ class FrameType(IntEnum):
     REQUEST_SET_MIXER_PARAMETER = 52
     REQUEST_SCHEDULES = 54
     REQUEST_SET_SCHEDULE = 55
+    REQUEST_ECOMAX_PARAMETER_CHANGES = 56
     REQUEST_UID = 57
     REQUEST_PASSWORD = 58
     REQUEST_ECOMAX_CONTROL = 59
@@ -203,6 +204,7 @@ class FrameType(IntEnum):
     RESPONSE_ECOMAX_CONTROL = 187
     RESPONSE_ALERTS = 189
     RESPONSE_PROGRAM_VERSION = 192
+    RESPONSE_ECOMAX_PARAMETER_CHANGES = 212
     RESPONSE_REGULATOR_DATA_SCHEMA = 213
     RESPONSE_THERMOSTAT_PARAMETERS = 220
     RESPONSE_SET_THERMOSTAT_PARAMETER = 221

pyplumio/devices/__init__.py

@@ -72,7 +72,7 @@ class Device(ABC, EventManager):
         :param name: Name of the parameter
         :type name: str
         :param value: New value for the parameter
-        :type value: int | float | bool | Literal["off", "on"]
+        :type value: int | float | bool | Literal["on", "off"]
         :param retries: Try setting parameter for this amount of
             times, defaults to 5
         :type retries: int, optional
@@ -104,7 +104,7 @@ class Device(ABC, EventManager):
         :param name: Name of the parameter
         :type name: str
         :param value: New value for the parameter
-        :type value: int | float | bool | Literal["off", "on"]
+        :type value: int | float | bool | Literal["on", "off"]
         :param retries: Try setting parameter for this amount of
             times, defaults to 5
         :type retries: int, optional
@@ -145,21 +145,26 @@ class PhysicalDevice(Device, ABC):
     @event_listener(filter=on_change)
     async def on_event_frame_versions(self, versions: dict[int, int]) -> None:
         """Check frame versions and update outdated frames."""
-        _LOGGER.info("Received frame version table")
+        _LOGGER.debug("Received frame version table")
         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)
             ):
-                await self._request_frame_version(frame_type, version)
+                request_frame_type = (
+                    FrameType.REQUEST_ECOMAX_PARAMETERS
+                    if frame_type == FrameType.REQUEST_ECOMAX_PARAMETER_CHANGES
+                    else frame_type
+                )
+                await self._request_frame_version(request_frame_type, version)
                 self._frame_versions[frame_type] = version
 
     async def _request_frame_version(
         self, frame_type: FrameType | int, version: int
     ) -> None:
         """Request frame version from the device."""
-        _LOGGER.info("Updating frame %s to version %i", repr(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)
 

pyplumio/devices/ecomax.py

@@ -234,7 +234,7 @@ class EcoMAX(PhysicalDevice):
     @event_listener
     async def on_event_setup(self, setup: bool) -> None:
         """Request frames required to set up an ecoMAX entry."""
-        _LOGGER.info("Setting up device entry")
+        _LOGGER.debug("Setting up device entry")
         await self.wait_for(ATTR_SENSORS)
         results = await asyncio.gather(
             *(
@@ -251,14 +251,14 @@ class EcoMAX(PhysicalDevice):
         if errors:
             self.dispatch_nowait(ATTR_FRAME_ERRORS, errors)
 
-        _LOGGER.info("Device entry setup done")
+        _LOGGER.debug("Device entry setup done")
 
     @event_listener
     async def on_event_ecomax_parameters(
         self, parameters: list[tuple[int, ParameterValues]]
     ) -> bool:
         """Update ecoMAX parameters and dispatch the events."""
-        _LOGGER.info("Received device parameters")
+        _LOGGER.debug("Received device parameters")
         product_info: ProductInfo = await self.get(ATTR_PRODUCT)
         parameter_types = await get_ecomax_parameter_types(product_info)
 
@@ -307,7 +307,7 @@ class EcoMAX(PhysicalDevice):
         parameters: dict[int, list[tuple[int, ParameterValues]]] | None,
     ) -> bool:
         """Handle mixer parameters and dispatch the events."""
-        _LOGGER.info("Received mixer parameters")
+        _LOGGER.debug("Received mixer parameters")
         if parameters:
             await asyncio.gather(
                 *(
@@ -324,7 +324,7 @@ class EcoMAX(PhysicalDevice):
         self, sensors: dict[int, dict[str, Any]] | None
     ) -> bool:
         """Update mixer sensors and dispatch the events."""
-        _LOGGER.info("Received mixer sensors")
+        _LOGGER.debug("Received mixer sensors")
         if sensors:
             await asyncio.gather(
                 *(
@@ -364,7 +364,7 @@ class EcoMAX(PhysicalDevice):
     @event_listener
     async def on_event_sensors(self, sensors: dict[str, Any]) -> bool:
         """Update ecoMAX sensors and dispatch the events."""
-        _LOGGER.info("Received device sensors")
+        _LOGGER.debug("Received device sensors")
         await asyncio.gather(
             *(self.dispatch(name, value) for name, value in sensors.items())
         )
@@ -376,7 +376,7 @@ class EcoMAX(PhysicalDevice):
         parameters: dict[int, list[tuple[int, ParameterValues]]] | None,
     ) -> bool:
         """Handle thermostat parameters and dispatch the events."""
-        _LOGGER.info("Received thermostat parameters")
+        _LOGGER.debug("Received thermostat parameters")
         if parameters:
             await asyncio.gather(
                 *(
@@ -407,7 +407,7 @@ class EcoMAX(PhysicalDevice):
         self, sensors: dict[int, dict[str, Any]] | None
     ) -> bool:
         """Update thermostat sensors and dispatch the events."""
-        _LOGGER.info("Received thermostat sensors")
+        _LOGGER.debug("Received thermostat sensors")
         if sensors:
             await asyncio.gather(
                 *(
@@ -427,7 +427,7 @@ class EcoMAX(PhysicalDevice):
         self, schedules: list[tuple[int, list[list[bool]]]]
     ) -> dict[str, Schedule]:
         """Update schedules."""
-        _LOGGER.info("Received device schedules")
+        _LOGGER.debug("Received device schedules")
         return {
             SCHEDULES[index]: Schedule(
                 name=SCHEDULES[index],

pyplumio/devices/mixer.py

@@ -29,7 +29,7 @@ class Mixer(VirtualDevice):
     @event_listener
     async def on_event_mixer_sensors(self, sensors: dict[str, Any]) -> bool:
         """Update mixer sensors and dispatch the events."""
-        _LOGGER.info("Received mixer %i sensors", self.index)
+        _LOGGER.debug("Received mixer %i sensors", self.index)
         await asyncio.gather(
             *(self.dispatch(name, value) for name, value in sensors.items())
         )
@@ -40,7 +40,7 @@ class Mixer(VirtualDevice):
         self, parameters: list[tuple[int, ParameterValues]]
     ) -> bool:
         """Update mixer parameters and dispatch the events."""
-        _LOGGER.info("Received mixer %i parameters", self.index)
+        _LOGGER.debug("Received mixer %i parameters", self.index)
         product_info: ProductInfo = await self.parent.get(ATTR_PRODUCT)
         parameter_types = get_mixer_parameter_types(product_info)
 

pyplumio/devices/thermostat.py

@@ -28,7 +28,7 @@ class Thermostat(VirtualDevice):
     @event_listener
     async def on_event_thermostat_sensors(self, sensors: dict[str, Any]) -> bool:
         """Update thermostat sensors and dispatch the events."""
-        _LOGGER.info("Received thermostat %i sensors", self.index)
+        _LOGGER.debug("Received thermostat %i sensors", self.index)
         await asyncio.gather(
             *(self.dispatch(name, value) for name, value in sensors.items())
         )
@@ -39,7 +39,7 @@ class Thermostat(VirtualDevice):
         self, parameters: list[tuple[int, ParameterValues]]
     ) -> bool:
         """Update thermostat parameters and dispatch the events."""
-        _LOGGER.info("Received thermostat %i parameters", self.index)
+        _LOGGER.debug("Received thermostat %i parameters", self.index)
         parameter_types = get_thermostat_parameter_types()
 
         def _thermostat_parameter_events() -> Generator[Coroutine]:

pyplumio/parameters/custom/ecomax_860d3_hb.py

@@ -2,7 +2,7 @@
 
 from pyplumio.const import UnitOfMeasurement
 from pyplumio.parameters.custom import CustomParameter, CustomParameters, Signature
-from pyplumio.parameters.ecomax import EcomaxNumberDescription
+from pyplumio.parameters.ecomax import EcomaxNumberDescription, EcomaxSwitchDescription
 
 
 class EcoMAX860D3HB(CustomParameters):
@@ -13,6 +13,7 @@ class EcoMAX860D3HB(CustomParameters):
     signature = Signature(model="ecoMAX 860D3-HB", id=48)
 
     replacements = (
+        # Summer mode
         CustomParameter(
             original="summer_mode_disable_temp",
             replacement=EcomaxNumberDescription(name="__unknown_parameter_1"),
@@ -35,4 +36,45 @@ class EcoMAX860D3HB(CustomParameters):
                 unit_of_measurement=UnitOfMeasurement.CELSIUS,
             ),
         ),
+        # Water heater
+        CustomParameter(
+            original="disable_pump_on_thermostat",
+            replacement=EcomaxNumberDescription(
+                name="water_heater_target_temp",
+                unit_of_measurement=UnitOfMeasurement.CELSIUS,
+            ),
+        ),
+        CustomParameter(
+            original="boiler_alert_temp",
+            replacement=EcomaxNumberDescription(
+                name="min_water_heater_target_temp",
+                unit_of_measurement=UnitOfMeasurement.CELSIUS,
+            ),
+        ),
+        CustomParameter(
+            original="max_feeder_temp",
+            replacement=EcomaxNumberDescription(
+                name="max_water_heater_target_temp",
+                unit_of_measurement=UnitOfMeasurement.CELSIUS,
+            ),
+        ),
+        CustomParameter(
+            original="water_heater_work_mode",
+            replacement=EcomaxNumberDescription(name="water_heater_feeding_extension"),
+        ),
+        CustomParameter(
+            original="external_boiler_temp",
+            replacement=EcomaxNumberDescription(name="water_heater_work_mode"),
+        ),
+        CustomParameter(
+            original="alert_notify",
+            replacement=EcomaxNumberDescription(
+                name="water_heater_hysteresis",
+                unit_of_measurement=UnitOfMeasurement.CELSIUS,
+            ),
+        ),
+        CustomParameter(
+            original="pump_hysteresis",
+            replacement=EcomaxSwitchDescription(name="water_heater_disinfection"),
+        ),
     )

pyplumio/protocol.py

@@ -230,20 +230,17 @@ class AsyncProtocol(Protocol, EventManager[PhysicalDevice]):
     @acache
     async def get_device_entry(self, device_type: DeviceType) -> PhysicalDevice:
         """Return the device entry."""
-
-        @acache
-        async def _setup_device_entry(device_type: DeviceType) -> PhysicalDevice:
-            """Set up the device entry."""
-            device = await PhysicalDevice.create(
-                device_type, queue=self._queues.write, network=self._network
-            )
-            device.dispatch_nowait(ATTR_CONNECTED, True)
-            device.dispatch_nowait(ATTR_SETUP, True)
-            self.dispatch_nowait(device_type.name.lower(), device)
-            return device
-
         async with self._entry_lock:
-            return await _setup_device_entry(device_type)
+            name = device_type.name.lower()
+            if name not in self.data:
+                device = await PhysicalDevice.create(
+                    device_type, queue=self._queues.write, network=self._network
+                )
+                device.dispatch_nowait(ATTR_CONNECTED, True)
+                device.dispatch_nowait(ATTR_SETUP, True)
+                await self.dispatch(device_type.name.lower(), device)
+
+        return self.data[name]
 
 
 __all__ = ["Protocol", "DummyProtocol", "AsyncProtocol"]

{pyplumio-0.5.48.dist-info → pyplumio-0.5.50.dist-info}/METADATA

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

{pyplumio-0.5.48.dist-info → pyplumio-0.5.50.dist-info}/RECORD

@@ -1,20 +1,20 @@
 pyplumio/__init__.py,sha256=3H5SO4WFw5mBTFeEyD4w0H8-MsNo93NyOH3RyMN7IS0,3337
 pyplumio/__main__.py,sha256=3IwHHSq-iay5FaeMc95klobe-xv82yydSKcBE7BFZ6M,500
-pyplumio/_version.py,sha256=I0fizQ2uqqRMTEIJ9RBykNQLkf-bZuhEQoSlnEwyBQ8,513
+pyplumio/_version.py,sha256=W2qdBOtSMf_VJh64HmusP_jxYyzDL0VrJZ_ZkeEZpKE,513
 pyplumio/connection.py,sha256=9MCPb8W62uqCrzd1YCROcn9cCjRY8E65934FnJDF5Js,5902
-pyplumio/const.py,sha256=FxF97bl_GunYuB8Wo72zCzHtznRCM64ygC2qfaR3UyA,5684
+pyplumio/const.py,sha256=QIM5ueC8dx40Ccg1QHLI_mZ5wpBTptOofJWPdOOR7hk,5770
 pyplumio/data_types.py,sha256=r-QOIZiIpBFo4kRongyu8n0BHTaEU6wWMTmNkWBNjq8,9223
 pyplumio/exceptions.py,sha256=_B_0EgxDxd2XyYv3WpZM733q0cML5m6J-f55QOvYRpI,996
 pyplumio/filters.py,sha256=s35hmm8HxqktMOtNZMdXbqMeywBNKoIsAc5hWd0AEpk,15391
-pyplumio/protocol.py,sha256=UnrXDouo4dDi7hqwJYHoEAvCoYJs3PgP1DFBBwRqBrw,8427
+pyplumio/protocol.py,sha256=9F_nkzsEuv6YWjuDyaoFH29dLaPBxeBxndogbWUG2jw,8337
 pyplumio/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyplumio/stream.py,sha256=iCB-XlNXRRE0p7nstb1AkXwVDwcCsgym_ggB_IDiJc8,4926
 pyplumio/utils.py,sha256=D6_SJzYkFjXoUrlNPt_mIQAP8hjMU05RsTqlAFphj3Y,1205
-pyplumio/devices/__init__.py,sha256=bYewj3QFU6SV1eOMtgTy9f9a20Tr4kp6bTerE_URB84,7999
-pyplumio/devices/ecomax.py,sha256=-4rVUEg5MbzzoNXOFjp4cShsf4cqFh0mlIqlloZyWz4,16191
+pyplumio/devices/__init__.py,sha256=n0h2RwLxjm9YPjRoxURpMzVjfk2SP-GZQKJTcoMkxcc,8238
+pyplumio/devices/ecomax.py,sha256=5jc1dgWG8LCSeC4ZrQ9-hEYRsZB_N1i0V-L-aj0r0Is,16200
 pyplumio/devices/ecoster.py,sha256=X46ky5XT8jHMFq9sBW0ve8ZI_tjItQDMt4moXsW-ogY,307
-pyplumio/devices/mixer.py,sha256=q2UXMCQl6gueigHt-1Y1_P1sTEbBisZeQC75u2zAKmc,2729
-pyplumio/devices/thermostat.py,sha256=LBHJHfbkJgrwAifILk_IW_rRuDzSX1CDnA2xcLh4-NI,2251
+pyplumio/devices/mixer.py,sha256=7WdUVgwO4VXmaPNzh3ZWpKr2ooRXWemz2KFHAw35_Rk,2731
+pyplumio/devices/thermostat.py,sha256=MHMKe45fQ7jKlhBVObJ7McbYQKuF6-LOKSHy-9VNsCU,2253
 pyplumio/frames/__init__.py,sha256=5lw19oFlN89ZvO8KGwnkwERULQNYiP-hhZKk65LsjYY,7862
 pyplumio/frames/messages.py,sha256=ImQGWFFTa2eaXfytQmFZKC-IxyPRkxD8qp0bEm16-ws,3628
 pyplumio/frames/requests.py,sha256=jr-_XSSCCDDTbAmrw95CKyWa5nb7JNeGzZ2jDXIxlAo,7348
@@ -32,7 +32,7 @@ pyplumio/parameters/ecomax.py,sha256=4UqI7cokCt7qS9Du4-7JgLhM7mhHCHt8SWPl_qncmXQ
 pyplumio/parameters/mixer.py,sha256=RjhfUU_62STyNV0Ud9A4G4FEvVwo02qGVl8h1QvqQXI,6646
 pyplumio/parameters/thermostat.py,sha256=-DK2Mb78CGrKmdhwAD0M3GiGJatczPnl1e2gVeT19tI,5070
 pyplumio/parameters/custom/__init__.py,sha256=tI_MXv0ExI8do7nPjA3oWiu0m0alGLlctggNNrgq09c,3240
-pyplumio/parameters/custom/ecomax_860d3_hb.py,sha256=BKXaGFeH4RXS6mMrM-l-ykKuBn51qSUniUik14k-A64,1274
+pyplumio/parameters/custom/ecomax_860d3_hb.py,sha256=DgPm-o2iOxveLR-2KTrf5xC9KRVJxBHK_3cQV4UNsEs,2860
 pyplumio/structures/__init__.py,sha256=emZVH5OFgdTUPbEJoznMKitmK0nlPm0I4SmF86It1Do,1345
 pyplumio/structures/alerts.py,sha256=fglFcxHoZ3hZJscPHmbJJqTr2mH8YXRW0T18L4Dirds,3692
 pyplumio/structures/boiler_load.py,sha256=e-6itp9L6iJeeOyhSTiOclHLuYmqG7KkcepsHwJSQSI,894
@@ -59,8 +59,8 @@ pyplumio/structures/statuses.py,sha256=1h-EUw1UtuS44E19cNOSavUgZeAxsLgX3iS0eVC8p
 pyplumio/structures/temperatures.py,sha256=2VD3P_vwp9PEBkOn2-WhifOR8w-UYNq35aAxle0z2Vg,2831
 pyplumio/structures/thermostat_parameters.py,sha256=st3x3HkjQm3hqBrn_fpvPDQu8fuc-Sx33ONB19ViQak,3007
 pyplumio/structures/thermostat_sensors.py,sha256=rO9jTZWGQpThtJqVdbbv8sYMYHxJi4MfwZQza69L2zw,3399
-pyplumio-0.5.48.dist-info/licenses/LICENSE,sha256=m-UuZFjXJ22uPTGm9kSHS8bqjsf5T8k2wL9bJn1Y04o,1088
-pyplumio-0.5.48.dist-info/METADATA,sha256=nkscdsY-xvR3T_hRTZbLp8SCQyv1yrt3kloOOCvWgwA,5611
-pyplumio-0.5.48.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
-pyplumio-0.5.48.dist-info/top_level.txt,sha256=kNBz9UPPkPD9teDn3U_sEy5LjzwLm9KfADCXtBlbw8A,9
-pyplumio-0.5.48.dist-info/RECORD,,
+pyplumio-0.5.50.dist-info/licenses/LICENSE,sha256=m-UuZFjXJ22uPTGm9kSHS8bqjsf5T8k2wL9bJn1Y04o,1088
+pyplumio-0.5.50.dist-info/METADATA,sha256=3cCn3n--0U3EccfpB_R7fKOwj2oX2w7bc4fyii4OzTg,5611
+pyplumio-0.5.50.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+pyplumio-0.5.50.dist-info/top_level.txt,sha256=kNBz9UPPkPD9teDn3U_sEy5LjzwLm9KfADCXtBlbw8A,9
+pyplumio-0.5.50.dist-info/RECORD,,

{pyplumio-0.5.48.dist-info → pyplumio-0.5.50.dist-info}/WHEEL

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