ramses-rf 0.51.3__tar.gz → 0.51.4__tar.gz

{ramses_rf-0.51.3 → ramses_rf-0.51.4}/PKG-INFO

@@ -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 → ramses_rf-0.51.4}/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 → ramses_rf-0.51.4}/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_rf-0.51.3 → ramses_rf-0.51.4}/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_rf-0.51.3 → ramses_rf-0.51.4}/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_rf-0.51.3 → ramses_rf-0.51.4}/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__

{ramses_rf-0.51.3 → ramses_rf-0.51.4}/tests/tests/bindings/hvac/rem_fan_ventura.log

@@ -6,15 +6,30 @@
 
 
 ####################################################################################################
-# 1. For reference, 10E0s (if any), oem_code='65' (Note: REM/FAN won't RP|10E0):
+# 1A. For reference, 10E0s (if any), oem_code='65' (Note: REM/FAN won't RP|10E0):
 2024-10-16T21:32:07.084793 073  I --- 29:123150 63:262142 --:------ 10E0 029 000001C8410D0165FFFFFFFFFFFF0D0407DF564D4E2D30374C4D303100                    # {'description': 'VMN-07LM01', 'manufacturer_sub_id': 'C8', 'product_id': '41', 'date_1': '2015-04-13', 'date_2': '0000-00-00', 'oem_code': '65'}  # ClimaRad 4-button remote
 2024-10-09T11:50:24.287879 123  I --- 37:153226 63:262142 --:------ 10E0 038 000001C8830C0A65FEFFFFFFFFFF110C07E4564D442D30375250533133000000000000000000  # {'description': 'VMD-07RPS13', 'manufacturer_sub_id': 'C8', 'product_id': '83', 'date_1': '2020-12-17', 'date_2': '0000-00-00', 'oem_code': '65'}  # ClimaRad VenturaV1x
-
+2025-08-22T01:24:57.945961 058  I --- 18:154951 63:262142 --:------ 10E0 038 000001C8490F0065FEFEFFFFFFFF120607E4425244472D303252313300000000000000000000  # {'description': 'BRDG-02R13', 'manufacturer_sub_id': 'C8', 'product_id': '49', 'date_1': '2020-06-18', 'date_2': '0000-00-00', 'oem_code': '65'}  # Airios RF Bridge, set for ClimaRad oem 65
 
 
 ####################################################################################################
-# 2. The handshake - faked in ramses_rf (NB: FAN|W|1FC9|00):
-# actual remote 1FC9 packet gets no response. Ventura is known to only bind to a CO2 sensor
+# 2A. The handshake - Ventura/slave to RF Bridge (oem 65)
+# Ventura in binding mode: press 2 buttons above Auto for 4 secs > flashing red symbol
+# RF Bridge only active after 15 minutes power on (firmware update period)
+2025-08-17T15:43:38.086338 064  I --- 18:154951 --:------ 18:154951 1FC9 018 0022F44A5D476510E04A5D47001FC94A5D47              # {'phase': 'offer', 'bindings': [['00', '22F4', '18:154951'], ['65', '10E0', '18:154951'], ['00', '1FC9', '18:154951']]}
+
+2025-08-17T15:43:39.118990 061  W --- 37:153226 18:154951 --:------ 1FC9 012 0031D996568A00230996568A                          # {'phase': 'accept', 'bindings': [['00', '31D9', '37:153226'], ['00', '2309', '37:153226']]}
+# system sync from bridge, unrelated?:
+2025-08-17T15:44:55.418472 061  I --- 18:154951 --:------ 18:154951 1F09 003 0006B3                                            # {}
+# second 1FC9 from slave
+2025-08-17T15:46:04.045829 060  I --- 37:153226 --:------ 37:153226 1FC9 030 0031D996568A0031E096568A002E1096568A6510E096568A001FC996568A  # {}
+
+# A subsequent slave|I|10E0 *is required* for a successful bind???:
+2025-08-17T15:46:40.363292 059  I --- 37:153226 63:262142 --:------ 10E0 038 000001C8830C0A65FEFFFFFFFFFF110C07E4564D442D30375250533133000000000000000000  # {'oem_code': '65', 'manufacturer_sub_id': 'C8', 'product_id': '83', 'date_1': '2020-12-17', 'date_2': '0000-00-00', 'description': 'VMD-07RPS13'}
+
+
+# 2B. The handshake - REM faked in ramses_rf to Ventura (NB: FAN|W|1FC9|00):
+# actual REM 1FC9 packet gets no response. Ventura is known to only bind to a CO2 sensor or an RF Bridge (oem 65)
 2024-11-09T18:33:29.744238 ...  I --- 29:123160 --:------ 29:123160 1FC9 018 0022F175E1180010E075E118001FC975E118
 # extended 1FC9. Added 1298 and 22F4, got response from HRU
 2024-11-09T18:32:41.837359 000  I --- 29:123160 --:------ 29:123160 1FC9 024 00129875E1180022F175E1180022F475E118001FC975E118  # {}

