ramses-rf 0.52.3__py3-none-any.whl → 0.52.4__py3-none-any.whl

ramses_rf/database.py

@@ -130,11 +130,15 @@ class MessageIndex:
     def stop(self) -> None:
         """Stop the housekeeper loop."""
 
-        if self._housekeeping_task and (not self._housekeeping_task.done()):
+        if (
+            self.maintain
+            and self._housekeeping_task
+            and (not self._housekeeping_task.done())
+        ):
             self._housekeeping_task.cancel()  # stop the housekeeper
 
         self._cx.commit()  # just in case
-        # self._cx.close()  # may still need to do queries after engine has stopped?
+        self._cx.close()  # may still need to do queries after engine has stopped?
 
     @property
     def msgs(self) -> MsgDdT:
@@ -193,7 +197,7 @@ class MessageIndex:
             """
             dtm = dt_now - _cutoff  # .isoformat(timespec="microseconds") < needed?
 
-            self._cu.execute("SELECT dtm FROM messages WHERE dtm => ?", (dtm,))
+            self._cu.execute("SELECT dtm FROM messages WHERE dtm >= ?", (dtm,))
             rows = self._cu.fetchall()  # fetch dtm of current messages to retain
 
             try:  # make this operation atomic, i.e. update self._msgs only on success

ramses_rf/device/heat.py

@@ -450,7 +450,7 @@ class UfhController(Parent, DeviceHeat):  # UFC (02):
                 #     )
                 #     self._send_cmd(cmd)
 
-        elif msg.code == Code._0008:  # relay_demand, TODO: use msgIndex DB?
+        elif msg.code == Code._0008:  # relay_demand
             if msg.payload.get(SZ_DOMAIN_ID) == FC:
                 self._relay_demand = msg
             else:  # FA

ramses_rf/entity_base.py

@@ -224,7 +224,10 @@ class _MessageDB(_Entity):
 
         # As of 0.52.1 we use SQLite MessageIndex, see ramses_rf/database.py
         # _msgz_ (nested) was only used in this module. Note:
-        # _msgz (now rebuilt from _msgs) also used in: client, base, device.heat
+        # _msgz (now rebuilt from _msgs) is also used in:
+        #   - client.py: for code in device._msgz.values()
+        #   - base.py: Code._1060 in self._msgz
+        #   [x] device.heat (no longer used)
 
     def _handle_msg(self, msg: Message) -> None:
         """Store a msg in the DBs.
@@ -244,14 +247,14 @@ class _MessageDB(_Entity):
 
         if self._gwy.msg_db:  # central SQLite MessageIndex
             _LOGGER.debug(
-                "For %s (z_id %s) add msg %s, src %s, dst %s to msg_db.",
+                "For %s (_z_id %s) add msg %s, src %s, dst %s to msg_db.",
                 self.id,
                 self._z_id,
                 msg,
                 msg.src,
                 msg.dst,
             )
