ramses-rf 0.51.4__py3-none-any.whl → 0.51.6__py3-none-any.whl

ramses_tx/address.py

@@ -45,7 +45,7 @@ class Address:
         #     device_id = NON_DEVICE_ID
 
         self.id = device_id  # TODO: check is a valid id...
-        self.type = device_id[:2]  # dex, NOTE: remove last
+        self.type = device_id[:2]  # dex, drops 2nd part, incl. ":"
         self._hex_id: str = None  # type: ignore[assignment]
 
         if not self.is_valid(device_id):

ramses_tx/command.py

@@ -39,6 +39,10 @@ from .const import (
 )
 from .frame import Frame, pkt_header
 from .helpers import (
+    air_quality_code,
+    capability_bits,
+    fan_info_flags,
+    fan_info_to_byte,
     hex_from_bool,
     hex_from_double,
     hex_from_dtm,
@@ -854,7 +858,7 @@ class Command(Frame):
     def put_indoor_humidity(
         cls, dev_id: DeviceIdT | str, indoor_humidity: float | None
     ) -> Command:
-        """Constructor to announce the current humidity of a sensor (12A0)."""
+        """Constructor to announce the current humidity of a sensor or fan (12A0)."""
         # .I --- 37:039266 --:------ 37:039266 1298 003 000316
 
         payload = "00" + hex_from_percent(indoor_humidity, high_res=False)
@@ -1320,6 +1324,109 @@ class Command(Frame):
         dt_str = hex_from_dtm(datetime, is_dst=is_dst, incl_seconds=True)
         return cls.from_attrs(W_, ctl_id, Code._313F, f"0060{dt_str}")
 
+    @classmethod  # constructor for I|31DA
+    def get_hvac_fan_31da(
+        cls,
+        dev_id: DeviceIdT | str,
+        hvac_id: str,
+        bypass_position: float | None,
+        air_quality: int | None,
+        co2_level: int | None,
+        indoor_humidity: float | None,
+        outdoor_humidity: float | None,
+        exhaust_temp: float | None,
+        supply_temp: float | None,
+        indoor_temp: float | None,
+        outdoor_temp: float | None,
+        speed_capabilities: list[str],
+        fan_info: str,
+        _unknown_fan_info_flags: list[int],  # skip? as starts with _
+        exhaust_fan_speed: float | None,
+        supply_fan_speed: float | None,
+        remaining_mins: int | None,
+        post_heat: int | None,
+        pre_heat: int | None,
+        supply_flow: float | None,
+        exhaust_flow: float | None,
+        **kwargs: Any,  # option: air_quality_basis: str | None,
+    ) -> Command:
+        """Constructor to announce hvac fan (state, temps, flows, humidity etc.) of a HRU (31DA)."""
+        # 00 EF00 7FFF 34 33 0898 0898 088A 0882 F800 00 15 14 14 0000 EF EF 05F5 0613:
+        # {"hvac_id": '00', 'bypass_position': 0.000, 'air_quality': None,
+        # 'co2_level': None, 'indoor_humidity': 0.52, 'outdoor_humidity': 0.51,
+        # 'exhaust_temp': 22.0, 'supply_temp': 22.0, 'indoor_temp': 21.86,
+        # 'outdoor_temp': 21.78, 'speed_capabilities': ['off', 'low_med_high',
+        # 'timer', 'boost', 'auto'], 'fan_info': 'away',
+        # '_unknown_fan_info_flags': [0, 0, 0], 'exhaust_fan_speed': 0.1,
+        # 'supply_fan_speed': 0.1, 'remaining_mins': 0, 'post_heat': None,
+        # 'pre_heat': None, 'supply_flow': 15.25, 'exhaust_flow': 15.55},
+
+        air_quality_basis: str = kwargs.pop("air_quality_basis", "00")
+        extra: str = kwargs.pop("_extra", "")
+        assert not kwargs, kwargs
+
+        payload = hvac_id
+        payload += (
+            f"{(int(air_quality * 200)):02X}" if air_quality is not None else "EF"
+        )
+        payload += (
+            f"{air_quality_code(air_quality_basis)}"
+            if air_quality_basis is not None
+            else "00"
+        )
+        payload += f"{co2_level:04X}" if co2_level is not None else "7FFF"
+        payload += (
+            hex_from_percent(indoor_humidity, high_res=False)
+            if indoor_humidity is not None
+            else "EF"
+        )
+        payload += (
+            hex_from_percent(outdoor_humidity, high_res=False)
+            if outdoor_humidity is not None
+            else "EF"
+        )
+        payload += hex_from_temp(exhaust_temp) if exhaust_temp is not None else "7FFF"
+        payload += hex_from_temp(supply_temp) if supply_temp is not None else "7FFF"
+        payload += hex_from_temp(indoor_temp) if indoor_temp is not None else "7FFF"
+        payload += hex_from_temp(outdoor_temp) if outdoor_temp is not None else "7FFF"
+        payload += (
+            f"{capability_bits(speed_capabilities):04X}"
+            if speed_capabilities is not None
+            else "7FFF"
+        )
+        payload += (
+            hex_from_percent(bypass_position, high_res=True)
+            if bypass_position is not None
+            else "EF"
+        )
+        payload += (
+            f"{(fan_info_to_byte(fan_info) | fan_info_flags(_unknown_fan_info_flags)):02X}"
+            if fan_info is not None
+            else "EF"
+        )
+        payload += (
+            hex_from_percent(exhaust_fan_speed, high_res=True)
+            if exhaust_fan_speed is not None
+            else "FF"
+        )
+        payload += (
+            hex_from_percent(supply_fan_speed, high_res=True)
+            if supply_fan_speed is not None
+            else "FF"
+        )
+        payload += f"{remaining_mins:04X}" if remaining_mins is not None else "7FFF"
+        payload += f"{int(post_heat * 200):02X}" if post_heat is not None else "EF"
+        payload += f"{int(pre_heat * 200):02X}" if pre_heat is not None else "EF"
+        payload += (
+            f"{(int(supply_flow * 100)):04X}" if supply_flow is not None else "7FFF"
+        )
+        payload += (
+            f"{(int(exhaust_flow * 100)):04X}" if exhaust_flow is not None else "7FFF"
+        )
+        payload += extra
+
+        return cls._from_attrs(I_, Code._31DA, payload, addr0=dev_id, addr2=dev_id)
+
     @classmethod  # constructor for RQ|3220
     def get_opentherm_data(cls, otb_id: DeviceIdT | str, msg_id: int | str) -> Command:
         """Constructor to get (Read-Data) opentherm msg value (c.f. parser_3220)."""
@@ -1412,7 +1519,7 @@ CODE_API_MAP = {
     f"{I_}|{Code._1FC9}": Command.put_bind,
     f"{W_}|{Code._1FC9}": Command.put_bind,  # NOTE: same class method as I|1FC9
     f"{W_}|{Code._22F7}": Command.set_bypass_position,
-    f"{I_}|{Code._1298}": Command.put_co2_level,
+    f"{I_}|{Code._1298}": Command.put_co2_level,  # .         has a test
     f"{RQ}|{Code._1F41}": Command.get_dhw_mode,
     f"{W_}|{Code._1F41}": Command.set_dhw_mode,  # .          has a test
     f"{RQ}|{Code._10A0}": Command.get_dhw_params,
@@ -1421,7 +1528,7 @@ CODE_API_MAP = {
     f"{I_}|{Code._1260}": Command.put_dhw_temp,  # .          has a test (empty)
     f"{I_}|{Code._22F1}": Command.set_fan_mode,
     f"{W_}|{Code._2411}": Command.set_fan_param,
-    f"{I_}|{Code._12A0}": Command.put_indoor_humidity,
+    f"{I_}|{Code._12A0}": Command.put_indoor_humidity,  # .   has a test
     f"{RQ}|{Code._1030}": Command.get_mix_valve_params,
     f"{W_}|{Code._1030}": Command.set_mix_valve_params,  # .  has a test
     f"{RQ}|{Code._3220}": Command.get_opentherm_data,
@@ -1451,4 +1558,5 @@ CODE_API_MAP = {
     f"{W_}|{Code._2309}": Command.set_zone_setpoint,  # .     has a test
     f"{RQ}|{Code._30C9}": Command.get_zone_temp,
     f"{RQ}|{Code._12B0}": Command.get_zone_window_state,
+    f"{I_}|{Code._31DA}": Command.get_hvac_fan_31da,  # .     has a test
 }  # TODO: RQ|0404 (Zone & DHW)

ramses_tx/const.py

@@ -88,6 +88,8 @@ SZ_REL_HUMIDITY: Final = "rel_humidity"
 SZ_REMAINING_DAYS: Final = "days_remaining"
 SZ_REMAINING_MINS: Final = "remaining_mins"
 SZ_REMAINING_PERCENT: Final = "percent_remaining"
+SZ_REQ_REASON: Final = "req_reason"
+SZ_REQ_SPEED: Final = "req_speed"
 SZ_SUPPLY_FAN_SPEED: Final = "supply_fan_speed"
 SZ_SUPPLY_FLOW: Final = "supply_flow"
 SZ_SUPPLY_TEMP: Final = "supply_temp"
@@ -440,7 +442,7 @@ DEV_TYPE_MAP = attr_dict_factory(
         "HEAT_ZONE_ACTUATORS": ("00", "02", "04", "13"),
         "THM_DEVICES": ("03", "12", "22", "34"),
         "TRV_DEVICES": ("00", "04"),
-        "CONTROLLERS": ("01", "12", "22", "23", "34"),  # potentially controllers
+        "CONTROLLERS": ("01", "02", "12", "22", "23", "34"),  # potentially controllers
         "PROMOTABLE_SLUGS": (DevType.DEV, DevType.HEA, DevType.HVC),
         "HVAC_SLUGS": {
             DevType.CO2: "co2_sensor",

ramses_tx/gateway.py

@@ -331,7 +331,7 @@ class Engine:
         )  # may: raise ProtocolError/ProtocolSendFailed
 
     def _msg_handler(self, msg: Message) -> None:
-        # HACK: This is one consequence of an unpleaseant anachronism
+        # HACK: This is one consequence of an unpleasant anachronism
         msg.__class__ = Message  # HACK (next line too)
         msg._gwy = self  # type: ignore[assignment]
 

ramses_tx/helpers.py

@@ -479,6 +479,13 @@ def parse_valve_demand(
     return {SZ_HEAT_DEMAND: result}
 
 
+AIR_QUALITY_BASIS: dict[str, str] = {
+    "10": "voc",  # volatile compounds
+    "20": "co2",  # carbon dioxide
+    "40": "rel_humidity",  # relative humidity
+}
+
+
 # 31DA[2:6] and 12C8[2:6]
 def parse_air_quality(value: HexStr4) -> PayDictT.AIR_QUALITY:
     """Return the air quality (%): poor (0.0) to excellent (1.0).
@@ -505,15 +512,21 @@ def parse_air_quality(value: HexStr4) -> PayDictT.AIR_QUALITY:
     assert level <= 1.0, value[:2]  # TODO: raise exception
 
     assert value[2:] in ("10", "20", "40"), value[2:]  # TODO: remove assert
-    basis = {
-        "10": "voc",  # volatile compounds
-        "20": "co2",  # carbon dioxide
-        "40": "rel_humidity",  # relative humidity
-    }.get(value[2:], f"unknown_{value[2:]}")  # TODO: remove get/unknown
+
+    basis: str = AIR_QUALITY_BASIS.get(
+        value[2:], f"unknown_{value[2:]}"
+    )  # TODO: remove get/unknown
 
     return {SZ_AIR_QUALITY: level, SZ_AIR_QUALITY_BASIS: basis}
 
 
+def air_quality_code(desc: str) -> str:
+    for k, v in AIR_QUALITY_BASIS.items():
+        if v == desc:
+            return k
+    return "00"
+
+
 # 31DA[6:10] and 1298[2:6]
 def parse_co2_level(value: HexStr4) -> PayDictT.CO2_LEVEL:
     """Return the co2 level (ppm).
@@ -657,6 +670,26 @@ def _parse_hvac_temp(param_name: str, value: HexStr4) -> Mapping[str, float | No
     return {param_name: temp}
 
 
+ABILITIES = {
+    15: "off",
+    14: "low_med_high",  # 3,2,1 = high,med,low?
+    13: "timer",
+    12: "boost",
+    11: "auto",
+    10: "speed_4",
+    9: "speed_5",
+    8: "speed_6",
+    7: "speed_7",
+    6: "speed_8",
+    5: "speed_9",
+    4: "speed_10",
+    3: "auto_night",
+    2: "reserved",
+    1: "post_heater",
+    0: "pre_heater",
+}
+
+
 # 31DA[30:34]
 def parse_capabilities(value: HexStr4) -> PayDictT.CAPABILITIES:
     """Return the speed capabilities (a bitmask).
@@ -672,25 +705,6 @@ def parse_capabilities(value: HexStr4) -> PayDictT.CAPABILITIES:
     if value == "7FFF":  # TODO: Not implemented???
         return {SZ_SPEED_CAPABILITIES: None}
 
-    ABILITIES = {
-        15: "off",
-        14: "low_med_high",  # 3,2,1 = high,med,low?
-        13: "timer",
-        12: "boost",
-        11: "auto",
-        10: "speed_4",
-        9: "speed_5",
-        8: "speed_6",
-        7: "speed_7",
-        6: "speed_8",
-        5: "speed_9",
-        4: "speed_10",
-        3: "auto_night",
-        2: "reserved",
-        1: "post_heater",
-        0: "pre_heater",
-    }
-
     # assert value in ("0002", "4000", "4808", "F000", "F001", "F800", "F808"), value
 
     return {
@@ -700,6 +714,16 @@ def parse_capabilities(value: HexStr4) -> PayDictT.CAPABILITIES:
     }
 
 
+def capability_bits(cap_list: list[str]) -> int:
+    # 0xF800 = 0b1111100000000000
+    cap_res: int = 0
+    for cap in cap_list:
+        for k, v in ABILITIES.items():
+            if v == cap:
+                cap_res |= 2**k  # set bit
+    return cap_res
+
+
 # 31DA[34:36]
 def parse_bypass_position(value: HexStr2) -> PayDictT.BYPASS_POSITION:
     """Return the bypass position (%), usually fully open or closed (0%, no bypass).
@@ -757,7 +781,22 @@ def parse_fan_info(value: HexStr2) -> PayDictT.FAN_INFO:
     }
 
 
-# 31DA[38:40]
+def fan_info_to_byte(info: str) -> int:
+    for k, v in _31DA_FAN_INFO.items():
+        if v == info:
+            return int(k) & 0x1F
+    return 0x0000
+
+
+def fan_info_flags(flags_list: list[int]) -> int:
+    flag_res: int = 0
+    for index, shft in enumerate(range(7, 4, -1)):  # index = 7, 6 and 5
+        if flags_list[index] == 1:
+            flag_res |= 1 << shft  # set bits
+    return flag_res
+
+
+# 31DA[38:40], also 2210
 def parse_exhaust_fan_speed(value: HexStr2) -> PayDictT.EXHAUST_FAN_SPEED:
     """Return the exhaust fan speed (% of max speed)."""
     return _parse_fan_speed(SZ_EXHAUST_FAN_SPEED, value)  # type: ignore[return-value]

ramses_tx/logger.py

@@ -7,7 +7,6 @@ This module wraps logger to provide bespoke functionality, especially for timest
 from __future__ import annotations
 
 import logging
-import os
 import re
 import shutil
 import sys
@@ -174,28 +173,32 @@ class TimedRotatingFileHandler(_TimedRotatingFileHandler):
     #         self.doRollover()
     #     return super().emit(record)
 
-    def getFilesToDelete(self) -> list[str]:  # zxdavb: my version
-        """Determine the files to delete when rolling over.
-
-        Overridden as old log files not being deleted.
-        """
-        # See bpo-44753 (this code is as was before that commit), bpo45628, bpo-46063
-        dirName, baseName = os.path.split(self.baseFilename)
-        fileNames = os.listdir(dirName)
-        result = []
-        prefix = baseName + "."
-        plen = len(prefix)
-        for fileName in fileNames:
-            if fileName[:plen] == prefix:
-                suffix = fileName[plen:]
-                if self.extMatch.match(suffix):
-                    result.append(os.path.join(dirName, fileName))
-        if len(result) < self.backupCount:
-            result = []
-        else:
-            result.sort()
-            result = result[: len(result) - self.backupCount]
-        return result
+    # To fix issue ramses_cc 293, test if this override is still required
+    # async def getFilesToDelete(self) -> list[str]:  # zxdavb: my version
+    #     """Determine the files to delete when rolling over.
+    #
+    #     Overridden as old log files were not being deleted.
+    #     """
+    #     # See bpo-44753 (this code is as was before that commit), bpo45628, bpo-46063
+    #     dirName, baseName = os.path.split(self.baseFilename)
+    #     loop = asyncio.get_running_loop()
+    #     # Must run async in executor to prevent HA blocking call on rollover (ramses_cc issue 293)
+    #     file_names = await loop.run_in_executor(None, os.listdir, dirName) < doesn't work
+    #
+    #     result = []
+    #     prefix = baseName + "."
+    #     plen = len(prefix)
+    #     for fileName in file_names:
+    #         if fileName[:plen] == prefix:
+    #             suffix = fileName[plen:]
+    #             if self.extMatch.match(suffix):
+    #                 result.append(os.path.join(dirName, fileName))
+    #     if len(result) < self.backupCount:
+    #         result = []
+    #     else:
+    #         result.sort()
+    #         result = result[: len(result) - self.backupCount]
+    #     return result
 
 
 def getLogger(  # permits a bespoke Logger class

ramses_tx/message.py

@@ -281,7 +281,7 @@ class MessageBase:
             raise exc.PacketInvalid from err
 
 
-class Message(MessageBase):  # add _expired attr
+class Message(MessageBase):
     """Extend the Message class, so is useful to a stateful Gateway.
 
     Adds _expired attr to the Message class.

ramses_tx/parsers.py

@@ -72,6 +72,7 @@ from .const import (
     SZ_RELAY_DEMAND,
     SZ_REMAINING_DAYS,
     SZ_REMAINING_PERCENT,
+    SZ_REQ_REASON,
     SZ_SETPOINT,
     SZ_SETPOINT_BOUNDS,
     SZ_SYSTEM_MODE,
@@ -1378,22 +1379,18 @@ def parser_1fd4(payload: str, msg: Message) -> PayDictT._1FD4:
     return {"ticker": int(payload[2:], 16)}
 
 
-# WIP: unknown, HVAC
+# WIP: HVAC auto requests (confirmed for Orcon, others?)
 def parser_2210(payload: str, msg: Message) -> dict[str, Any]:
     try:
         assert msg.verb in (RP, I_) or payload == "00"
-        assert payload[10:12] == payload[38:40] and payload[
-            10:12
-        ] in (  # auto requested fan speed step?
-            "58",
-            "64",
-            "96",
-            "FF",
-        ), f"expected req.speed? (58|64|96|FF), not {payload[10:12]}"
+        assert payload[10:12] == payload[38:40], (
+            f"expected byte 19 {payload[10:12]}, not {payload[38:40]}"
+        )  # auto requested fan speed %. Identical [38:40] is for supply?
         assert payload[20:22] == payload[48:50] and payload[20:22] in (
-            "00",
-            "03",
-        ), f"expected byte 10 (00|03), not {payload[20:22]}"
+            "00",  # idle
+            "02",  # requested by CO2 level/sensor
+            "03",  # requested by humidity level/sensor
+        ), f"expected req_reason (00|02|03), not {payload[20:22]}"
         assert payload[78:80] in ("00", "02"), (
             f"expected byte 39 (00|02), not {payload[78:80]}"
         )
@@ -1407,9 +1404,17 @@ def parser_2210(payload: str, msg: Message) -> dict[str, Any]:
     except AssertionError as err:
         _LOGGER.warning(f"{msg!r} < {_INFORM_DEV_MSG} ({err})")
 
+    _req = "IDL"
+    if payload[20:22] == "02":
+        _req = "CO2"
+    elif payload[20:22] == "03":
+        _req = "HUM"
+
     return {
-        "unknown_10": payload[10:12],
-        "unknown_20": payload[20:22],
+        **parse_exhaust_fan_speed(
+            payload[10:12]
+        ),  # for Orcon: 29 hex == 41 decimal divided by 2 gives 20.5 (%)
+        SZ_REQ_REASON: _req,
         "unknown_78": payload[78:80],
         "unknown_80": payload[80:82],
         "unknown_82": payload[82:],
@@ -2215,10 +2220,9 @@ def parser_31d9(payload: str, msg: Message) -> dict[str, Any]:
 # ventilation state (extended), HVAC
 def parser_31da(payload: str, msg: Message) -> PayDictT._31DA:
     # see: https://github.com/python/typing/issues/1445
-    return {  # type: ignore[typeddict-unknown-key]
+    result = {
         **parse_exhaust_fan_speed(payload[38:40]),  # maybe 31D9[4:6] for some?
         **parse_fan_info(payload[36:38]),  # 22F3-ish
-        #
         **parse_air_quality(payload[2:6]),  # 12C8[2:6]
         **parse_co2_level(payload[6:10]),  # 1298[2:6]
         **parse_indoor_humidity(payload[10:12]),  # 12A0?
@@ -2236,6 +2240,11 @@ def parser_31da(payload: str, msg: Message) -> PayDictT._31DA:
         **parse_supply_flow(payload[50:54]),  # NOTE: is supply, not exhaust
         **parse_exhaust_flow(payload[54:58]),  # NOTE: order switched from others
     }
+    if len(payload) == 58:
+        return result  # type: ignore[return-value]
+
+    result.update({"_extra": payload[58:]})  # sporadic [58:60] always 00
+    return result  # type: ignore[return-value]
 
     # From an Orcon 15RF Display
     #  1 Software version

ramses_tx/ramses.py

@@ -871,11 +871,14 @@ _DEV_KLASSES_HEAT: dict[str, dict[Code, dict[VerbT, Any]]] = {
         Code._000A: {RP: {}},
         Code._000C: {RP: {}},
         Code._1FC9: {I_: {}},
+        Code._1FD4: {I_: {}},  # Spider Autotemp, slave 'ticker'
         Code._10E0: {I_: {}, RP: {}},
         Code._22C9: {I_: {}},  # NOTE: No RP
         Code._22D0: {I_: {}, RP: {}},
         Code._2309: {RP: {}},
+        Code._3110: {I_: {}},  # Spider Autotemp
         Code._3150: {I_: {}},
+        Code._4E01: {I_: {}},  # Spider Autotemp Zone controller
     },
     DevType.TRV: {  # e.g. HR92/HR91: Radiator Controller
         Code._0001: {W_: {r"^0[0-9A-F]"}},
@@ -1411,7 +1414,6 @@ _31DA_FAN_INFO: dict[int, str] = {
     0x1F: "-unknown 0x1F-",  # static field, used as filter in parser_31da so keep same
 }
 
-
 #
 ########################################################################################
 # CODES_BY_ZONE_TYPE

ramses_tx/transport.py

@@ -1073,7 +1073,7 @@ class MqttTransport(_FullTransport, _MqttTransportAbstractor):
         self._connecting = True
         try:
             self.client.connect_async(
-                self._broker_url.hostname,  # type: ignore[arg-type]
+                str(self._broker_url.hostname or "localhost"),
                 self._broker_url.port or 1883,
                 60,
             )
@@ -1172,10 +1172,18 @@ class MqttTransport(_FullTransport, _MqttTransportAbstractor):
         self,
         client: mqtt.Client,
         userdata: Any,
-        reason_code: Any,
-        properties: Any | None,
+        *args: Any,
+        **kwargs: Any,
     ) -> None:
-        _LOGGER.warning(f"MQTT disconnected: {reason_code.getName()}")
+        # Handle different paho-mqtt callback signatures
+        reason_code = args[0] if len(args) >= 1 else None
+
+        reason_name = (
+            reason_code.getName()
+            if reason_code is not None and hasattr(reason_code, "getName")
+            else str(reason_code)
+        )
+        _LOGGER.warning(f"MQTT disconnected: {reason_name}")
 
         was_connected = self._connected
         self._connected = False
@@ -1191,13 +1199,9 @@ class MqttTransport(_FullTransport, _MqttTransportAbstractor):
                 self._protocol.pause_writing()
 
         # Only attempt reconnection if we didn't deliberately disconnect
-        if not self._closing and not reason_code.is_failure:
-            # This was an unexpected disconnect, schedule reconnection
-            _LOGGER.debug("MQTT unexpected disconnect - scheduling reconnection")
-            self._schedule_reconnect()
-        elif reason_code.is_failure and not self._closing:
-            # Connection failed, also schedule reconnection
-            _LOGGER.debug("MQTT connection failed - scheduling reconnection")
+
+        if not self._closing:
+            # Schedule reconnection for any disconnect (unexpected or failure)
             self._schedule_reconnect()
 
     def _create_connection(self, msg: mqtt.MQTTMessage) -> None:

ramses_tx/typed_dicts.py

@@ -143,6 +143,8 @@ class ExhaustFlow(TypedDict):
 
 
 class _VentilationState(
+    ExhaustFanSpeed,
+    FanInfo,
     AirQuality,
     Co2Level,
     ExhaustTemp,
@@ -151,8 +153,6 @@ class _VentilationState(
     OutdoorTemp,
     Capabilities,
     BypassPosition,
-    FanInfo,
-    ExhaustFanSpeed,
     SupplyFanSpeed,
     RemainingMins,
     PostHeater,
@@ -162,6 +162,7 @@ class _VentilationState(
 ):
     indoor_humidity: _HexToTempT
     outdoor_humidity: _HexToTempT
+    extra: NotRequired[str | None]
 
 
 # These are payload-specific...

ramses_tx/version.py

@@ -1,4 +1,4 @@
 """RAMSES RF - a RAMSES-II protocol decoder & analyser (transport layer)."""
 
-__version__ = "0.51.4"
+__version__ = "0.51.6"
 VERSION = __version__

ramses_rf-0.51.4.dist-info/RECORD

@@ -1,55 +0,0 @@
-ramses_cli/__init__.py,sha256=uvGzWqOf4avvgzxJNSLFWEelIWqSZ-AeLAZzg5x58bc,397
-ramses_cli/client.py,sha256=QOmPKjCQHHOZwLBWEB438zabI9k38-ELRwisLvbvxSU,19782
-ramses_cli/debug.py,sha256=vgR0lOHoYjWarN948dI617WZZGNuqHbeq6Tc16Da7b4,608
-ramses_cli/discovery.py,sha256=81XbmpNiCpUHVZBwo2g1eRwyJG-wZhpSsc44G3hHlFA,12972
-ramses_cli/utils/cat_slow.py,sha256=AhUpM5gnegCitNKU-JGHn-DrRzSi-49ZR1Qw6lxe_t8,607
-ramses_cli/utils/convert.py,sha256=D_YiCyX5na9pgC-_NhBlW9N1dgRKUK-uLtLBfofjzZM,1804
-ramses_rf/__init__.py,sha256=zONFBiRdf07cPTSxzr2V3t-b3CGokZjT9SGit4JUKRA,1055
-ramses_rf/binding_fsm.py,sha256=uZAOl3i19KCXqqlaLJWkEqMMP7NJBhVPW3xTikQD1fY,25996
-ramses_rf/const.py,sha256=DSo4ROWDlOlcdXQdrpAF17vOsTLgmf2u0UppjYa5qJI,5390
-ramses_rf/database.py,sha256=6k5MLtK5Lplz8THfluQoQU-eniUkqSwEUMvVW7VyGhI,9880
-ramses_rf/dispatcher.py,sha256=b7Cg1vAP6FECC6GeZsJ0BZVqy-ZjJTXhZquzcwE87WI,11221
-ramses_rf/entity_base.py,sha256=vH4lmwXnylSM-1MWmat0_QRSNVCRi3iVhcqj9O41Pms,39602
-ramses_rf/exceptions.py,sha256=rzVZDcYxFH7BjUAQ3U1fHWtgBpwk3BgjX1TO1L1iM8c,2538
-ramses_rf/gateway.py,sha256=vqoTEb6QXnwaIMa66oed_3LEVvlyQ3flsAAMliEEvVA,20921
-ramses_rf/helpers.py,sha256=LcrVLqnF2qJWqXrC7UXKOQE8khCT3OhoTpZ_ZVBjw3A,4249
-ramses_rf/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ramses_rf/schemas.py,sha256=mYOUZOH5OIDNBxRM2vd8POzDWEEmLhxh5UtqjTpFNek,13287
-ramses_rf/version.py,sha256=zEZhrTC1gMQzcGZ3ZSkZrhF_OBj8Dnlv5VhehgnT3_s,125
-ramses_rf/device/__init__.py,sha256=sUbH5dhbYFXSoM_TPFRutpRutBRpup7_cQ9smPtDTy8,4858
-ramses_rf/device/base.py,sha256=V2YzRhdxrTqfHYrCBq6pJsYdTgAx8gGzfdo8pkbeEo8,17450
-ramses_rf/device/heat.py,sha256=2sCsggySVcuTzyXDmgWy76QbhlU5MQWSejy3zgI5BDE,54242
-ramses_rf/device/hvac.py,sha256=QAlWx6jBArbHzZD5Mm1wZPmIbrQrw4ljbTDV0P4IH3I,23438
-ramses_rf/system/__init__.py,sha256=uZLKio3gLlBzePa2aDQ1nxkcp1YXOGrn6iHTG8LiNIw,711
-ramses_rf/system/faultlog.py,sha256=GdGmVGT3137KsTlV_nhccgIFEmYu6DFsLTn4S-8JSok,12799
-ramses_rf/system/heat.py,sha256=dARzcwL39JGwOBJkKJBi0_i7rr8IvY-qaNmWmgJLpdo,39223
-ramses_rf/system/schedule.py,sha256=Ts6tdZPTQLV5NkgwA73tPa5QUsnZNIIuYoKC-8VsXDk,18808
-ramses_rf/system/zones.py,sha256=QwRtSHY5c-Amcs6JD16uQcimOsEQTZcMm1dW-pqEFqM,36041
-ramses_tx/__init__.py,sha256=wJ7Ntx-0AyJwYwSG8OrFMpxDLXs6GbECbCcYhq98mSA,3162
-ramses_tx/address.py,sha256=2640K3sXzogZtd4-tSxwVjYEEXcFE1DgmtvZlTMM5mE,8444
-ramses_tx/command.py,sha256=g5PBf9JnuygveyaYrqIuV8wIn7grm0evuqKy9Cp1oaA,53844
-ramses_tx/const.py,sha256=B2db8Yxks-lMNsQAK1DoPkF1gvwNIacLmKwXuApUyLk,30221
-ramses_tx/exceptions.py,sha256=FJSU9YkvpKjs3yeTqUJX1o3TPFSe_B01gRGIh9b3PNc,2632
-ramses_tx/fingerprints.py,sha256=nfftA1E62HQnb-eLt2EqjEi_la0DAoT0wt-PtTMie0s,11974
-ramses_tx/frame.py,sha256=9lUVh8gAMXNRAolfFw2WuWANjn24AWkmscuM9Tm5imE,22036
-ramses_tx/gateway.py,sha256=FE5MWA1eIE9JATA2vRoBSQ8fAzqp7TqAm3Ds3k1KnKE,11267
-ramses_tx/helpers.py,sha256=WJ5JtAT9iyhkcW53AIPNPuvGEUWFwLumZc-mCG2kIOc,32236
-ramses_tx/logger.py,sha256=7vUpcfOFMW95juMWDx5dhUOqV8DTsindZ-Qz2aCmEoA,11073
-ramses_tx/message.py,sha256=J1wvVkLPJQr2ffKCUQYSWwLPzRTZBC0zUU5W9DkN3hU,13190
-ramses_tx/opentherm.py,sha256=58PXz9l5x8Ou6Fm3y-R_UnGHCYahoi2RKIDdYStUMzk,42378
-ramses_tx/packet.py,sha256=NGunaGCkEjhTp9t4mARK5e7kbqT-Z_JKCH7ibMYMJXU,7357
-ramses_tx/parsers.py,sha256=eU5dqbbw1vzWDFxDhyNPy2j6t_LQN56mRJa0A-PeKiE,109411
-ramses_tx/protocol.py,sha256=ifj3qwcQivjQDaQUwM94xp-U8Pmef6zwSH7mav8DLWA,28867
-ramses_tx/protocol_fsm.py,sha256=YhHkTqbl8w-myimsOjV50uIFgg9HiApwPU7xA_jg5nU,26827
-ramses_tx/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ramses_tx/ramses.py,sha256=GnZwvx-HSVFdjXfUen6aWClDtrAmYaKwbrWl-LsyKO4,52045
-ramses_tx/schemas.py,sha256=h2AcArVROy1_C4n6F0Crj4e-2BxXxH74xogFlc6nKHI,12769
-ramses_tx/transport.py,sha256=-IO8UY85OOytciX3h7tFN58BBDtI3TEoOgmUmv-LiNc,56288
-ramses_tx/typed_dicts.py,sha256=4ZT50M-Cuwy2ljAIorwoxEJ9c737xUHrUxX9wTh79xE,10834
-ramses_tx/typing.py,sha256=eF2SlPWhNhEFQj6WX2AhTXiyRQVXYnFutiepllYl2rI,5042
-ramses_tx/version.py,sha256=QqJQBBdWjuoIvxrhzIH4ysjOp5bzB0KI1TdFhr9c6og,123
-ramses_rf-0.51.4.dist-info/METADATA,sha256=odaoeguG-xZAlWq8nYF4PHVK3SV5mzJRi1QdD4IBKcE,3906
-ramses_rf-0.51.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ramses_rf-0.51.4.dist-info/entry_points.txt,sha256=NnyK29baOCNg8DinPYiZ368h7MTH7bgTW26z2A1NeIE,50
-ramses_rf-0.51.4.dist-info/licenses/LICENSE,sha256=-Kc35W7l1UkdiQ4314_yVWv7vDDrg7IrJfMLUiq6Nfs,1074
-ramses_rf-0.51.4.dist-info/RECORD,,