{ramses_rf-0.51.3 → ramses_rf-0.51.4}/tests/tests/parsers/code_042f.log

@@ -9,6 +9,9 @@
 2024-01-01T12:00:00.000000 ---  I --- 32:168090 --:------ 32:168090 042F 009 000000100F00105050
 2024-01-01T12:00:00.000000 ---  I --- 32:166025 --:------ 32:166025 042F 009 00050E0B0C00111470
 
+# Airios RF Bridge BRDG-02R13
+2025-08-22T01:24:57.744252 058  I --- 18:154951 --:------ 18:154951 042F 009 0003020B0B000F0000  # {'counter_1': '0x0302', 'counter_3': '0x0B0B', 'counter_5': '0x000F', 'unknown_7': '0x0000'}
+
 
 ### HVAC, see: https://github.com/ramses-rf/ramses_rf/pull/135
 

{ramses_rf-0.51.3 → ramses_rf-0.51.4}/tests/tests/parsers/code_10e0.log

@@ -100,6 +100,7 @@
 2022-11-03T22:50:34.060486 ...  I --- 37:255297 63:262142 --:------ 10E0 038 00000100290A0201FFFFFFFFFFFF140407E5564D532D31324842313600000000000000000000  # {'description': 'VMS-12HB16',          'manufacturer_sub_id': '00', 'product_id': '29', 'date_2': '0000-00-00', 'date_1': '2021-04-20', 'oem_code': '01'}  #
 
 # oem_code '65' - ClimaRad HVAC
+2025-08-22T01:24:57.945961 058  I --- 18:154951 63:262142 --:------ 10E0 038 000001C8490F0065FEFEFFFFFFFF120607E4425244472D303252313300000000000000000000  # {'description': 'BRDG-02R13',          'manufacturer_sub_id': 'C8', 'product_id': '49', 'date_1': '2020-06-18', 'date_2': '0000-00-00', 'oem_code': '65'}  # Airios RF Bridge, set for ClimaRad oem 65
 2024-10-09T11:50:24.287879 123  I --- 37:153226 63:262142 --:------ 10E0 038 000001C8830C0A65FEFFFFFFFFFF110C07E4564D442D30375250533133000000000000000000  # {'description': 'VMD-07RPS13',         'manufacturer_sub_id': 'C8', 'product_id': '83', 'date_1': '2020-12-17', 'date_2': '0000-00-00', 'oem_code': '65'}  # ClimaRad VenturaV1x
 2024-10-16T18:43:52.761437 087  I --- 29:099029 63:262142 --:------ 10E0 029 000001C81D150765FFFFFFFFFFFFFFFFFFFF564D432D30375250303100                    # {'description': 'VMC-07RP01',          'manufacturer_sub_id': 'C8', 'product_id': '1D', 'date_1': '0000-00-00', 'date_2': '0000-00-00', 'oem_code': '65'}  # ClimaRad MiniBox Fan
 2024-10-16T21:32:07.084793 073  I --- 29:123150 63:262142 --:------ 10E0 029 000001C8410D0165FFFFFFFFFFFF0D0407DF564D4E2D30374C4D303100                    # {'description': 'VMN-07LM01',          'manufacturer_sub_id': 'C8', 'product_id': '41', 'date_1': '2015-04-13', 'date_2': '0000-00-00', 'oem_code': '65'}  # ClimaRad 4-button remote

