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

ramses_rf/version.py

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

{ramses_rf-0.51.3.dist-info → ramses_rf-0.51.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ramses_rf
-Version: 0.51.3
+Version: 0.51.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

{ramses_rf-0.51.3.dist-info → ramses_rf-0.51.4.dist-info}/RECORD

@@ -15,7 +15,7 @@ ramses_rf/gateway.py,sha256=vqoTEb6QXnwaIMa66oed_3LEVvlyQ3flsAAMliEEvVA,20921
 ramses_rf/helpers.py,sha256=LcrVLqnF2qJWqXrC7UXKOQE8khCT3OhoTpZ_ZVBjw3A,4249
 ramses_rf/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ramses_rf/schemas.py,sha256=mYOUZOH5OIDNBxRM2vd8POzDWEEmLhxh5UtqjTpFNek,13287
-ramses_rf/version.py,sha256=H7dGP9Kn7kENpYvpC0mlcipijKfHZqlzlTauaoFe_8k,125
+ramses_rf/version.py,sha256=zEZhrTC1gMQzcGZ3ZSkZrhF_OBj8Dnlv5VhehgnT3_s,125
 ramses_rf/device/__init__.py,sha256=sUbH5dhbYFXSoM_TPFRutpRutBRpup7_cQ9smPtDTy8,4858
 ramses_rf/device/base.py,sha256=V2YzRhdxrTqfHYrCBq6pJsYdTgAx8gGzfdo8pkbeEo8,17450
 ramses_rf/device/heat.py,sha256=2sCsggySVcuTzyXDmgWy76QbhlU5MQWSejy3zgI5BDE,54242
@@ -38,18 +38,18 @@ ramses_tx/logger.py,sha256=7vUpcfOFMW95juMWDx5dhUOqV8DTsindZ-Qz2aCmEoA,11073
 ramses_tx/message.py,sha256=J1wvVkLPJQr2ffKCUQYSWwLPzRTZBC0zUU5W9DkN3hU,13190
 ramses_tx/opentherm.py,sha256=58PXz9l5x8Ou6Fm3y-R_UnGHCYahoi2RKIDdYStUMzk,42378
 ramses_tx/packet.py,sha256=NGunaGCkEjhTp9t4mARK5e7kbqT-Z_JKCH7ibMYMJXU,7357
-ramses_tx/parsers.py,sha256=R-oFcRUe7HPsm9n4196hFUD1tULbFdKBAWo8HvzGyjw,109218
+ramses_tx/parsers.py,sha256=eU5dqbbw1vzWDFxDhyNPy2j6t_LQN56mRJa0A-PeKiE,109411
 ramses_tx/protocol.py,sha256=ifj3qwcQivjQDaQUwM94xp-U8Pmef6zwSH7mav8DLWA,28867
 ramses_tx/protocol_fsm.py,sha256=YhHkTqbl8w-myimsOjV50uIFgg9HiApwPU7xA_jg5nU,26827
 ramses_tx/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ramses_tx/ramses.py,sha256=yPSdhxGRYQ9AuTWoKs9Cb3YQn5YnEKZVs7BYkQFmqCw,52037
+ramses_tx/ramses.py,sha256=GnZwvx-HSVFdjXfUen6aWClDtrAmYaKwbrWl-LsyKO4,52045
 ramses_tx/schemas.py,sha256=h2AcArVROy1_C4n6F0Crj4e-2BxXxH74xogFlc6nKHI,12769
-ramses_tx/transport.py,sha256=28CtiqNltcJhLr4VIHCW9uCohWXrvxmx6ySUSIuRQ9c,52892
+ramses_tx/transport.py,sha256=-IO8UY85OOytciX3h7tFN58BBDtI3TEoOgmUmv-LiNc,56288
 ramses_tx/typed_dicts.py,sha256=4ZT50M-Cuwy2ljAIorwoxEJ9c737xUHrUxX9wTh79xE,10834
 ramses_tx/typing.py,sha256=eF2SlPWhNhEFQj6WX2AhTXiyRQVXYnFutiepllYl2rI,5042
-ramses_tx/version.py,sha256=EK6Cr3XBdGkYKI-L4TW-S8rBw478PNtR_ckrbfQTCYM,123
-ramses_rf-0.51.3.dist-info/METADATA,sha256=eLSMlCmKZZ66ImYx16vDtejxWCYIkWFfYRc5ZYqZom8,3906
-ramses_rf-0.51.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ramses_rf-0.51.3.dist-info/entry_points.txt,sha256=NnyK29baOCNg8DinPYiZ368h7MTH7bgTW26z2A1NeIE,50
-ramses_rf-0.51.3.dist-info/licenses/LICENSE,sha256=-Kc35W7l1UkdiQ4314_yVWv7vDDrg7IrJfMLUiq6Nfs,1074
-ramses_rf-0.51.3.dist-info/RECORD,,
+ramses_tx/version.py,sha256=QqJQBBdWjuoIvxrhzIH4ysjOp5bzB0KI1TdFhr9c6og,123
+ramses_rf-0.51.4.dist-info/METADATA,sha256=odaoeguG-xZAlWq8nYF4PHVK3SV5mzJRi1QdD4IBKcE,3906
+ramses_rf-0.51.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ramses_rf-0.51.4.dist-info/entry_points.txt,sha256=NnyK29baOCNg8DinPYiZ368h7MTH7bgTW26z2A1NeIE,50
+ramses_rf-0.51.4.dist-info/licenses/LICENSE,sha256=-Kc35W7l1UkdiQ4314_yVWv7vDDrg7IrJfMLUiq6Nfs,1074
+ramses_rf-0.51.4.dist-info/RECORD,,

ramses_tx/parsers.py

@@ -1382,18 +1382,27 @@ def parser_1fd4(payload: str, msg: Message) -> PayDictT._1FD4:
 def parser_2210(payload: str, msg: Message) -> dict[str, Any]:
     try:
         assert msg.verb in (RP, I_) or payload == "00"
-        assert payload[10:12] == payload[38:40] and payload[10:12] in (
+        assert payload[10:12] == payload[38:40] and payload[
+            10:12
+        ] in (  # auto requested fan speed step?
             "58",
+            "64",
             "96",
             "FF",
-        ), f"expected (58|96|FF), not {payload[10:12]}"
+        ), f"expected req.speed? (58|64|96|FF), not {payload[10:12]}"
         assert payload[20:22] == payload[48:50] and payload[20:22] in (
             "00",
             "03",
-        ), f"expected (00|03), not {payload[10:12]}"
-        assert payload[78:80] in ("00", "02"), f"expected (00|02), not {payload[78:80]}"
-        assert payload[80:82] in ("01", "08"), f"expected (01|08), not {payload[80:82]}"
-        assert payload[82:] in ("00", "40"), f"expected (00|40), not {payload[82:]}"
+        ), f"expected byte 10 (00|03), not {payload[20:22]}"
+        assert payload[78:80] in ("00", "02"), (
+            f"expected byte 39 (00|02), not {payload[78:80]}"
+        )
+        assert payload[80:82] in ("01", "08"), (
+            f"expected byte 40 (01|08), not {payload[80:82]}"
+        )
+        assert payload[82:] in ("00", "40"), (
+            f"expected byte 41- (00|40), not {payload[82:]}"
+        )
 
     except AssertionError as err:
         _LOGGER.warning(f"{msg!r} < {_INFORM_DEV_MSG} ({err})")