-            debug_code: Code = Code._3150
+            debug_code: Code = Code._3150  # for debugging only log these, pick your own
             if msg.code == debug_code and msg.src.id.startswith("01:"):
                 _LOGGER.debug(
                     "Added msg from %s with code %s to _gwy.msg_db. hdr=%s",
@@ -293,6 +296,7 @@ class _MessageDB(_Entity):
     def _msg_list(self) -> list[Message]:
         """Return a flattened list of all messages logged on this device."""
         # (only) used in gateway.py#get_state() and in tests/tests/test_eavesdrop_schema.py
+        # TODO remove _msg_list Q1 2026
         if self._gwy.msg_db:
             msg_list_qry: list[Message] = []
             code_list = self._msg_dev_qry()
@@ -303,16 +307,21 @@ class _MessageDB(_Entity):
                         msg_list_qry.append(self._msgs[c])
                     else:
                         # evohome has these errors
-                        # _msg_list could not fetch self._msgs[7FFF] for 18:072981 (z_id 18:072981)
+                        # _msg_list could not fetch self._msgs[7FFF] for 18:072981 (_z_id 18:072981)
                         _LOGGER.debug(
-                            "_msg_list could not fetch self._msgs[%s] for %s (z_id %s)",
+                            "_msg_list could not fetch self._msgs[%s] for %s (_z_id %s)",
                             c,
                             self.id,
                             self._z_id,
                         )
             return msg_list_qry
         # else create from legacy nested dict
-        return [m for c in self._msgz.values() for v in c.values() for m in v.values()]
+        return [
+            msg
+            for code in self._msgz.values()
+            for ctx in code.values()
+            for msg in ctx.values()
+        ]
 
     def _add_record(
         self, address: Address, code: Code | None = None, verb: str = " I"
@@ -424,7 +433,7 @@ class _MessageDB(_Entity):
         **kwargs: Any,
     ) -> dict | list | None:
         """
-        Query the message dict or the SQLite index for the most recent
+        Query the _msgz message dict or the SQLite MessageIndex for the most recent
         key: value pairs(s) for a given code.
 
         :param code: filter messages by Code or a tuple of Codes, optional
@@ -517,7 +526,7 @@ class _MessageDB(_Entity):
             or (idx == SZ_DOMAIN_ID)
         ), (
             f"full dict:{msg_dict}, payload:{msg.payload} < Coding error: key='{idx}', val='{val}'"
-        )  # should not be there (TODO(eb): BUG but occurs when using SQLite MessageIndex)
+        )  # should not be there
 
         if (
             key == "*" or not key
@@ -535,21 +544,35 @@ class _MessageDB(_Entity):
         """
         Retrieve from the MessageIndex a list of Code keys involving this device.
 
-        :return: list of Codes or empty list when query returned empty
+        :return: list of Codes or an empty list when the query returned empty
         """
 
         if self._gwy.msg_db:
             # SQLite query on MessageIndex
             res: list[Code] = []
-            if self.id[_ID_SLICE:] == "_HW":
+
+            if len(self.id) == 9:
+                # fetch a ctl's message codes (add all its children?)
+                sql = """
+                    SELECT code from messages WHERE
+                    verb in (' I', 'RP')
+                    AND (src = ? OR dst = ?)
+                    AND ctx LIKE ?
+                """
+                _ctx_qry = "%"
+
+            elif self.id[_ID_SLICE:] == "_HW":
+                # fetch a DHW entity's message codes
                 sql = """
                     SELECT code from messages WHERE
                     verb in (' I', 'RP')
                     AND (src = ? OR dst = ?)
                     AND (ctx IN ('FC', 'FA', 'F9', 'FA') OR plk LIKE ?)
                 """
-                _ctx_qry = "%dhw_idx%"  # syntax error ?
+                _ctx_qry = "%dhw_idx%"
+
             else:
+                # fetch a zone's message codes
                 sql = """
                     SELECT code from messages WHERE
                     verb in (' I', 'RP')
@@ -562,12 +585,12 @@ class _MessageDB(_Entity):
                 sql, (self.id[:_ID_SLICE], self.id[:_ID_SLICE], _ctx_qry)
             ):
                 _LOGGER.debug(
-                    "Fetched from index: %s for %s (z_id %s)",
+                    "Fetched from index: %s for %s (_z_id %s)",
                     rec[0],
                     self.id,
                     self._z_id,
                 )
-                # Example: "Fetched from index: code 1FD4 for 01:123456 (z_id 01)"
+                # Example: "Fetched from index: code 1FD4 for 01:123456 (_z_id 01)"
                 res.append(Code(str(rec[0])))
             return res
         else:
@@ -743,7 +766,18 @@ class _MessageDB(_Entity):
         # for r in results:
         #     print(r)
 
-        if self.id[_ID_SLICE:] == "_HW":
+        if len(self.id) == 9:
+            # fetch a ctl's message dtms (add all its children?)
+            sql = """
+                SELECT dtm from messages WHERE
+                verb in (' I', 'RP')
+                AND (src = ? OR dst = ?)
+                AND ctx LIKE ?
+            """
+            _ctx_qry = "%"
+
+        elif self.id[_ID_SLICE:] == "_HW":
+            # fetch a DHW entity's message dtms
             sql = """
                 SELECT dtm from messages WHERE
                 verb in (' I', 'RP')
@@ -753,6 +787,7 @@ class _MessageDB(_Entity):
             _ctx_qry = "%dhw_idx%"
             # TODO add Children messages? self.ctl.dhw
         else:
+            # fetch a zone's message dtms
             sql = """
                 SELECT dtm from messages WHERE
                 verb in (' I', 'RP')