ramses_rf-0.51.4/tests/tests/parsers/code_1f09.log

@@ -0,0 +1,4 @@
+# system sync
+
+# Airios RF Bridge
+2025-08-17T15:44:55.418472 061  I --- 18:154951 --:------ 18:154951 1F09 003 0006B3  # {'remaining_seconds': 171.5, '_next_sync': '15:47:46'}

{ramses_rf-0.51.3 → ramses_rf-0.51.4}/tests/tests/parsers/code_1fc9.log

@@ -123,3 +123,5 @@
 2024-11-09T18:33:29.759645 ...  W --- 37:153226 29:123160 --:------ 1FC9 012 0031D996568A00230996568A                          # {'phase': 'accept', 'bindings': [['00', '31D9', '37:153226'], ['00', '2309', '37:153226']]}  # 2309 reports a constant , set?
 2024-11-09T18:33:29.763814 ...  I --- 29:123160 37:153226 --:------ 1FC9 001 00                                                # {'phase': 'confirm', 'bindings': [['00']]}
 2024-11-11T14:36:41.745628 ...  I --- 29:123160 37:153226 --:------ 1FC9 006 001FC975E118                                      # {'phase': 'confirm', 'bindings': [['00', '1FC9', '29:123160']]} # made up by ramses_rf, config was "21"
+# ClimaRad Ventura V1x reply binding to RF Bridge
+2025-08-17T14:36:00.000000 ...  I --- 37:153226 --:------ 37:153226 1FC9 030 0031D996568A0031E096568A002E1096568A6510E096568A001FC996568A  # {'phase': 'offer', 'bindings': [['00', '31D9', '37:153226'], ['00', '31E0', '37:153226'], ['00', '2E10', '37:153226'], ['65', '10E0', '37:153226'], ['00', '1FC9', '37:153226']]}

{ramses_rf-0.51.3 → ramses_rf-0.51.4}/tests/tests/parsers/code_2210.log

@@ -15,3 +15,7 @@
 
 # Orcon RF15 control unit (log from remyderuysscher via ramses_cc issue 65)
 2022-06-26T00:00:00.000001 ... RP --- 32:155021 18:071957 --:------ 2210 042 00FF00FFFFFF0000000000FFFFFFFFFF00FFFFFF0000000000FFFFFFFFFFFFFFFF000000000000020800  # {'unknown_10': 'FF', 'unknown_20': '00', 'unknown_78': '02', 'unknown_80': '08', 'unknown_82': '00'}
+# Orcon HRC-400-EcoMax (log from AbeltjeNL via ramses_rf issue 247) unknown_10=64 when showering/auto, normally=FF
+2025-08-19T19:39:30.000000 074 RP --- 32:139370 18:025584 --:------ 2210 042 00FF00FFFF640000000003FFFFFFFFFF00FFFF640000000003FFFFFFFFFFFFFFFF000000000000000800  # {'unknown_10': '64', 'unknown_20': '03', 'unknown_78': '00', 'unknown_80': '08', 'unknown_82': '00'}
+2025-08-19T19:39:30.910438 074 RP --- 32:139370 18:025584 --:------ 2210 042 00FF00FFFFFF0000000000FFFFFFFFFF00FFFFFF0000000000FFFFFFFFFFFFFFFF000000000000000800  # {'unknown_10': 'FF', 'unknown_20': '00', 'unknown_78': '00', 'unknown_80': '08', 'unknown_82': '00'}
+2025-08-19T20:09:31.032118 074 RP --- 32:139370 18:025584 --:------ 2210 042 00FF00FFFFFF0000000000FFFFFFFFFF00FFFFFF0000000000FFFFFFFFFFFFFFFF000000000000000800  # {'unknown_10': 'FF', 'unknown_20': '00', 'unknown_78': '00', 'unknown_80': '08', 'unknown_82': '00'}