ramses_tx/ramses.py

@@ -1059,7 +1059,7 @@ _DEV_KLASSES_HVAC: dict[str, dict[Code, dict[VerbT, Any]]] = {
         Code._12C8: {I_: {}},
         Code._1470: {RP: {}},
         Code._1F09: {I_: {}, RP: {}},
-        Code._1FC9: {W_: {}},
+        Code._1FC9: {I_: {}, W_: {}},
         Code._2210: {I_: {}, RP: {}},
         Code._22E0: {RP: {}},
         Code._22E5: {RP: {}},

ramses_tx/transport.py

@@ -778,7 +778,8 @@ class FileTransport(_ReadTransport, _FileTransportAbstractor):
                 while not self._reading:
                     await asyncio.sleep(0.001)
                 self._frame_read(dtm_str, pkt_line)
-                # await asyncio.sleep(0)  # NOTE: big performance penalty if delay >0
+                await asyncio.sleep(0)
+                # NOTE: instable without, big performance penalty if delay >0
 
         elif isinstance(self._pkt_source, str):  # file_name, used in client parse
             # open file file_name before reading
@@ -794,7 +795,8 @@ class FileTransport(_ReadTransport, _FileTransportAbstractor):
                         ] != "#":
                             self._frame_read(dtm_pkt_line[:26], dtm_pkt_line[27:])
                             # this is where the parsing magic happens!
-                        # await asyncio.sleep(0)  # NOTE: big performance penalty if delay >0
+                        await asyncio.sleep(0)
+                        # NOTE: instable without, big performance penalty if delay >0
             except FileNotFoundError as err:
                 _LOGGER.warning(f"Correct the packet file name; {err}")
         elif isinstance(self._pkt_source, TextIOWrapper):  # used by client monitor
@@ -804,7 +806,8 @@ class FileTransport(_ReadTransport, _FileTransportAbstractor):
                 # can be blank lines in annotated log files
                 if (dtm_pkt_line := dtm_pkt_line.strip()) and dtm_pkt_line[:1] != "#":
                     self._frame_read(dtm_pkt_line[:26], dtm_pkt_line[27:])
