ramses-rf 0.51.5__py3-none-any.whl → 0.51.7__py3-none-any.whl

ramses_cli/client.py

@@ -483,7 +483,6 @@ async def async_main(command: str, lib_kwargs: dict, **kwargs: Any) -> None:
             print(f"{COLORS.get(msg.verb)}{dtm} {msg}"[:con_cols])
 
     serial_port, lib_kwargs = normalise_config(lib_kwargs)
-    assert isinstance(lib_kwargs.get(SZ_INPUT_FILE), str)
 
     if kwargs["restore_schema"]:
         print(" - restoring client schema from a HA cache...")

ramses_rf/database.py

@@ -29,6 +29,22 @@ class Params(TypedDict):
 _LOGGER = logging.getLogger(__name__)
 
 
+def _setup_db_adapters() -> None:
+    """Set up the database adapters and converters."""
+
+    def adapt_datetime_iso(val: dt) -> str:
+        """Adapt datetime.datetime to timezone-naive ISO 8601 datetime."""
+        return val.isoformat(timespec="microseconds")
+
+    sqlite3.register_adapter(dt, adapt_datetime_iso)
+
+    def convert_datetime(val: bytes) -> dt:
+        """Convert ISO 8601 datetime to datetime.datetime object."""
+        return dt.fromisoformat(val.decode())
+
+    sqlite3.register_converter("dtm", convert_datetime)
+
+
 class MessageIndex:
     """A simple in-memory SQLite3 database for indexing messages."""
 
@@ -40,7 +56,7 @@ class MessageIndex:
         self._cx = sqlite3.connect(":memory:")  # Connect to a SQLite DB in memory
         self._cu = self._cx.cursor()  # Create a cursor
 
-        self._setup_db_adapters()  # dtm adapter/converter
+        _setup_db_adapters()  # dtm adapter/converter
         self._setup_db_schema()
 
         self._lock = asyncio.Lock()
@@ -76,23 +92,19 @@ class MessageIndex:
         """Return the messages in the index in a threadsafe way."""
         return self._msgs
 