@@ -769,14 +804,14 @@ class _MessageDB(_Entity):
         }
         # if CTL, remove 3150, 3220 heat_demand, both are only stored on children
         # HACK
-        if self.id[:3] == "01:" and self._SLUG == "CTL":
-            # with next ON: 2 errors , both 1x UFC, 1x CTR
-            # with next OFF: 4 errors, all CTR
-            # if Code._3150 in _msg_dict:  # Note: CTL can send a 3150 (see heat_ufc_00)
-            #     _msg_dict.pop(Code._3150)  # keep, prefer to have 2 extra instead of missing 1
-            if Code._3220 in _msg_dict:
-                _msg_dict.pop(Code._3220)
-            # _LOGGER.debug(f"Removed 3150/3220 from %s._msgs dict", self.id)
+        # if self.id[:3] == "01:" and self._SLUG == "CTL":
+        # with next ON: 2 errors , both 1x UFC, 1x CTR
+        # with next OFF: 4 errors, all CTR
+        # if Code._3150 in _msg_dict:  # Note: CTL can send a 3150 (see heat_ufc_00)
+        #     _msg_dict.pop(Code._3150)  # keep, prefer to have 2 extra instead of missing 1
+        # if Code._3220 in _msg_dict:
+        #     _msg_dict.pop(Code._3220)
+        # _LOGGER.debug(f"Removed 3150/3220 from %s._msgs dict", self.id)
         return _msg_dict
 
     @property
@@ -862,7 +897,6 @@ class _Discovery(_MessageDB):
         #     return f"{data_id:02X}"  # type: ignore[return-value]
 
         res: list[str] = []
-        # look for the "sim" OT 3220 record initially added in OtbGateway.init
         if self._gwy.msg_db:
             # SQLite query for ctx field on MessageIndex
             sql = """
@@ -995,18 +1029,24 @@ class _Discovery(_MessageDB):
                         sql = """
                             SELECT dtm from messages WHERE
                             code = ?