-                await asyncio.sleep(0)  # NOTE: big performance penalty if delay >0
+                await asyncio.sleep(0)
+                # NOTE: instable without, big performance penalty if delay >0
         else:
             raise exc.TransportSourceInvalid(
                 f"Packet source is not dict, TextIOWrapper or str: {self._pkt_source:!r}"
@@ -1035,6 +1038,7 @@ class MqttTransport(_FullTransport, _MqttTransportAbstractor):
 
         self._connected = False
         self._connecting = False
+        self._connection_established = False  # Track if initial connection was made
         self._extra[SZ_IS_EVOFW3] = True
 
         # Reconnection settings
@@ -1136,8 +1140,21 @@ class MqttTransport(_FullTransport, _MqttTransportAbstractor):
             self._reconnect_task.cancel()
             self._reconnect_task = None
 
+        # 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("/+"):
+            data_wildcard = self._topic_base.replace("/+", "/+/rx")
+            self.client.subscribe(data_wildcard, qos=self._mqtt_qos)
+            _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}")
+
     def _on_connect_fail(
         self,
         client: mqtt.Client,
@@ -1160,14 +1177,27 @@ class MqttTransport(_FullTransport, _MqttTransportAbstractor):
     ) -> None:
         _LOGGER.warning(f"MQTT disconnected: {reason_code.getName()}")
 
+        was_connected = self._connected
         self._connected = False
 
+        # If we were previously connected and had established communication,
+        # notify that the device is now offline
+        if was_connected and hasattr(self, "_topic_sub") and self._topic_sub:
+            device_topic = self._topic_sub[:-3]  # Remove "/rx" suffix
+            _LOGGER.warning(f"{self}: the MQTT device is offline: {device_topic}")
+
+            # Pause writing since device is offline
+            if hasattr(self, "_protocol"):
+                self._protocol.pause_writing()
+
         # Only attempt reconnection if we didn't deliberately disconnect
         if not self._closing and not reason_code.is_failure:
             # This was an unexpected disconnect, schedule reconnection
+            _LOGGER.debug("MQTT unexpected disconnect - scheduling reconnection")
             self._schedule_reconnect()
         elif reason_code.is_failure and not self._closing:
             # Connection failed, also schedule reconnection
+            _LOGGER.debug("MQTT connection failed - scheduling reconnection")
             self._schedule_reconnect()
 
     def _create_connection(self, msg: mqtt.MQTTMessage) -> None:
@@ -1191,7 +1221,12 @@ class MqttTransport(_FullTransport, _MqttTransportAbstractor):
 
         self.client.subscribe(self._topic_sub, qos=self._mqtt_qos)
 
-        self._make_connection(gwy_id=msg.topic[-9:])  # type: ignore[arg-type]
+        # Only call connection_made on first connection, not reconnections
+        if not self._connection_established:
+            self._connection_established = True
+            self._make_connection(gwy_id=msg.topic[-9:])  # type: ignore[arg-type]
+        else:
+            _LOGGER.info("MQTT reconnected - protocol connection already established")
 
     # NOTE: self._frame_read() invoked from here
     def _on_message(
@@ -1211,23 +1246,51 @@ class MqttTransport(_FullTransport, _MqttTransportAbstractor):
             _LOGGER.info("Rx: %s", msg.payload)
 
         if msg.topic[-3:] != "/rx":  # then, e.g. 'RAMSES/GATEWAY/18:017804'
-            if msg.payload == b"offline" and self._topic_sub.startswith(msg.topic):
-                _LOGGER.warning(
-                    f"{self}: the MQTT device is offline: {self._topic_sub[:-3]}"
-                )
-                self._connected = False
-                self._protocol.pause_writing()
+            if msg.payload == b"offline":
+                # Check if this offline message is for our current device
+                if (
+                    hasattr(self, "_topic_sub")
+                    and self._topic_sub
+                    and msg.topic == self._topic_sub[:-3]
+                ) or not hasattr(self, "_topic_sub"):
+                    _LOGGER.warning(
+                        f"{self}: the ESP device is offline (via LWT): {msg.topic}"
+                    )
+                    # Don't set _connected = False here - that's for MQTT connection, not ESP device
+                    if hasattr(self, "_protocol"):
+                        self._protocol.pause_writing()
 
             # BUG: using create task (self._loop.ct() & asyncio.ct()) causes the
             # BUG: event look to close early
             elif msg.payload == b"online":
                 _LOGGER.info(
-                    f"{self}: the MQTT device is online: {self._topic_sub[:-3]}"
+                    f"{self}: the ESP device is online (via status): {msg.topic}"
                 )
                 self._create_connection(msg)
 
             return
 
+        # Handle data messages - if we don't have connection established yet but get data,
+        # we can infer the gateway from the topic
+        if not self._connection_established and msg.topic.endswith("/rx"):
+            # Extract gateway ID from topic like "RAMSES/GATEWAY/18:123456/rx"
+            topic_parts = msg.topic.split("/")
+            if len(topic_parts) >= 3 and topic_parts[-2] not in ("+", "*"):
+                gateway_id = topic_parts[-2]  # Should be something like "18:123456"
+                _LOGGER.info(
+                    f"Inferring gateway connection from data topic: {gateway_id}"
+                )
+
+                # Set up topics and connection
+                self._topic_pub = f"{'/'.join(topic_parts[:-1])}/tx"
+                self._topic_sub = msg.topic
+                self._extra[SZ_ACTIVE_HGI] = gateway_id
+
+                # Mark as connected and establish protocol connection
+                self._connected = True
+                self._connection_established = True
+                self._make_connection(gwy_id=gateway_id)  # type: ignore[arg-type]
+
         try:
             payload = json.loads(msg.payload)
         except json.JSONDecodeError:

ramses_tx/version.py

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