-    def _setup_db_adapters(self) -> None:
-        """Setup the database adapters and converters."""
-
-        def adapt_datetime_iso(val: dt) -> str:
-            """Adapt datetime.datetime to timezone-naive ISO 8601 datetime."""
-            return val.isoformat(timespec="microseconds")
-
-        sqlite3.register_adapter(dt, adapt_datetime_iso)
-
-        def convert_datetime(val: bytes) -> dt:
-            """Convert ISO 8601 datetime to datetime.datetime object."""
-            return dt.fromisoformat(val.decode())
+    def _setup_db_schema(self) -> None:
+        """Set up the message database schema.
 
-        sqlite3.register_converter("dtm", convert_datetime)
+        Fields:
 
-    def _setup_db_schema(self) -> None:
-        """Setup the dayabase schema."""
+        - dtm  message timestamp
+        - verb _I, RQ etc.
+        - src  message origin address
+        - dst  message destination address
+        - code packet code aka command class e.g. _0005, _31DA
+        - ctx  message context, created from payload as index + extra markers (Heat)
+        - hdr  packet header e.g. 000C|RP|01:223036|0208 (see: src/ramses_tx/frame.py)
+        """
 
         self._cu.execute(
             """
@@ -120,14 +132,14 @@ class MessageIndex:
     async def _housekeeping_loop(self) -> None:
         """Periodically remove stale messages from the index."""
 
-        def housekeeping(dt_now: dt, _cutoff: td = td(days=1)) -> None:
+        async def housekeeping(dt_now: dt, _cutoff: td = td(days=1)) -> None:
             dtm = (dt_now - _cutoff).isoformat(timespec="microseconds")
 
             self._cu.execute("SELECT dtm FROM messages WHERE dtm => ?", (dtm,))
             rows = self._cu.fetchall()
 
             try:  # make this operation atomic, i.e. update self._msgs only on success
-                # await self._lock.acquire()
+                await self._lock.acquire()
                 self._cu.execute("DELETE FROM messages WHERE dtm < ?", (dtm,))
                 msgs = OrderedDict({row[0]: self._msgs[row[0]] for row in rows})
                 self._cx.commit()
@@ -137,19 +149,19 @@ class MessageIndex:
             else:
                 self._msgs = msgs
             finally:
-                pass  # self._lock.release()
+                self._lock.release()
 
         while True:
             self._last_housekeeping = dt.now()
             await asyncio.sleep(3600)
-            housekeeping(self._last_housekeeping)
+            await housekeeping(self._last_housekeeping)
 
     def add(self, msg: Message) -> Message | None:
         """Add a single message to the index.
 
         Returns any message that was removed because it had the same header.
 
-        Throws a warning is there is a duplicate dtm.
+        Throws a warning if there is a duplicate dtm.
         """  # TODO: eventually, may be better to use SqlAlchemy
 
         dup: tuple[Message, ...] = tuple()  # avoid UnboundLocalError
@@ -204,7 +216,9 @@ class MessageIndex:
 
         return msgs[0] if msgs else None
 
-    def rem(self, msg: Message | None = None, **kwargs: str) -> tuple[Message, ...]:
+    def rem(
+        self, msg: Message | None = None, **kwargs: str
+    ) -> tuple[Message, ...] | None:
         """Remove a set of message(s) from the index.
 
         Returns any messages that were removed.
@@ -215,6 +229,7 @@ class MessageIndex:
         if msg:
             kwargs["dtm"] = msg.dtm.isoformat(timespec="microseconds")
 
+        msgs = None
         try:  # make this operation atomic, i.e. update self._msgs only on success
             # await self._lock.acquire()
             msgs = self._delete_from(**kwargs)
@@ -277,8 +292,8 @@ class MessageIndex:
     def all(self, include_expired: bool = False) -> tuple[Message, ...]:
         """Return all messages from the index."""
 
-        # self.cursor.execute("SELECT * FROM messages")
-        # return [self._megs[row[0]] for row in self.cursor.fetchall()]
+        # self._cu.execute("SELECT * FROM messages")
+        # return tuple(self._msgs[row[0]] for row in self._cu.fetchall())
 
         return tuple(
             m for m in self._msgs.values() if include_expired or not m._expired

ramses_rf/device/base.py

@@ -62,7 +62,7 @@ class DeviceBase(Entity):
 
         # FIXME: ZZZ entities must know their parent device ID and their own idx
         self._z_id = dev_addr.id  # the responsible device is itself
-        self._z_idx = None  # depends upon it's location in the schema
+        self._z_idx = None  # depends upon its location in the schema
 
         self.id: DeviceIdT = dev_addr.id
 
@@ -95,7 +95,7 @@ class DeviceBase(Entity):
 
         if traits.get(SZ_FAKED):  # class & alias are done elsewhere
             if not isinstance(self, Fakeable):
-                raise TypeError(f"Device is not fakable: {self} (traits={traits})")
+                raise TypeError(f"Device is not fakeable: {self} (traits={traits})")
             self._make_fake()
 
         self._scheme = traits.get(SZ_SCHEME)

ramses_rf/device/hvac.py

@@ -449,10 +449,10 @@ class HvacVentilator(FilterChange):  # FAN: RP/31DA, I/31D[9A]
     def fan_info(self) -> str | None:
         """
         Extract fan info description from _31D9 or _31DA message payload, e.g. "speed 2, medium".
-        By its name, the result is automatically displayed in HA Climate UI.
+        By its name, the result is picked up by a sensor in HA Climate UI.
         Some manufacturers (Orcon, Vasco) include the fan mode (auto, manual), others don't (Itho).
 
-        :return: a string describing mode, speed
+        :return: a string describing fan mode, speed
         """
         if Code._31D9 in self._msgs:
             # Itho, Vasco D60 and ClimaRad (MiniBox fan) send mode/speed in _31D9
@@ -466,9 +466,10 @@ class HvacVentilator(FilterChange):  # FAN: RP/31DA, I/31D[9A]
     @property
     def indoor_humidity(self) -> float | None:
         """
-        Extract humidity value from _12A0 or _31DA JSON message payload
+        Extract indoor_humidity from MessageIndex _12A0 or _31DA payload
+        Just a demo for SQLite query helper at the moment.
 
-        :return: percentage <= 1.0
+        :return: float RH value from 0.0 to 1.0 = 100%
         """
         if Code._12A0 in self._msgs and isinstance(
             self._msgs[Code._12A0].payload, list

ramses_rf/dispatcher.py

@@ -268,8 +268,8 @@ def process_msg(gwy: Gateway, msg: Message) -> None:
 
     else:
         logger_xxxx(msg)
-        if gwy._zzz:
-            gwy._zzz.add(msg)
+        if gwy.msg_db:
+            gwy.msg_db.add(msg)
 
 
 # TODO: this needs cleaning up (e.g. handle intervening packet)

ramses_rf/entity_base.py

@@ -190,7 +190,7 @@ class _MessageDB(_Entity):
     def __init__(self, gwy: Gateway) -> None:
         super().__init__(gwy)
 
-        self._msgs_: dict[Code, Message] = {}  # code, should be code/ctx? ?deprecate
+        self._msgs_: dict[Code, Message] = {}  # code, should be code/ctx?
         self._msgz_: dict[
             Code, dict[VerbT, dict[bool | str | None, Message]]
         ] = {}  # code/verb/ctx, should be code/ctx/verb?
@@ -205,19 +205,19 @@ class _MessageDB(_Entity):
         ):
             return  # ZZZ: don't store these
 
+        # Store msg by code in flat self._msgs_ Dict (deprecated since 0.50.3)
         if msg.verb in (I_, RP):
             self._msgs_[msg.code] = msg
 
         if msg.code not in self._msgz_:
+            # Store msg verb + ctx by code in nested self._msgz_ Dict (deprecated)
             self._msgz_[msg.code] = {msg.verb: {msg._pkt._ctx: msg}}
         elif msg.verb not in self._msgz_[msg.code]:
+            # Same, 1 level deeper
             self._msgz_[msg.code][msg.verb] = {msg._pkt._ctx: msg}
-        else:  # if not self._gwy._zzz:
+        else:
+            # Same, replacing previous message
             self._msgz_[msg.code][msg.verb][msg._pkt._ctx] = msg
-        # elif (
-        #     self._msgz[msg.code][msg.verb][msg._pkt._ctx] is not msg
-        # ):  # MsgIdx ensures this
-        #     assert False  # TODO: remove
 
     @property
     def _msg_db(self) -> list[Message]:  # flattened version of _msgz[code][verb][indx]
@@ -228,7 +228,7 @@ class _MessageDB(_Entity):
          - a compound ctx (e.g. 0005/000C/0418)
          - True (an array of elements, each with its own idx),
          - False (no idx, is usu. 00),
-         - None (not deteminable, rare)
+         - None (not determinable, rare)
         """
         return [m for c in self._msgz.values() for v in c.values() for m in v.values()]
 
@@ -239,8 +239,8 @@ class _MessageDB(_Entity):
 
         obj: _MessageDB
 
-        if self._gwy._zzz:
-            self._gwy._zzz.rem(msg)
+        if self._gwy.msg_db:  # central SQLite MessageIndex
+            self._gwy.msg_db.rem(msg)
 
         entities: list[_MessageDB] = []
         if isinstance(msg.src, Device):
@@ -261,8 +261,8 @@ class _MessageDB(_Entity):
     def _get_msg_by_hdr(self, hdr: HeaderT) -> Message | None:
         """Return a msg, if any, that matches a header."""
 
-        # if self._gwy._zzz:
-        #     msgs = self._gwy._zzz.get(hdr=hdr)
+        # if self._gwy.msg_db:  # central SQLite MessageIndex
+        #     msgs = self._gwy.msg_db.get(hdr=hdr)
         #     return msgs[0] if msgs else None
 
         msg: Message
@@ -394,19 +394,29 @@ class _MessageDB(_Entity):
 
     @property
     def _msgs(self) -> dict[Code, Message]:
-        if not self._gwy._zzz:
+        """
+        Get a flat Dict af all I/RP messages logged with this device as src or dst.
+
+        :return: nested Dict of messages by Code
+        """
+        if not self._gwy.msg_db:  # no central SQLite MessageIndex
             return self._msgs_
 
         sql = """
             SELECT dtm from messages WHERE verb in (' I', 'RP') AND (src = ? OR dst = ?)
         """
-        return {  # ? use context instead?
-            m.code: m for m in self._gwy._zzz.qry(sql, (self.id[:9], self.id[:9]))
+        return {  # ? use ctx (context) instead of just the address?
+            m.code: m for m in self._gwy.msg_db.qry(sql, (self.id[:9], self.id[:9]))
         }  # e.g. 01:123456_HW
 
     @property
     def _msgz(self) -> dict[Code, dict[VerbT, dict[bool | str | None, Message]]]:
-        if not self._gwy._zzz:
+        """
+        Get a nested Dict of all I/RP messages logged with this device as src or dst.
+
+        :return: Dict of messages, nested by Code, Verb, Context
+        """
+        if not self._gwy.msg_db:  # no central SQLite MessageIndex
             return self._msgz_
 
         msgs_1: dict[Code, dict[VerbT, dict[bool | str | None, Message]]] = {}
@@ -437,7 +447,7 @@ class _Discovery(_MessageDB):
         self._supported_cmds_ctx: dict[str, bool | None] = {}
 
         if not gwy.config.disable_discovery:
-            # self._start_discovery_poller()  # Can't use derived classes dont exist yet
+            # self._start_discovery_poller()  # Can't use derived classes don't exist yet
             gwy._loop.call_soon(self._start_discovery_poller)
 
     @property  # TODO: needs tidy up
@@ -464,7 +474,7 @@ class _Discovery(_MessageDB):
         def _to_data_id(msg_id: MsgId | str) -> OtDataId:
             return int(msg_id, 16)  # type: ignore[return-value]
 
-        def _to_msg_id(data_id: OtDataId | int) -> MsgId:
+        def _to_msg_id(data_id: OtDataId | int) -> MsgId:  # not used
             return f"{data_id:02X}"  # type: ignore[return-value]
 
         return {
@@ -639,7 +649,7 @@ class _Discovery(_MessageDB):
                 task[_SZ_NEXT_DUE] = msg.dtm + task[_SZ_INTERVAL]
 
             if task[_SZ_NEXT_DUE] > dt_now:
-                continue  # if (most recent) last_msg is is not yet due...
+                continue  # if (most recent) last_msg is not yet due...
 
             # since we may do I/O, check if the code|msg_id is deprecated
             task[_SZ_NEXT_DUE] = dt_now + task[_SZ_INTERVAL]  # might undeprecate later
@@ -733,25 +743,6 @@ class Parent(Entity):  # A System, Zone, DhwZone or a UfhController
         self.child_by_id: dict[str, Child] = {}
         self.childs: list[Child] = []
 
-    # def _handle_msg(self, msg: Message) -> None:
-    #     def eavesdrop_ufh_circuits():
-    #         if msg.code == Code._22C9:
-    #             # .I --- 02:044446 --:------ 02:044446 22C9 024 00-076C0A28-01 01-06720A28-01 02-06A40A28-01 03-06A40A2-801  # NOTE: fragments
-    #             # .I --- 02:044446 --:------ 02:044446 22C9 006 04-07D00A28-01                                               # [{'ufh_idx': '04',...
-    #             circuit_idxs = [c[SZ_UFH_IDX] for c in msg.payload]
-
-    #             for cct_idx in circuit_idxs:
-    #                 self.get_circuit(cct_idx, msg=msg)
-
-    #             # BUG: this will fail with > 4 circuits, as uses two pkts for this msg
-    #             # if [c for c in self.child_by_id if c not in circuit_idxs]:
-    #             #     raise CorruptStateError
-
-    #     super()._handle_msg(msg)
-
-    #     if self._gwy.config.enable_eavesdrop:
-    #         eavesdrop_ufh_circuits()
-
     @property
     def zone_idx(self) -> str:
         """Return the domain id.

ramses_rf/gateway.py

@@ -129,7 +129,7 @@ class Gateway(Engine):
         self.devices: list[Device] = []
         self.device_by_id: dict[DeviceIdT, Device] = {}
 
-        self._zzz: MessageIndex | None = None  # MessageIndex()
+        self.msg_db: MessageIndex | None = None  # MessageIndex()
 
     def __repr__(self) -> str:
         if not self.ser_name:
@@ -196,8 +196,8 @@ class Gateway(Engine):
     async def stop(self) -> None:
         """Stop the Gateway and tidy up."""
 
-        if self._zzz:
-            self._zzz.stop()
+        if self.msg_db:
+            self.msg_db.stop()
         await super().stop()
 
     def _pause(self, *args: Any) -> None:
@@ -255,10 +255,10 @@ class Gateway(Engine):
             msgs.extend([m for z in system.zones for m in z._msgs.values()])
             # msgs.extend([m for z in system.dhw for m in z._msgs.values()])  # TODO
 
-        if self._zzz:
+        if self.msg_db:
             pkts = {
                 f"{repr(msg._pkt)[:26]}": f"{repr(msg._pkt)[27:]}"
-                for msg in self._zzz.all(include_expired=True)
+                for msg in self.msg_db.all(include_expired=True)
                 if wanted_msg(msg, include_expired=include_expired)
             }
 
@@ -405,7 +405,7 @@ class Gateway(Engine):
                     _LOGGER.warning(f"The device is not fakeable: {dev}")
 
         # TODO: the exact order of the following may need refining...
-        # TODO: some will be done my devices themselves?
+        # TODO: some will be done by devices themselves?
 
         # if schema:  # Step 2: Only controllers have a schema...
         #     dev._update_schema(**schema)  # TODO: schema/traits
@@ -422,7 +422,7 @@ class Gateway(Engine):
         self,
         device_id: DeviceIdT,
         create_device: bool = False,
-    ) -> Device:
+    ) -> Device | Fakeable:
         """Create a faked device."""
 
         if not is_valid_dev_id(device_id):