-                            verb = ' I'
+                            AND verb = ' I'
                             AND ctx = 'True'
                             AND (src = ? OR dst = ?)
                         """
-                        msgs += self._gwy.msg_db.qry(
+                        res = self._gwy.msg_db.qry(
                             sql,
                             (
                                 task[_SZ_COMMAND].code,
                                 self.tcs.id[:_ID_SLICE],
                                 self.tcs.id[:_ID_SLICE],
                             ),
-                        )[0]  # expect 1 Message in returned tuple
+                        )
+                        if len(res) > 0:
+                            msgs += res[0]  # expect 1 Message in returned tuple
+                        else:
+                            _LOGGER.debug(
+                                f"No msg found for hdr {hdr}, tesk code {task[_SZ_COMMAND].code}"
+                            )
                     else:  # TODO(eb) remove next Q1 2026
                         msgs += [self.tcs._msgz[task[_SZ_COMMAND].code][I_][True]]
                         # raise NotImplementedError
@@ -1145,6 +1185,7 @@ class Parent(Entity):  # A System, Zone, DhwZone or a UfhController
     (incl. the DHW Zone), and also any UFH controllers.
 
     For a heating Zone, children are limited to a sensor, and a number of actuators.
+
     For the DHW Zone, the children are limited to a sensor, a DHW valve, and/or a
     heating valve.
 

ramses_rf/gateway.py

@@ -258,14 +258,6 @@ class Gateway(Engine):
             #     return True
             return include_expired or not msg._expired
 
-        msgs = [m for device in self.devices for m in device._msg_list]
-
-        for system in self.systems:
-            msgs.extend(list(system._msgs.values()))
-            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: DHW
-            # Related to/Fixes ramses_cc Issue 249 non-existing via-device _HW ?
-
         if self.msg_db:
             pkts = {
                 f"{repr(msg._pkt)[:26]}": f"{repr(msg._pkt)[27:]}"
@@ -273,12 +265,20 @@ class Gateway(Engine):
                 if wanted_msg(msg, include_expired=include_expired)
             }
         else:  # deprecated, to be removed in Q1 2026
-            # _LOGGER.warning("Missing MessageIndex")
+            msgs = [m for device in self.devices for m in device._msg_list]
+            # add systems._msgs and zones._msgs
+            for system in self.systems:
+                msgs.extend(list(system._msgs.values()))
+                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: DHW
+                # Related to/Fixes ramses_cc Issue 249 non-existing via-device _HW ?
+
             pkts = {  # BUG: assumes pkts have unique dtms: may be untrue for contrived logs
                 f"{repr(msg._pkt)[:26]}": f"{repr(msg._pkt)[27:]}"
                 for msg in msgs
                 if wanted_msg(msg, include_expired=include_expired)
             }
+            # _LOGGER.warning("Missing MessageIndex")
 
         self._resume()
 

ramses_rf/system/heat.py

@@ -532,7 +532,7 @@ class MultiZone(SystemBase):  # 0005 (+/- 000C?)
         schema = shrink(SCH_TCS_ZONES_ZON(schema))
 
         zon: Zone = self.zone_by_idx.get(zone_idx)  # type: ignore[assignment]
-        if zon is None:
+        if zon is None:  # not found in tcs, create it
             zon = zone_factory(self, zone_idx, msg=msg, **schema)  # type: ignore[unreachable]
             self.zone_by_idx[zon.idx] = zon
             self.zones.append(zon)

ramses_rf/version.py

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

{ramses_rf-0.52.3.dist-info → ramses_rf-0.52.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ramses_rf
-Version: 0.52.3
+Version: 0.52.4
 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
@@ -22,6 +22,7 @@ Description-Content-Type: text/markdown
 ![Linting](https://github.com/ramses-rf/ramses_rf/actions/workflows/check-lint.yml/badge.svg)
 ![Typing](https://github.com/ramses-rf/ramses_rf/actions/workflows/check-type.yml/badge.svg)
 ![Testing](https://github.com/ramses-rf/ramses_rf/actions/workflows/check-test.yml/badge.svg)
+[![Coverage](https://github.com/ramses-rf/ramses_rf/actions/workflows/check-cov.yml/badge.svg?event=push)](https://github.com/ramses-rf/ramses_rf/actions/workflows/check-cov.yml)
 
 ## Overview
 

{ramses_rf-0.52.3.dist-info → ramses_rf-0.52.4.dist-info}/RECORD

@@ -7,28 +7,28 @@ ramses_cli/utils/convert.py,sha256=D_YiCyX5na9pgC-_NhBlW9N1dgRKUK-uLtLBfofjzZM,1
 ramses_rf/__init__.py,sha256=vp2TyFGqc1fGQHsevhmaw0QEmSSCnZx7fqizKiEwHtw,1245
 ramses_rf/binding_fsm.py,sha256=fuqvcc9YW-wr8SPH8zadpPqrHAvzl_eeWF-IBtlLppY,26632
 ramses_rf/const.py,sha256=L3z31CZ-xqno6oZp_h-67CB_5tDDqTwSWXsqRtsjMcs,5460
-ramses_rf/database.py,sha256=rMfEJvapc3Zh6SFqjPjntuuaYynuZiAdYTw1pcXsJPE,20344
+ramses_rf/database.py,sha256=2sHiBhI5121HdX-IMquY3h5qQzDljeGWpQ9x6U4duEo,20408
 ramses_rf/dispatcher.py,sha256=YjEU-QrBLo9IfoEhJo2ikg_FxOaMYoWvzelr9Vi-JZ8,11398
-ramses_rf/entity_base.py,sha256=uN8QGGv0cutCYTT-oyDkvzv4xpBEObWF4jo9ArtvbLE,57640
+ramses_rf/entity_base.py,sha256=LifFLcxI867j4DmsaNSHsVl2fUEPkXpJdz4b7ZFpupo,58929
 ramses_rf/exceptions.py,sha256=mt_T7irqHSDKir6KLaf6oDglUIdrw0S40JbOrWJk5jc,3657
-ramses_rf/gateway.py,sha256=VYZqMppU_kDYhT3EUmqpHf0LuLXPMH7ASx9jylAopWE,21218
+ramses_rf/gateway.py,sha256=c88_HCAEBYPaNETMC0IUK1HU9QuEOnCGnK-5wze08_s,21289
 ramses_rf/helpers.py,sha256=TNk_QkpIOB3alOp1sqnA9LOzi4fuDCeapNlW3zTzNas,4250
 ramses_rf/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ramses_rf/schemas.py,sha256=jvpx0hZiMhaogyxbxnrbxS7m2GekKK4DFfVTNs7h-WQ,13476
-ramses_rf/version.py,sha256=E3rkZTOmbKgrnpOmzEdweYaquvnmc18LcdiXXdsnakM,125
+ramses_rf/version.py,sha256=9IsbhdNecTxEJDHwnSjdsa0r2hpABWxeNcD6LfKKNs0,125
 ramses_rf/device/__init__.py,sha256=sUbH5dhbYFXSoM_TPFRutpRutBRpup7_cQ9smPtDTy8,4858
 ramses_rf/device/base.py,sha256=Yx0LZwMEb49naY8FolZ8HEBFb6XCPQBTVN_TWyO2nKg,17777
-ramses_rf/device/heat.py,sha256=tjORTbjxBKFzgPQbfpLuj74IlrVtOmj9GpzslK9j0A0,54569
+ramses_rf/device/heat.py,sha256=I9_NlB_cOxCfCb3Zx88hY6wd7yIrknzo6msrWxXeeEs,54545
 ramses_rf/device/hvac.py,sha256=gdpVACUvtq6ERMI0mwRhqIJtKYEmybzJA2NeyN1ELrs,48431
 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/heat.py,sha256=qQmzgmyHy2x87gHAstn0ee7ZVVOq-GJIfDxCrC-6gFU,39254
 ramses_rf/system/schedule.py,sha256=Ts6tdZPTQLV5NkgwA73tPa5QUsnZNIIuYoKC-8VsXDk,18808
 ramses_rf/system/zones.py,sha256=YN_HAbeaa2YioUOjafEpp-0IHmIwmKNSK_77pPcjtns,36072
 ramses_tx/__init__.py,sha256=sqnjM7pUGJDmec6igTtKViSB8FLX49B5gwhAmcY9ERY,3596
 ramses_tx/address.py,sha256=F5ZE-EbPNNom1fW9XXUILvD7DYSMBxNJvsHVliT5gjw,8452
 ramses_tx/command.py,sha256=tqVECwd_QokEcRv2MSk7TUU4JSBzCZcJh1eQ0jIGgoY,125122
-ramses_tx/const.py,sha256=pnxq5upXvLUizv9Ye_I1llD9rAa3wddHgsSkc91AIUc,30300
+ramses_tx/const.py,sha256=AMwHitDq115rB24f3fzclNGC4ArMW16DbqiFWQc0U5o,30306
 ramses_tx/exceptions.py,sha256=FJSU9YkvpKjs3yeTqUJX1o3TPFSe_B01gRGIh9b3PNc,2632
 ramses_tx/fingerprints.py,sha256=nfftA1E62HQnb-eLt2EqjEi_la0DAoT0wt-PtTMie0s,11974
 ramses_tx/frame.py,sha256=GzNsXr15YLeidJYGtk_xPqsZQh4ehDDlUCtT6rTDhT8,22046
@@ -38,18 +38,18 @@ ramses_tx/logger.py,sha256=1iKRHKUaqHqGd76CkE_6mCVR0sYODtxshRRwfY61fTk,10426
 ramses_tx/message.py,sha256=-moQ8v3HVlNSl-x3U0DDfDcj8WQ7vLqclMNxsohbmnw,13449
 ramses_tx/opentherm.py,sha256=58PXz9l5x8Ou6Fm3y-R_UnGHCYahoi2RKIDdYStUMzk,42378
 ramses_tx/packet.py,sha256=_qHiPFWpQpKueZOgf1jJ93Y09iZjo3LZWStLglVkXg4,7370
-ramses_tx/parsers.py,sha256=Z0ochrNyO2l8SAP0oJxN-tx2nJluEaNP_uJCIm_lsA8,111279
-ramses_tx/protocol.py,sha256=9R3aCzuiWEyXmugmB5tyR_RhBlgfnpUXj7AsMP9BzzU,28867
+ramses_tx/parsers.py,sha256=xkffUleahvY6uPb34pcBDYnJ7QNQUzRuaED7wOVeEsE,113466
+ramses_tx/protocol.py,sha256=zjOz0TCzMmbUiLouLFXKRL7u9a6p9YsCkLYDVC5vG-Y,28867
 ramses_tx/protocol_fsm.py,sha256=ZKtehCr_4TaDdfdlfidFLJaOVTYtaEq5h4tLqNIhb9s,26827
 ramses_tx/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ramses_tx/ramses.py,sha256=NG81GBNZlap-Gi9ac-r6OFE-KaHvXsgPDWy-I2Irr-4,53698
+ramses_tx/ramses.py,sha256=vp748Tf_a-56OMM8CWDA2ZktRfTuj0QVyPRcnsOstSM,53983
 ramses_tx/schemas.py,sha256=bqKW_V0bR6VbBD8ZQiBExNtVdXs0fryVKe3GEhupgIo,13424
-ramses_tx/transport.py,sha256=oVClKNnCfHioIk5tF0TGmYspJhpggQ6EspOYeyBBR4g,58841
+ramses_tx/transport.py,sha256=8U6Hskle_0tdI4WViJT0e9Bl6-OeK1uKBvTQZvHtqyY,58923
 ramses_tx/typed_dicts.py,sha256=w-0V5t2Q3GiNUOrRAWiW9GtSwbta_7luME6GfIb1zhI,10869
 ramses_tx/typing.py,sha256=eF2SlPWhNhEFQj6WX2AhTXiyRQVXYnFutiepllYl2rI,5042
-ramses_tx/version.py,sha256=OmZAmWYXnodOMX2FqbBZjLsKSaBVpA4Y37368OIox1o,123
-ramses_rf-0.52.3.dist-info/METADATA,sha256=u8gl35WcjLN5rO1P_BTfchK23MayeJLDQxFEhHOM-v4,4000
-ramses_rf-0.52.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ramses_rf-0.52.3.dist-info/entry_points.txt,sha256=NnyK29baOCNg8DinPYiZ368h7MTH7bgTW26z2A1NeIE,50
-ramses_rf-0.52.3.dist-info/licenses/LICENSE,sha256=-Kc35W7l1UkdiQ4314_yVWv7vDDrg7IrJfMLUiq6Nfs,1074
-ramses_rf-0.52.3.dist-info/RECORD,,
+ramses_tx/version.py,sha256=UqvJQixbILsFY_XbawFKzLgN4gL1DKFAtz6JsZAXk4I,123
+ramses_rf-0.52.4.dist-info/METADATA,sha256=XTTcXOovtegIupIA9b5wQPCfRjUeuqtHRMOKKd_5bPo,4179
+ramses_rf-0.52.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ramses_rf-0.52.4.dist-info/entry_points.txt,sha256=NnyK29baOCNg8DinPYiZ368h7MTH7bgTW26z2A1NeIE,50
+ramses_rf-0.52.4.dist-info/licenses/LICENSE,sha256=-Kc35W7l1UkdiQ4314_yVWv7vDDrg7IrJfMLUiq6Nfs,1074
+ramses_rf-0.52.4.dist-info/RECORD,,

ramses_tx/const.py

@@ -440,7 +440,7 @@ DEV_TYPE_MAP = attr_dict_factory(
         ),  # CH/DHW devices instead of HVAC/other
         "HEAT_ZONE_SENSORS": ("00", "01", "03", "04", "12", "22", "34"),
         "HEAT_ZONE_ACTUATORS": ("00", "02", "04", "13"),
-        "THM_DEVICES": ("03", "12", "22", "34"),
+        "THM_DEVICES": ("03", "12", "21", "22", "34"),
         "TRV_DEVICES": ("00", "04"),
         "CONTROLLERS": ("01", "02", "12", "22", "23", "34"),  # potentially controllers
         "PROMOTABLE_SLUGS": (DevType.DEV, DevType.HEA, DevType.HVC),

ramses_tx/parsers.py

@@ -1912,6 +1912,7 @@ def parser_2411(payload: str, msg: Message) -> dict[str, Any]:
         "01": (2, centile),  # 52 (0.0-25.0) (%)
         "0F": (2, hex_to_percent),  # xx (0.0-1.0) (%)
         "10": (4, counter),  # 31 (0-1800) (days)
+        # "20": (4, counter),  # unknown data type, uncomment when we have more info
         "92": (4, hex_to_temp),  # 75 (0-30) (C)
     }  # TODO: _2411_TYPES.get(payload[8:10], (8, no_op))
 
@@ -1938,11 +1939,35 @@ def parser_2411(payload: str, msg: Message) -> dict[str, Any]:
         return result
 
     try:
-        assert payload[8:10] in _2411_DATA_TYPES, (
-            f"param {param_id} has unknown data_type: {payload[8:10]}"
-        )  # _INFORM_DEV_MSG
-        length, parser = _2411_DATA_TYPES.get(payload[8:10], (8, lambda x: x))
+        # Handle unknown data types gracefully instead of asserting
+        if payload[8:10] not in _2411_DATA_TYPES:
+            warningmsg = (
+                f"{msg!r} < {_INFORM_DEV_MSG} (param {param_id} has unknown data_type: {payload[8:10]}). "
+                f"This parameter uses an unrecognized data type. "
+                f"Please report this packet and any context about what changed on your system."
+            )
+            # Return partial result with raw hex values for unknown data types
+            if msg.len == 9:
+                result |= {
+                    "value": f"0x{payload[10:18]}",  # Raw hex value
+                    "_value_06": payload[6:10],
+                    "_unknown_data_type": payload[8:10],
+                }
+            else:
+                result |= {
+                    "value": f"0x{payload[10:18]}",  # Raw hex value
+                    "_value_06": payload[6:10],
+                    "min_value": f"0x{payload[18:26]}",  # Raw hex value
+                    "max_value": f"0x{payload[26:34]}",  # Raw hex value
+                    "precision": f"0x{payload[34:42]}",  # Raw hex value
+                    "_value_42": payload[42:],
+                    # Flexible footer - capture everything after precision
+                }
+            _LOGGER.warning(f"{warningmsg}. Found values: {result}")
+            return result
 
+        # Handle known data types normally
+        length, parser = _2411_DATA_TYPES[payload[8:10]]
         result |= {
             "value": parser(payload[10:18][-length:]),  # type: ignore[operator]
             "_value_06": payload[6:10],
@@ -1962,10 +1987,11 @@ def parser_2411(payload: str, msg: Message) -> dict[str, Any]:
                 # eg. older Orcon models may have a footer of 2 bytes
             }
         )
-    except AssertionError as err:
-        _LOGGER.warning(f"{msg!r} < {_INFORM_DEV_MSG} ({err})")
-        # Return partial result for unknown parameters
-        result["value"] = ""
+    except Exception as err:
+        _LOGGER.warning(f"{msg!r} < {_INFORM_DEV_MSG} (Error parsing 2411: {err})")
+        # Return partial result for any parsing errors
+        result["value"] = f"0x{payload[10:18]}"  # Raw hex value
+        result["_parse_error"] = f"Parser error: {err}"
         return result
 
 
@@ -2981,7 +3007,11 @@ def parser_unknown(payload: str, msg: Message) -> dict[str, Any]:
             "_value": hex_to_temp(payload[2:]),
         }
 
-    raise NotImplementedError
+    return {
+        "_payload": payload,
+        "_unknown_code": msg.code,
+        "_parse_error": "No parser available for this packet type",
+    }
 
 
 _PAYLOAD_PARSERS = {
@@ -2998,8 +3028,23 @@ def parse_payload(msg: Message) -> dict | list[dict]:
     :return: a dict of key: value pairs or a list of such dicts, e.g. {'temperature': 21.5}
     """
     result: dict | list[dict]
