ramses-rf 0.53.0__tar.gz → 0.53.2__tar.gz

{ramses_rf-0.53.0 → ramses_rf-0.53.2}/.github/workflows/check-cov.yml

@@ -89,7 +89,7 @@ jobs:
           hide_complexity: true
           indicators: true
           output: both
-          thresholds: '60 80'
+          thresholds: '80 90'
 
       - name: Add Coverage PR Comment
         # from: https://github.com/marketplace/actions/comment-pull-request
@@ -99,7 +99,7 @@ jobs:
           file-path: code-coverage-results.md
           comment-tag: code-coverage-results.md  # replaces existing by this name
           mode: recreate
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
         # or: https://github.com/marketplace/actions/sticky-pull-request-comment
         #        if: github.event_name == 'pull_request'
         #        with:

{ramses_rf-0.53.0 → ramses_rf-0.53.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ramses_rf
-Version: 0.53.0
+Version: 0.53.2
 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

{ramses_rf-0.53.0 → ramses_rf-0.53.2}/docs/source/binding_process.md

@@ -7,7 +7,8 @@ This diagram shows the binding finite state machine (FSM) for RAMSES RF devices,
 
 ```mermaid
 stateDiagram-v2
-    direction LR
+    direction TB
+    
     [*] --> DevIsNotBinding
     DevIsNotBinding --> InitiateBindingProcess : initiate_binding_process()
     InitiateBindingProcess --> SuppSendOfferWaitForAccept

{ramses_rf-0.53.0 → ramses_rf-0.53.2}/docs/source/conf.py

@@ -41,7 +41,7 @@ extensions = [
 pygments_style = "sphinx"  # enable syntax highlighting
 
 templates_path = ["_templates"]
-exclude_patterns = []
+exclude_patterns: list[str] = []
 
 # Language
 language = "en"

ramses_rf-0.53.2/docs/source/modules.rst

@@ -0,0 +1,97 @@
+ramses_rf/src/
+==============
+
+.. mermaid::
+
+    classDiagram
+        direction RL
+
+        namespace ramses_rf-dispatcher{
+            class Dispatcher{
+                + create_device()
+                + ..
+                + process_msg()
+            }
+        }
+        namespace ramses_rf-database{
+            class Database {
+                - add(msg)
+                - ..
+                - qry(msg)
+                - ..
+                - rem(msg)
+            }
+        }
+        namespace ramses_rf-device{
+            class heat
+            class hvac
+        }
+        namespace ramses_rf-gateway{
+            class hgi
+        }
+        namespace ramses_tx-message{
+            class Message {
+                - parse_message()
+                - ..
+                - parse_payload()
+                - ..
+                - validate_msg()
+            }
+        }
+        namespace ramses_tx-command{
+            class Command{
+                - _from_attrs
+                - ..
+                - set_zone_config
+            }
+        }
+        namespace ramses_tx-gateway-engine{
+            class Engine {
+                - add_msg_handler()
+                - ..
+                - create_cmd()
+                - ..
+                - async_send_cmd()
+            }
+        }
+        namespace ramses_tx-transport{
+            class Transport {
+                - MqttTransport
+                - ..
+                - PortTransport
+            }
+        }
+        namespace ramses_ESP{
+            class RF:::esp
+            class Serial:::esp
+        }
+
+        Transport <|--|> Serial
+        Transport <|--|> RF
+        Transport <|--|> Engine
+        Engine <|--|> hgi
+        Database <|--|> hgi
+        Message <|--|> hgi
+        heat <|--|> hgi
+        hvac <|--|> hgi
+        Dispatcher <|--|> hvac
+        Dispatcher <|--|> heat
+        Dispatcher <|--|> Message
+
+        click Transport href "ramses_tx.html#module-ramses_tx.transport" "docs"
+        click Engine href "ramses_tx.html#module-ramses_tx.gateway" "docs"
+        click hgi href "ramses_rf.html#module-ramses_rf.gateway" "docs"
+        click Database href "ramses_rf.html#module-ramses_rf.database" "docs"
+        click Message href "ramses_tx.html#module-ramses_tx.message" "docs"
+        click heat href "ramses_rf.device.html#module-ramses_rf.device.heat" "docs"
+        click hvac href "ramses_rf.device.html#module-ramses_rf.device.hvac" "docs"
+        click Dispatcher href "ramses_rf.html#module-ramses_rf.dispatcher" "docs"
+        click Command href "ramses_tx.html#module-ramses_tx.command" "docs"
+
+.. toctree::
+   :maxdepth: 2
+   :caption: Contents:
+
+   ramses_cli
+   ramses_rf
+   ramses_tx

{ramses_rf-0.53.0 → ramses_rf-0.53.2}/docs/source/ramses_rf.rst

@@ -32,6 +32,20 @@ ramses\_rf.const module
 ramses\_rf.database module
 --------------------------
 
+.. mermaid::
+    erDiagram
+        msg_db ||--o{ device : query
+
+        msg_db {
+            TEXT(26)* dtm
+            TEXT(2) verb
+            TEXT(9) src
+            TEXT(9) dst
+            TEXT(4) code
+            TEXT() ctx
+            TEXT() hdr
+        }
+
 .. automodule:: ramses_rf.database
    :members:
    :show-inheritance:

{ramses_rf-0.53.0 → ramses_rf-0.53.2}/misc/2411_parser.py

@@ -16,7 +16,7 @@ _LOGGER = logging.getLogger(__name__)
 # Parameter definitions
 # Add parameters that we know how to parse (or parts of it)
 
-Known_2411_PARAMS = {
+Known_2411_PARAMS: dict[str, Any] = {
     # TODO: add params that were decoded.
     #     "000007": {
     #         "name": "base_vent_enabled",
@@ -461,7 +461,7 @@ def decode_2411_message(raw_message: str, verb: str = "RP") -> dict[str, Any]:
     """
 
     class MockMessage:
-        def __init__(self, verb):
+        def __init__(self, verb: str) -> None:
             self.verb = verb
 
     result = parser_2411(raw_message, MockMessage(verb))

{ramses_rf-0.53.0 → ramses_rf-0.53.2}/pyproject.toml

@@ -1,6 +1,6 @@
 #
 ### project ##########################################################################
-# last checked/updated: 2025-08-16
+# last checked/updated: 2026-01-11
 #
 
 [project]
@@ -38,7 +38,7 @@
     "Topic :: Home Automation",
     "Programming Language :: Python :: 3.13",
   ]
-  requires-python = ">=3.11"        # HA core >=3.13.2
+  requires-python = ">=3.11"        # HA core >=3.13.2, TODO set to >=3.12 Feb. 2026 (issue #384)
   dependencies = [
     "colorlog>=6.9.0",              # latest
     "paho-mqtt>=2.1.0",             # latest

{ramses_rf-0.53.0 → ramses_rf-0.53.2}/ramses_cli/__init__.py

@@ -12,7 +12,7 @@ _DBG_FORCE_CLI_DEBUGGING: Final[bool] = (
 )
 
 
-if _DBG_FORCE_CLI_DEBUGGING:
+if _DBG_FORCE_CLI_DEBUGGING:  # pragma: no cover
     from .debug import start_debugging
 
     start_debugging(True)

{ramses_rf-0.53.0 → ramses_rf-0.53.2}/ramses_cli/client.py

@@ -23,7 +23,7 @@ from ramses_rf.schemas import (
     SZ_ENABLE_EAVESDROP,
     SZ_REDUCE_PROCESSING,
 )
-from ramses_tx import is_valid_dev_id, transport_factory
+from ramses_tx import is_valid_dev_id
 from ramses_tx.logger import CONSOLE_COLS, DEFAULT_DATEFMT, DEFAULT_FMT
 from ramses_tx.schemas import (
     SZ_DISABLE_QOS,
@@ -607,15 +607,25 @@ async def async_main(command: str, lib_kwargs: dict[str, Any], **kwargs: Any) ->
         ]
         lib_kwargs = lib_kwargs | state["schema"]
 
+    # Explicitly extract input_file if present to ensure it's passed as a named arg
+    input_file = lib_kwargs.pop(SZ_INPUT_FILE, None)
+
     # if serial_port == "/dev/ttyMOCK":
     #     from tests.deprecated.mocked_rf import MockGateway  # FIXME: for test/dev
     #     gwy = MockGateway(serial_port, **lib_kwargs)
     # else:
+
+    # Instantiate Gateway, note: transport_factory is the default, so we don't need to pass it
     gwy = Gateway(
-        serial_port, transport_constructor=transport_factory, **lib_kwargs
+        serial_port,
+        input_file=input_file,
+        **lib_kwargs,
     )  # passes action to gateway
 
-    if int(lib_kwargs[SZ_CONFIG][SZ_REDUCE_PROCESSING]) < DONT_CREATE_MESSAGES:
+    if (
+        int(lib_kwargs.get(SZ_CONFIG, {}).get(SZ_REDUCE_PROCESSING, 0))
+        < DONT_CREATE_MESSAGES
+    ):
         # library will not send MSGs to STDOUT, so we'll send PKTs instead
         colorama_init(autoreset=True)  # WIP: remove strip=True
         gwy.add_msg_handler(handle_msg)
@@ -678,7 +688,7 @@ cli.add_command(execute)
 cli.add_command(listen)
 
 
-def main() -> None:
+def main() -> None:  # pragma: no cover
     """Entry point for the CLI.
 
     Parses arguments, sets up the event loop (including Windows-specific policies),
@@ -718,5 +728,5 @@ def main() -> None:
     print(" - finished ramses_rf.\r\n")
 
 
-if __name__ == "__main__":
+if __name__ == "__main__":  # pragma: no cover
     main()

{ramses_rf-0.53.0 → ramses_rf-0.53.2}/ramses_cli/discovery.py

@@ -17,10 +17,6 @@ from ramses_rf.device import Fakeable
 from ramses_tx import CODES_SCHEMA, Command, DeviceIdT, Priority
 from ramses_tx.opentherm import OTB_DATA_IDS
 
-# Beware, none of this is reliable - it is all subject to random change
-# However, these serve as examples how to use the other modules
-
-
 from ramses_rf.const import (  # noqa: F401, isort: skip, pylint: disable=unused-import
     I_,
     RP,
@@ -44,22 +40,19 @@ SCAN_FULL: Final = "scan_full"
 SCAN_HARD: Final = "scan_hard"
 SCAN_XXXX: Final = "scan_xxxx"
 
-# DEVICE_ID_REGEX = re.compile(DEVICE_ID_REGEX.ANY)
-
-
 _LOGGER = logging.getLogger(__name__)
 
 
 def script_decorator(fnc: Callable[..., Any]) -> Callable[..., Any]:
     @functools.wraps(fnc)
-    def wrapper(gwy: Gateway, *args: Any, **kwargs: Any) -> None:
+    async def wrapper(gwy: Gateway, *args: Any, **kwargs: Any) -> None:
         gwy.send_cmd(
             Command._puzzle(message="Script begins:"),
             priority=Priority.HIGHEST,
             num_repeats=3,
         )
 
-        fnc(gwy, *args, **kwargs)
+        await fnc(gwy, *args, **kwargs)
 
         gwy.send_cmd(
             Command._puzzle(message="Script done."),
@@ -67,8 +60,6 @@ def script_decorator(fnc: Callable[..., Any]) -> Callable[..., Any]:
             num_repeats=3,
         )
 
-        return None
-
     return wrapper
 
 
@@ -93,7 +84,12 @@ def spawn_scripts(gwy: Gateway, **kwargs: Any) -> list[asyncio.Task[None]]:
             _LOGGER.warning(f"Script: {kwargs[EXEC_SCR][0]}() - unknown script")
         else:
             _LOGGER.info(f"Script: {kwargs[EXEC_SCR][0]}().- starts...")
-            tasks += [asyncio.create_task(script(gwy, kwargs[EXEC_SCR][1]))]
+            # script_poll_device returns a list of tasks, others return a coroutine
+            result = script(gwy, kwargs[EXEC_SCR][1])
+            if isinstance(result, list):
+                tasks.extend(result)
+            else:
+                tasks.append(asyncio.create_task(result))
 
     gwy._tasks.extend(tasks)
     return tasks
@@ -104,14 +100,6 @@ async def exec_cmd(gwy: Gateway, **kwargs: Any) -> None:
     await gwy.async_send_cmd(cmd, priority=Priority.HIGH, wait_for_reply=True)
 
 
-# @script_decorator
-# async def script_scan_001(gwy: Gateway, dev_id: DeviceIdT):
-#     _LOGGER.warning("scan_001() invoked - expect a lot of nonsense")
-#     for idx in range(0x10):
-#         gwy.send_cmd(Command.from_attrs(W_, dev_id, Code._000E, f"{idx:02X}0050"))
-#         gwy.send_cmd(Command.from_attrs(RQ, dev_id, Code._000E, f"{idx:02X}00C8"))
-
-
 async def get_faults(
     gwy: Gateway, ctl_id: DeviceIdT, start: int = 0, limit: int = 0x3F
 ) -> None:
@@ -199,7 +187,7 @@ def script_poll_device(gwy: Gateway, dev_id: DeviceIdT) -> list[asyncio.Task[Non
 async def script_scan_disc(gwy: Gateway, dev_id: DeviceIdT) -> None:
     _LOGGER.warning("scan_disc() invoked...")
 
-    await gwy.get_device(dev_id).discover()  # discover_flag=Discover.DEFAULT)
+    await gwy.get_device(dev_id).discover()
 
 
 @script_decorator
@@ -340,9 +328,7 @@ async def script_scan_otb_hard(gwy: Gateway, dev_id: DeviceIdT) -> None:
 
 
 @script_decorator
-async def script_scan_otb_map(
-    gwy: Gateway, dev_id: DeviceIdT
-) -> None:  # Tested only upon a R8820A
+async def script_scan_otb_map(gwy: Gateway, dev_id: DeviceIdT) -> None:
     _LOGGER.warning("script_scan_otb_map invoked - expect a lot of nonsense")
 
     RAMSES_TO_OPENTHERM = {
@@ -364,9 +350,7 @@ async def script_scan_otb_map(
 
 
 @script_decorator
-async def script_scan_otb_ramses(
-    gwy: Gateway, dev_id: DeviceIdT
-) -> None:  # Tested only upon a R8820A
+async def script_scan_otb_ramses(gwy: Gateway, dev_id: DeviceIdT) -> None:
     _LOGGER.warning("script_scan_otb_ramses invoked - expect a lot of nonsense")
 
     _CODES = (
@@ -394,7 +378,7 @@ async def script_scan_otb_ramses(
         Code._3223,
         Code._3EF0,  # rel. modulation level  / RelativeModulationLevel (also, below)
         Code._3EF1,  # rel. modulation level  / RelativeModulationLevel
-    )  # excl. 3150, 3220
+    )
 
     for c in _CODES:
         gwy.send_cmd(Command.from_attrs(RQ, dev_id, c, "00"), priority=Priority.LOW)

{ramses_rf-0.53.0 → ramses_rf-0.53.2}/ramses_rf/database.py

@@ -272,18 +272,21 @@ class MessageIndex:
 
         return old
 
-    def add_record(self, src: str, code: str = "", verb: str = "") -> None:
+    def add_record(
+        self, src: str, code: str = "", verb: str = "", payload: str = "00"
+    ) -> None:
         """
         Add a single record to the MessageIndex with timestamp `now()` and no Message contents.
 
         :param src: device id to use as source address
         :param code: device id to use as destination address (can be identical)
         :param verb: two letter verb str to use
+        :param payload: payload str to use
         """
-        # Used by OtbGateway init, via entity_base.py
+        # Used by OtbGateway init, via entity_base.py (code=_3220)
         _now: dt = dt.now()
         dtm: DtmStrT = _now.isoformat(timespec="microseconds")  # type: ignore[assignment]
-        hdr = f"{code}|{verb}|{src}|00"  # dummy record has no contents
+        hdr = f"{code}|{verb}|{src}|{payload}"
 
         dup = self._delete_from(hdr=hdr)
 

{ramses_rf-0.53.0 → ramses_rf-0.53.2}/ramses_rf/device/heat.py

@@ -668,11 +668,13 @@ class OtbGateway(Actuator, HeatDemand):  # OTB (10): 3220 (22D9, others)
         self._child_id = FC  # NOTE: domain_id
 
         # TODO(eb): cleanup
-        if self._gwy.msg_db:
-            self._add_record(id=self.id, code=Code._3220, verb="RP")
-        # adds a "sim" RP opentherm_msg to the SQLite MessageIndex with code _3220
-        # causes exc when fetching ALL, when no "real" msg was added to _msgs_. We skip those.
-        else:
+        if not self._gwy.msg_db:
+            # self._add_record(
+            #     id=self.id, code=Code._3220, verb="RP", payload="00C0060101"
+            # )  # is parsed but pollutes the client.py
+            # adds a "sim" RP opentherm_msg to the SQLite MessageIndex with code _3220
+            # causes exc when fetching ALL, when no "real" msg was added to _msgs_. We skip those.
+            # else:
             self._msgz[Code._3220] = {RP: {}}  # No ctx! (not None)
 
         # lf._use_ot = self._gwy.config.use_native_ot

{ramses_rf-0.53.0 → ramses_rf-0.53.2}/ramses_rf/entity_base.py

@@ -324,12 +324,16 @@ class _MessageDB(_Entity):
         ]
 
     def _add_record(
-        self, id: DeviceIdT, code: Code | None = None, verb: str = " I"
+        self,
+        id: DeviceIdT,
+        code: Code | None = None,
+        verb: str = " I",
+        payload: str = "00",
     ) -> None:
         """Add a (dummy) record to the central SQLite MessageIndex."""
-        # used by heat.py init
+        # used by heat.py.OtbGateway init
         if self._gwy.msg_db:
-            self._gwy.msg_db.add_record(id, code=str(code), verb=verb)
+            self._gwy.msg_db.add_record(id, code=str(code), verb=verb, payload=payload)
         # else:
         #     _LOGGER.warning("Missing MessageIndex")
         # raise NotImplementedError

{ramses_rf-0.53.0 → ramses_rf-0.53.2}/ramses_rf/gateway.py

@@ -107,7 +107,7 @@ class Gateway(Engine):
 
         :param port_name: The serial port name (e.g., '/dev/ttyUSB0') or None if using a file.
         :type port_name: str | None
-        :param input_file: Path to a packet log file for playback, defaults to None.
+        :param input_file: Path to a packet log file for playback/parsing, defaults to None.
         :type input_file: str | None, optional
         :param port_config: Configuration dictionary for the serial port, defaults to None.
         :type port_config: PortConfigT | None, optional
@@ -224,9 +224,10 @@ class Gateway(Engine):
         )
 
         # initialize SQLite index, set in _tx/Engine
-        if self._sqlite_index:  # TODO(eb): default to ON in Q4 2025
+        if self._sqlite_index:  # TODO(eb): default to True in Q1 2026
             _LOGGER.info("Ramses RF starts SQLite MessageIndex")
-            self.create_sqlite_message_index()  # if activated in ramses_cc > Engine
+            # if activated in ramses_cc > Engine or set in tests
+            self.create_sqlite_message_index()
 
         # temporarily turn on discovery, remember original state
         self.config.disable_discovery, disable_discovery = (

{ramses_rf-0.53.0 → ramses_rf-0.53.2}/ramses_rf/system/zones.py

@@ -689,7 +689,7 @@ class Zone(ZoneSchedule):
 
     @property
     def heating_type(self) -> str | None:
-        """Return the type of the zone/DHW (e.g. electric_zone, stored_dhw)."""
+        """Get the type of the zone/DHW (e.g. electric_zone, stored_dhw)."""
 
         if self._SLUG is None:  # isinstance(self, ???)
             return None
@@ -697,12 +697,13 @@ class Zone(ZoneSchedule):
 
     @property
     def name(self) -> str | None:  # 0004
-        """Return the name of the zone."""
+        """Get the name of the zone."""
 
         if self._gwy.msg_db:
             msgs = self._gwy.msg_db.get(
                 code=Code._0004, src=self._z_id, ctx=self._z_idx
             )
+            _LOGGER.debug(f"Pick Zone.name from: {msgs}[0])")  # DEBUG issue #317
             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-0.53.0 → ramses_rf-0.53.2}/ramses_rf/version.py

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

{ramses_rf-0.53.0 → ramses_rf-0.53.2}/ramses_tx/const.py

@@ -276,7 +276,9 @@ class AttrDict(dict):  # type: ignore[type-arg]
             return self._forward[name[1:]]
         elif name.isupper() and name.lower() in self._reverse:  # map.DHW_SENSOR -> "0D"
             return self[name.lower()]
-        return self.__getattribute__(name)
+        raise AttributeError(
+            f"'{type(self).__name__}' object has no attribute '{name}'"
+        )
 
     def _hex(self, key: str) -> str:
         """Return the key/ID (2-byte hex string) of the two-way dict (e.g. '04').

{ramses_rf-0.53.0 → ramses_rf-0.53.2}/ramses_tx/gateway.py

@@ -114,7 +114,9 @@ class Engine:
             self._include,
             self._exclude,
         )
-        self._sqlite_index = kwargs.pop(SZ_SQLITE_INDEX, False)  # default True?
+        self._sqlite_index = kwargs.pop(
+            SZ_SQLITE_INDEX, False
+        )  # TODO Q1 2026: default True
         self._log_all_mqtt = kwargs.pop(SZ_LOG_ALL_MQTT, False)
         self._kwargs: dict[str, Any] = kwargs  # HACK
 

{ramses_rf-0.53.0 → ramses_rf-0.53.2}/ramses_tx/helpers.py

@@ -149,7 +149,7 @@ def timestamp() -> float:
 
 
 def dt_now() -> dt:
-    """Return the current datetime as a local/naive datetime object.
+    """Get the current datetime as a local/naive datetime object.
 
     This is slower, but potentially more accurate, than dt.now(), and is used mainly for
     packet timestamps.

{ramses_rf-0.53.0 → ramses_rf-0.53.2}/ramses_tx/message.py

@@ -70,22 +70,24 @@ class MessageBase:
         self.verb: VerbT = pkt.verb
         self.seqn: str = (
             pkt.seqn
-        )  # the msg is part of a set for 1 Code, received in order
+        )  # the msg is part of a set for a Code, received in order
         self.code: Code = pkt.code
         self.len: int = pkt._len
 
-        self._payload = self._validate(
-            self._pkt.payload
-        )  # ? may raise InvalidPacketError
+        self._payload = self._validate(self._pkt.payload)  # ? may raise PacketInvalid
 
         self._str: str = None  # type: ignore[assignment]
 
     def __repr__(self) -> str:
-        """Return an unambiguous string representation of this object."""
+        """
+        :return: an unambiguous string representation of this object.
+        """
         return str(self._pkt)  # repr or str?
 
     def __str__(self) -> str:
-        """Return a brief readable string representation of this object."""
+        """
+        :return: a brief readable string representation of this object.
+        """
 
         def ctx(pkt: Packet) -> str:
             ctx = {True: "[..]", False: "", None: "??"}.get(pkt._ctx, pkt._ctx)  # type: ignore[arg-type]
@@ -128,17 +130,22 @@ class MessageBase:
         return self.dtm < other.dtm
 
     def _name(self, addr: Address) -> str:
-        """Return a friendly name for an Address, or a Device."""
+        """
+        :return: a friendly name for an Address, or a Device.
+        """
         return f" {addr.id}"  # can't do 'CTL:123456' instead of ' 01:123456'
 
     @property
     def payload(self):  # type: ignore[no-untyped-def]  # FIXME -> dict | list:
-        """Return the payload."""
+        """
+        :return: the payload.
+        """
         return self._payload
 
     @property
     def _has_payload(self) -> bool:
-        """Return False if there is no payload (may falsely Return True).
+        """
+        :return: False if there is no payload (may falsely return True).
 
         The message (i.e. the raw payload) may still have an idx.
         """
@@ -234,7 +241,7 @@ class MessageBase:
             return {}
 
         # TODO: also 000C (but is a complex idx)
-        # TODO: also 3150 (when not domain, and will be array if so)
+        # TODO: also 3150 (when not domain; will be array in that case)
         if self.code in (Code._000A, Code._2309) and self.src.type == DEV_TYPE_MAP.UFC:
             assert isinstance(self._pkt._idx, str)  # mypy hint
             return {IDX_NAMES[Code._22C9]: self._pkt._idx}
@@ -250,7 +257,7 @@ class MessageBase:
         """Validate a message packet payload, and parse it if valid.
 
         :return: a dict containing key: value pairs, or a list of those created from the payload
-        :raises an InvalidPacketError exception if it is not valid.
+        :raises PacketInvalid exception if it is not valid.
         """
 
         try:  # parse the payload
@@ -292,7 +299,7 @@ class MessageBase:
 
 
 class Message(MessageBase):
-    """Extend the Message class, so is useful to a stateful Gateway.
+    """Extend the Message class, so it is useful to a stateful Gateway.
 
     Adds _expired attr to the Message class.
     """
@@ -303,7 +310,7 @@ class Message(MessageBase):
     # .HAS_DIED = 1.0  # fraction_expired >= 1.0 (is expected lifespan)
     IS_EXPIRING = 0.8  # fraction_expired >= 0.8 (and < HAS_EXPIRED)
 
-    _gwy: Gateway
+    _gwy: Gateway | None = None
     _fraction_expired: float | None = None
 
     @classmethod
@@ -318,13 +325,19 @@ class Message(MessageBase):
 
     @property
     def _expired(self) -> bool:
-        """Return True if the message is dated (or False otherwise)."""
+        """
+        :return: True if the message is dated, False otherwise
+        """
         # fraction_expired = (dt_now - self.dtm - _TD_SECONDS_003) / self._pkt._lifespan
         # TODO: keep none >7d, even 10E0, etc.
 
         def fraction_expired(lifespan: td) -> float:
-            """Return the packet's age as fraction of its 'normal' life span."""
-            return (self._gwy._dt_now() - self.dtm - _TD_SECS_003) / lifespan
+            """
+            :return: the packet's age as fraction of its 'normal' life span.
+            """
+            if self._gwy:  # self._gwy is set in ramses_tx.gateway.Engine._msg_handler
+                return (self._gwy._dt_now() - self.dtm - _TD_SECS_003) / lifespan
+            return (dt.now() - self.dtm - _TD_SECS_003) / lifespan
 
         # 1. Look for easy win...
         if self._fraction_expired is not None:

{ramses_rf-0.53.0 → ramses_rf-0.53.2}/ramses_tx/parsers.py

@@ -3291,13 +3291,13 @@ def parser_3220(payload: str, msg: Message) -> dict[str, Any]:
         "FFFF",
     ), f"OpenTherm: Invalid msg-type|data-value: {ot_type}|{payload[6:10]}"
 
-    # HACK: These OT data id can pop in/out of 47AB, which is an invalid value
+    # HACK: These OT data id's can pop in/out of 47AB, which is an invalid value
     if payload[6:] == "47AB" and ot_id in (0x12, 0x13, 0x19, 0x1A, 0x1B, 0x1C):
         ot_value[SZ_VALUE] = None
     # HACK: This OT data id can be 1980, which is an invalid value
     if payload[6:] == "1980" and ot_id:  # CH pressure is 25.5 bar!
         ot_value[SZ_VALUE] = None
-    # HACK: Done above, not in OT.decode_frame() as they isn't in the OT specification
+    # HACK: Done above, not in OT.decode_frame() as values aren't in the OT specification
 
     if ot_type not in _LIST:
         assert ot_type in (