@@ -437,7 +437,7 @@ class Gateway(Engine):
             dev._make_fake()
             return dev
 
-        raise TypeError(f"The device is not fakable: {device_id}")
+        raise TypeError(f"The device is not fakeable: {device_id}")
 
     @property
     def tcs(self) -> Evohome | None:
@@ -547,14 +547,6 @@ class Gateway(Engine):
 
     def _msg_handler(self, msg: Message) -> None:
         """A callback to handle messages from the protocol stack."""
-        # TODO: Remove this
-        # # HACK: if CLI, double-logging with client.py proc_msg() & setLevel(DEBUG)
-        # if (log_level := _LOGGER.getEffectiveLevel()) < logging.INFO:
-        #     _LOGGER.info(msg)
-        # elif log_level <= logging.INFO and not (
-        #     msg.verb == RQ and msg.src.type == DEV_TYPE_MAP.HGI
-        # ):
-        #     _LOGGER.info(msg)
 
         super()._msg_handler(msg)
 

ramses_rf/helpers.py

@@ -67,7 +67,7 @@ def shrink(
     """Return a minimized dict, after removing all the meaningless items.
 
     Specifically, removes items with:
-    - uwanted keys (starting with '_')
+    - unwanted keys (starting with '_')
     - falsey values
     """
 

ramses_rf/system/zones.py

@@ -699,8 +699,10 @@ class Zone(ZoneSchedule):
     def name(self) -> str | None:  # 0004
         """Return the name of the zone."""
 
-        if self._gwy._zzz:
-            msgs = self._gwy._zzz.get(code=Code._0004, src=self._z_id, ctx=self._z_idx)
+        if self._gwy.msg_db:
+            msgs = self._gwy.msg_db.get(
+                code=Code._0004, src=self._z_id, ctx=self._z_idx
+            )
             return msgs[0].payload.get(SZ_NAME) if msgs else None
 
         return self._msg_value(Code._0004, key=SZ_NAME)  # type: ignore[no-any-return]

ramses_rf/version.py

@@ -1,4 +1,4 @@
 """RAMSES RF - a RAMSES-II protocol decoder & analyser (application layer)."""
 
-__version__ = "0.51.5"
+__version__ = "0.51.7"
 VERSION = __version__

{ramses_rf-0.51.5.dist-info → ramses_rf-0.51.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ramses_rf
-Version: 0.51.5
+Version: 0.51.7
 Summary: A stateful RAMSES-II protocol decoder & analyser.
 Project-URL: Homepage, https://github.com/ramses-rf/ramses_rf
 Project-URL: Bug Tracker, https://github.com/ramses-rf/ramses_rf/issues
@@ -67,6 +67,6 @@ pip install -e .
 
 The CLI is called ``client.py`` and is included in the code root.
 It has options to monitor and parse Ramses-II traffic to screen or a log file, and to parse a file containing Ramses-II messages to the screen.
-See the [client.py CLI wiki page](https://github.com/ramses-rf/ramses_rf/wiki/The-client.py-command-line) for instructions.
+See the [client.py CLI wiki page](https://github.com/ramses-rf/ramses_rf/wiki/2.-The-client.py-command-line) for instructions.
 
 For code development, some more setup is required. Please follow the steps in our [Developer's Resource](README-developers.md)

{ramses_rf-0.51.5.dist-info → ramses_rf-0.51.7.dist-info}/RECORD

@@ -1,5 +1,5 @@
 ramses_cli/__init__.py,sha256=uvGzWqOf4avvgzxJNSLFWEelIWqSZ-AeLAZzg5x58bc,397
-ramses_cli/client.py,sha256=QOmPKjCQHHOZwLBWEB438zabI9k38-ELRwisLvbvxSU,19782
+ramses_cli/client.py,sha256=vbKS3KVPiGsDWLp5cR3SVBtXrs-TinzlxSbTgcb4G2k,19724
 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
@@ -7,49 +7,49 @@ ramses_cli/utils/convert.py,sha256=D_YiCyX5na9pgC-_NhBlW9N1dgRKUK-uLtLBfofjzZM,1
 ramses_rf/__init__.py,sha256=zONFBiRdf07cPTSxzr2V3t-b3CGokZjT9SGit4JUKRA,1055
 ramses_rf/binding_fsm.py,sha256=uZAOl3i19KCXqqlaLJWkEqMMP7NJBhVPW3xTikQD1fY,25996
 ramses_rf/const.py,sha256=L3z31CZ-xqno6oZp_h-67CB_5tDDqTwSWXsqRtsjMcs,5460
-ramses_rf/database.py,sha256=6k5MLtK5Lplz8THfluQoQU-eniUkqSwEUMvVW7VyGhI,9880
-ramses_rf/dispatcher.py,sha256=L-XQ-mbE3HyyxExkhe5kfD4elKlGZnV0kHT4OHTWzE8,11197
-ramses_rf/entity_base.py,sha256=EaIyGIu3fU1Ks30jdqS69nYmcWRKXaWx81oBGDiaXGw,39602
+ramses_rf/database.py,sha256=ZZZgucyuU1IHsSewGukZfDg2gu8KeNaEFriWKM0TUHs,10287
+ramses_rf/dispatcher.py,sha256=JGkqSi1o-YhQ2rj8tNkXwYLLeJIC7F061xpHoH8sSsM,11201
+ramses_rf/entity_base.py,sha256=V9m_Q5SOLP5ko3sok0NDvyz3YdYch1QsxM6tHCIE7cA,39212
 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/gateway.py,sha256=WdIIGgs87CYfXwSCSVb2YzqOgLC7W4bkpulWQb7PFNw,20564
+ramses_rf/helpers.py,sha256=TNk_QkpIOB3alOp1sqnA9LOzi4fuDCeapNlW3zTzNas,4250
 ramses_rf/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ramses_rf/schemas.py,sha256=mYOUZOH5OIDNBxRM2vd8POzDWEEmLhxh5UtqjTpFNek,13287
-ramses_rf/version.py,sha256=2CNEExhYqbwGxmDWyifsA3RubG0bCgN6a1NUTKnIfBM,125
+ramses_rf/version.py,sha256=4EfbWfYC4nSL7JCP_xnhFTpV6Yt5Vc4kNosAUW-CKNs,125
 ramses_rf/device/__init__.py,sha256=sUbH5dhbYFXSoM_TPFRutpRutBRpup7_cQ9smPtDTy8,4858
-ramses_rf/device/base.py,sha256=V2YzRhdxrTqfHYrCBq6pJsYdTgAx8gGzfdo8pkbeEo8,17450
+ramses_rf/device/base.py,sha256=WGkBTUNjRUEe-phxdtdiXVCZnTi6-i1i_YT6g689UTM,17450
 ramses_rf/device/heat.py,sha256=2sCsggySVcuTzyXDmgWy76QbhlU5MQWSejy3zgI5BDE,54242
-ramses_rf/device/hvac.py,sha256=fRzFGQD6zrkii0Ns9EV1uqh8MTXHn2CO3LZ1WOXLjhs,23835
+ramses_rf/device/hvac.py,sha256=H_PUfG_jrrvJgtnu6Bco6PLxHn7CHALwebZzZI1ygFo,23917
 ramses_rf/system/__init__.py,sha256=uZLKio3gLlBzePa2aDQ1nxkcp1YXOGrn6iHTG8LiNIw,711
 ramses_rf/system/faultlog.py,sha256=GdGmVGT3137KsTlV_nhccgIFEmYu6DFsLTn4S-8JSok,12799
 ramses_rf/system/heat.py,sha256=3jaFEChU-HlWCRMY1y7u09s7AH4hT0pC63hnqwdmZOc,39223
 ramses_rf/system/schedule.py,sha256=Ts6tdZPTQLV5NkgwA73tPa5QUsnZNIIuYoKC-8VsXDk,18808
-ramses_rf/system/zones.py,sha256=2_c1YHrGbObUeEqjcqJDO08Fo2Mr1aYn4VorNmfFaKk,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=ILZvbIp9qI2ZTmGDDJ0YFoxOH3GtQ7g9MT3vAUtHWAE,30291
+ramses_rf/system/zones.py,sha256=9AH7ooN5QfiqvWuor2P1Dn8aILjQb2RWL9rWqDH1IjA,36075
+ramses_tx/__init__.py,sha256=4FsVOzICJ4H80LJ0MknZCN0_V-g0k1nMkHUQ0IdrJW8,3161
+ramses_tx/address.py,sha256=5swDr_SvOs1CxBmT-iJpldf8R00mOb7gKPMiEnxLz84,8452
+ramses_tx/command.py,sha256=y69y9NYgQHuPbm7h6xC0osf3e1YIKY9jwmsfPiJ8N6U,58348
+ramses_tx/const.py,sha256=QmwSS4BIN3ZFrLUiiFScP1RCUHuJ782V3ycRPQTtB_c,30297
 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=qDJTsTU2tfSZrfJuFi1q29efkkHzqRtg85M6ItQH6qA,32247
-ramses_tx/logger.py,sha256=7vUpcfOFMW95juMWDx5dhUOqV8DTsindZ-Qz2aCmEoA,11073
-ramses_tx/message.py,sha256=J1wvVkLPJQr2ffKCUQYSWwLPzRTZBC0zUU5W9DkN3hU,13190
+ramses_tx/gateway.py,sha256=TXLYwT6tFpmSokD29Qyj1ze7UGCxKidooeyP557Jfoo,11266
+ramses_tx/helpers.py,sha256=0VAJ505kpq4K9b9ZeskWI1o2sWwyCbdnKOKZviKFdgY,32913
+ramses_tx/logger.py,sha256=qYbUoNPnPaFWKVsYvLG6uTVuPTdZ8HsMzBbGx0DpBqc,10177
+ramses_tx/message.py,sha256=hl_gLfwrF79ftUNnsgNt3XGsIhM2Pts0MtZZuGjfaxk,13169
 ramses_tx/opentherm.py,sha256=58PXz9l5x8Ou6Fm3y-R_UnGHCYahoi2RKIDdYStUMzk,42378
 ramses_tx/packet.py,sha256=NGunaGCkEjhTp9t4mARK5e7kbqT-Z_JKCH7ibMYMJXU,7357
-ramses_tx/parsers.py,sha256=uwu_HsMjpsSyMYzoBpVnAxu2pqBJiQDL5ls8_B60V7c,109708
+ramses_tx/parsers.py,sha256=PVTbPqcYPUko3BKDaOQoFDwIo4LWAUx5kfRb2KURAMI,109917
 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/ramses.py,sha256=9R-JrInORWUNMPklrAPQWwtr_2aaruQmFqQPw5mFkrE,52223
 ramses_tx/schemas.py,sha256=h2AcArVROy1_C4n6F0Crj4e-2BxXxH74xogFlc6nKHI,12769
-ramses_tx/transport.py,sha256=aLpULRSivoJqzH8GDPRDcbehETOhFflEqmHbaniGLvg,56210
-ramses_tx/typed_dicts.py,sha256=4ZT50M-Cuwy2ljAIorwoxEJ9c737xUHrUxX9wTh79xE,10834
+ramses_tx/transport.py,sha256=MwPnkQ0L-2qJt4mIJy3-C9XmHwBDjT7Kg-1LthPByVw,58331
+ramses_tx/typed_dicts.py,sha256=w-0V5t2Q3GiNUOrRAWiW9GtSwbta_7luME6GfIb1zhI,10869
 ramses_tx/typing.py,sha256=eF2SlPWhNhEFQj6WX2AhTXiyRQVXYnFutiepllYl2rI,5042
-ramses_tx/version.py,sha256=uQWGeAYKPd3vO8uf3sjQlNE_kdbcsQl2FfC3y2J7NJg,123
-ramses_rf-0.51.5.dist-info/METADATA,sha256=5qyM_GCuZGD5rzMMGOjQUfNR4NJAd5TOQwIrBnoSEmY,3906
-ramses_rf-0.51.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ramses_rf-0.51.5.dist-info/entry_points.txt,sha256=NnyK29baOCNg8DinPYiZ368h7MTH7bgTW26z2A1NeIE,50
-ramses_rf-0.51.5.dist-info/licenses/LICENSE,sha256=-Kc35W7l1UkdiQ4314_yVWv7vDDrg7IrJfMLUiq6Nfs,1074
-ramses_rf-0.51.5.dist-info/RECORD,,
+ramses_tx/version.py,sha256=hWp2I2S7p1_tlItYBqDNAFpsM7kL_J8xYU-6mC2e_Ws,123
+ramses_rf-0.51.7.dist-info/METADATA,sha256=w3QiOIRJncgPc3R3h1MaxjMDOjzm0NYBHFEoeAr6o6A,3909
+ramses_rf-0.51.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ramses_rf-0.51.7.dist-info/entry_points.txt,sha256=NnyK29baOCNg8DinPYiZ368h7MTH7bgTW26z2A1NeIE,50
+ramses_rf-0.51.7.dist-info/licenses/LICENSE,sha256=-Kc35W7l1UkdiQ4314_yVWv7vDDrg7IrJfMLUiq6Nfs,1074
+ramses_rf-0.51.7.dist-info/RECORD,,

ramses_tx/__init__.py

@@ -138,7 +138,7 @@ if TYPE_CHECKING:
 async def set_pkt_logging_config(**config: Any) -> Logger:
     """
     Set up ramses packet logging to a file or port.
-    Must runs async in executor to prevent HA blocking call opening packet log file (issue #200)
+    Must run async in executor to prevent HA blocking call opening packet log file (issue #200)
 
     :param config: if file_name is included, opens packet_log file
     :return: a logging.Logger

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

@@ -442,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

@@ -470,7 +470,7 @@ def parse_valve_demand(
     if int(value, 16) & 0xF0 == 0xF0:
         return _faulted_device(SZ_HEAT_DEMAND, value)
 
-    result = int(value, 16) / 200  # c.f. hex_to_percentage
+    result = int(value, 16) / 200  # c.f. hex_to_percent
     if result == 1.01:  # HACK - does it mean maximum?
         result = 1.0
     elif result > 1.0:
@@ -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).
@@ -593,12 +606,9 @@ def _parse_hvac_humidity(
     if int(value, 16) & 0xF0 == 0xF0:
         return _faulted_sensor(param_name, value)
 
-    percentage = int(value, 16) / 100  # TODO: confirm not 200
-    assert percentage <= 1.0, value  # TODO: raise exception if > 1.0?
+    percentage = hex_to_percent(value, False)  # TODO: confirm not /200
 
-    result: dict[str, float | str | None] = {
-        param_name: percentage
-    }  # was: percent_from_hex(value, high_res=False)
+    result: dict[str, float | str | None] = {param_name: percentage}
     if temp:
         result |= {SZ_TEMPERATURE: hex_to_temp(temp)}
     if dewpoint:
@@ -657,6 +667,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 +702,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 +711,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,6 +778,21 @@ def parse_fan_info(value: HexStr2) -> PayDictT.FAN_INFO:
     }
 
 
+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)."""
@@ -842,7 +878,7 @@ def _parse_fan_heater(param_name: str, value: HexStr2) -> Mapping[str, float | N
     if int(value, 16) & 0xF0 == 0xF0:
         return _faulted_sensor(param_name, value)  # type: ignore[return-value]
 
-    percentage = int(value, 16) / 200  # Siber DF EVO 2 is /200, not /100 (?Others)
+    percentage = int(value, 16) / 200  # Siber DF EVO 2 is /200, not /100 (Others?)
     assert percentage <= 1.0, value  # TODO: raise exception if > 1.0?
 
     return {param_name: percentage}  # was: percent_from_hex(value, high_res=False)

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,29 +173,6 @@ 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
-
 
 def getLogger(  # permits a bespoke Logger class
     name: str | None = None, pkt_log: bool = False

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

@@ -1648,21 +1648,17 @@ def parser_22f3(payload: str, msg: Message) -> dict[str, Any]:
         _LOGGER.warning(f"{msg!r} < {_INFORM_DEV_MSG} ({err})")
 
     new_speed = {  # from now, until timer expiry
-        0x00: "fan_boost",  # #    set fan off, or 'boost' mode?
-        0x01: "per_request",  # #  set fan as per payload[6:10]?
-        0x02: "per_vent_speed",  # set fan as per current fan mode/speed?
+        0x00: "fan_boost",  # set fan off, or 'boost' mode?
+        0x01: "per_request?",  # set fan as per payload[6:10]?
+        0x02: "per_request",  # set fan as per payload[6:10]
     }.get(int(payload[2:4], 0x10) & 0x07)  # 0b0000-0111
 
-    fallback_speed: str | None
-    if msg.len == 7 and payload[9:10] == "06":  # Vasco and ClimaRad REM
-        fallback_speed = "per_vent_speed"  # after timer expiry
-        # set fan as per current fan mode/speed
-    else:
-        fallback_speed = {  # after timer expiry
-            0x08: "fan_off",  # #      set fan off?
-            0x10: "per_request",  # #  set fan as per payload[6:10], or payload[10:]?
-            0x18: "per_vent_speed",  # set fan as per current fan mode/speed?
-        }.get(int(payload[2:4], 0x10) & 0x38)  # 0b0011-1000
+    fallback_speed = {  # after timer expiry
+        0x00: "per_vent_speed",  # set fan as per current fan mode
+        0x08: "fan_off",  # set fan off?
+        0x10: "per_request",  # set fan as per payload[10:14]
+        0x18: "per_vent_speed?",  # set fan as per current fan mode/speed?
+    }.get(int(payload[2:4], 0x10) & 0x38)  # 0b0011-1000
 
     units = {
         0x00: "minutes",
@@ -1677,15 +1673,21 @@ def parser_22f3(payload: str, msg: Message) -> dict[str, Any]:
         result = {
             "minutes" if units != "index" else "index": duration,
             "flags": hex_to_flag8(payload[2:4]),
-            "_new_speed_mode": new_speed,
-            "_fallback_speed_mode": fallback_speed,
+            "new_speed_mode": new_speed,
+            "fallback_speed_mode": fallback_speed,
         }
 
-    if msg.len >= 5 and payload[6:10] != "0000":  # new speed?
-        result["rate"] = parser_22f1(f"00{payload[6:10]}", msg).get("rate")
+    if msg._addrs[0] == NON_DEV_ADDR and msg.len <= 3:
+        result["_scheme"] = "itho"
+
+    if msg.len >= 5 and payload[6:10] != "0000":  # new speed
+        mode_info = parser_22f1(f"00{payload[6:10]}", msg)
+        result["_scheme"] = mode_info.get("_scheme")
+        result["fan_mode"] = mode_info.get("fan_mode")
 
-    if msg.len >= 7:  # fallback speed?
-        result.update({"_unknown_5": payload[10:]})
+    if msg.len >= 7 and payload[10:14] != "0000":  # fallback speed
+        mode_info = parser_22f1(f"00{payload[10:14]}", msg)
+        result["fallback_fan_mode"] = mode_info.get("fan_mode")
 
     return result
 
@@ -2220,10 +2222,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?
@@ -2241,6 +2242,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

@@ -1033,6 +1033,8 @@ class MqttTransport(_FullTransport, _MqttTransportAbstractor):
         self._topic_base = validate_topic_path(self._broker_url.path)
         self._topic_pub = ""
         self._topic_sub = ""
+        # Track if we've subscribed to a wildcard data topic (e.g. ".../+/rx")
+        self._data_wildcard_topic = ""
 
         self._mqtt_qos = int(parse_qs(self._broker_url.query).get("qos", ["0"])[0])
 
@@ -1143,17 +1145,30 @@ class MqttTransport(_FullTransport, _MqttTransportAbstractor):
         # Subscribe to base topic to see 'online' messages
         self.client.subscribe(self._topic_base)  # hope to see 'online' message
 
-        # Also subscribe to data topics with wildcard for reliability after reconnect
-        # This ensures we get data even if we miss the 'online' message
-        if self._topic_base.endswith("/+"):
+        # Also subscribe to data topics with wildcard for reliability, but only
+        # until a specific device topic is known. Once _topic_sub is set, avoid
+        # overlapping subscriptions that would duplicate messages.
+        if self._topic_base.endswith("/+") and not (
+            hasattr(self, "_topic_sub") and self._topic_sub
+        ):
             data_wildcard = self._topic_base.replace("/+", "/+/rx")
             self.client.subscribe(data_wildcard, qos=self._mqtt_qos)
+            self._data_wildcard_topic = data_wildcard
             _LOGGER.debug(f"Subscribed to data wildcard: {data_wildcard}")
 
         # If we already have specific topics, re-subscribe to them
         if hasattr(self, "_topic_sub") and self._topic_sub:
             self.client.subscribe(self._topic_sub, qos=self._mqtt_qos)
             _LOGGER.debug(f"Re-subscribed to specific topic: {self._topic_sub}")
+            # If we had a wildcard subscription, drop it to prevent duplicates
+            if getattr(self, "_data_wildcard_topic", ""):
+                try:
+                    self.client.unsubscribe(self._data_wildcard_topic)
+                    _LOGGER.debug(
+                        f"Unsubscribed data wildcard after specific subscribe: {self._data_wildcard_topic}"
+                    )
+                finally:
+                    self._data_wildcard_topic = ""
 
     def _on_connect_fail(
         self,
@@ -1225,6 +1240,17 @@ class MqttTransport(_FullTransport, _MqttTransportAbstractor):
 
         self.client.subscribe(self._topic_sub, qos=self._mqtt_qos)
 
+        # If we previously subscribed to a wildcard data topic, unsubscribe now
+        # to avoid duplicate delivery (wildcard and specific both matching)
+        if getattr(self, "_data_wildcard_topic", ""):
+            try:
+                self.client.unsubscribe(self._data_wildcard_topic)
+                _LOGGER.debug(
+                    f"Unsubscribed data wildcard after device online: {self._data_wildcard_topic}"
+                )
+            finally:
+                self._data_wildcard_topic = ""
+
         # Only call connection_made on first connection, not reconnections
         if not self._connection_established:
             self._connection_established = True
@@ -1295,6 +1321,21 @@ class MqttTransport(_FullTransport, _MqttTransportAbstractor):
                 self._connection_established = True
                 self._make_connection(gwy_id=gateway_id)  # type: ignore[arg-type]
 
+                # Ensure we subscribe specifically to the device topic and drop the
+                # wildcard subscription to prevent duplicates
+                try:
+                    self.client.subscribe(self._topic_sub, qos=self._mqtt_qos)
+                except Exception as err:  # pragma: no cover - defensive
+                    _LOGGER.debug(f"Error subscribing specific topic: {err}")
+                if getattr(self, "_data_wildcard_topic", ""):
+                    try:
+                        self.client.unsubscribe(self._data_wildcard_topic)
+                        _LOGGER.debug(
+                            f"Unsubscribed data wildcard after inferring device: {self._data_wildcard_topic}"
+                        )
+                    finally:
+                        self._data_wildcard_topic = ""
+
         try:
             payload = json.loads(msg.payload)
         except json.JSONDecodeError:

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.5"
+__version__ = "0.51.7"
 VERSION = __version__