-    result = _PAYLOAD_PARSERS.get(msg.code, parser_unknown)(msg._pkt.payload, msg)
-    if isinstance(result, dict) and msg.seqn.isnumeric():  # e.g. 22F1/3
-        result["seqx_num"] = msg.seqn
+    try:
+        result = _PAYLOAD_PARSERS.get(msg.code, parser_unknown)(msg._pkt.payload, msg)
+        if isinstance(result, dict) and msg.seqn.isnumeric():  # e.g. 22F1/3
+            result["seqx_num"] = msg.seqn
+    except AssertionError as err:
+        _LOGGER.warning(
+            f"{msg!r} < {_INFORM_DEV_MSG} ({err}). "
+            f"This packet could not be parsed completely. "
+            f"Please report this message and any context about what changed on your system when this occurred."
+        )
+        # Return partial result with error info
+        result = {
+            "_payload": msg._pkt.payload,
+            "_parse_error": f"AssertionError: {err}",
+            "_unknown_code": msg.code,
+        }
+        if isinstance(result, dict) and msg.seqn.isnumeric():
+            result["seqx_num"] = msg.seqn
 
     return result

ramses_tx/protocol.py

@@ -583,7 +583,7 @@ class PortProtocol(_DeviceIdFilterMixin, _BaseProtocol):
             self._context.pause_writing()
 
     def resume_writing(self) -> None:
-        """Inform the FSM that the Protocol has been paused."""
+        """Inform the FSM that the Protocol has been resumed."""
 
         super().resume_writing()
         if self._context:
@@ -597,7 +597,7 @@ class PortProtocol(_DeviceIdFilterMixin, _BaseProtocol):
             self._context.pkt_received(pkt)
 
     async def _send_impersonation_alert(self, cmd: Command) -> None:
-        """Send an puzzle packet warning that impersonation is occurring."""
+        """Send a puzzle packet warning that impersonation is occurring."""
 
         if _DBG_DISABLE_IMPERSONATION_ALERTS:
             return

ramses_tx/ramses.py

@@ -377,10 +377,10 @@ CODES_SCHEMA: dict[Code, dict[str, Any]] = {  # rf_unknown
         I_: r"^(0[0-9A-F][0-9A-F]{8}0[12]){1,4}(0[12]03)?$",  # (0[12]03)? only if len(array) == 1
         W_: r"^(0[0-9A-F][0-9A-F]{8}0[12])$",  # never an array
     },
-    Code._22D0: {  # unknown_22d0, HVAC system switch?
+    Code._22D0: {  # unknown_22d0, Spider thermostat, HVAC system switch?
         SZ_NAME: "message_22d0",
-        I_: r"^(00|03)",
-        W_: r"^03",
+        I_: r"^(00|03)[0-9]{6}$",
+        W_: r"^03[0-9]{4}1E14030020$",
     },
     Code._22D9: {  # boiler_setpoint
         SZ_NAME: "boiler_setpoint",
@@ -843,6 +843,7 @@ _DEV_KLASSES_HEAT: dict[str, dict[Code, dict[VerbT, Any]]] = {
         Code._000C: {I_: {}},
         Code._000E: {I_: {}},
         Code._0016: {RQ: {}},
+        Code._01FF: {I_: {}, RQ: {}},
         Code._042F: {I_: {}},
         Code._1030: {I_: {}},
         Code._1060: {I_: {}},
@@ -853,9 +854,11 @@ _DEV_KLASSES_HEAT: dict[str, dict[Code, dict[VerbT, Any]]] = {
         Code._1F09: {I_: {}},
         Code._1FC9: {I_: {}},
         Code._22C9: {W_: {}},  # DT4R
+        Code._22D0: {W_: {}},  # Spider master THM
         Code._2309: {I_: {}, RQ: {}, W_: {}},
         Code._2349: {RQ: {}, W_: {}},
         Code._30C9: {I_: {}},
+        Code._3110: {I_: {}},  # Spider THM
         Code._3120: {I_: {}},
         Code._313F: {
             I_: {}
@@ -880,6 +883,7 @@ _DEV_KLASSES_HEAT: dict[str, dict[Code, dict[VerbT, Any]]] = {
         Code._3110: {I_: {}},  # Spider Autotemp
         Code._3150: {I_: {}},
         Code._4E01: {I_: {}},  # Spider Autotemp Zone controller
+        Code._4E04: {I_: {}},  # idem
     },
     DevType.TRV: {  # e.g. HR92/HR91: Radiator Controller
         Code._0001: {W_: {r"^0[0-9A-F]"}},
@@ -1178,9 +1182,9 @@ _CODE_ONLY_FROM_CTL: tuple[Code, ...] = tuple(
 CODES_ONLY_FROM_CTL: tuple[Code, ...] = (
     Code._1030,
     Code._1F09,
-    Code._22D0,
+    # Code._22D0,  # also _W from the Spider master THM! issue #340
     Code._313F,
-)  # I packets, TODO: 31Dx too?
+)  # I packets, TODO: 31Dx too? not 31D9/31DA!
 
 #
 ########################################################################################

ramses_tx/transport.py

@@ -1598,4 +1598,5 @@ async def transport_factory(
 
     # TODO: remove this? better to invoke timeout after factory returns?
     await protocol.wait_for_connection_made(timeout=_DEFAULT_TIMEOUT_PORT)
+    # pytest-cov times out in virtual_rf.py when set below 30.0 on GitHub Actions
     return transport

ramses_tx/version.py

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