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

ramses_rf/const.py

@@ -61,6 +61,8 @@ from ramses_tx.const import (  # noqa: F401
     SZ_REMAINING_DAYS as SZ_REMAINING_DAYS,
     SZ_REMAINING_MINS as SZ_REMAINING_MINS,
     SZ_REMAINING_PERCENT as SZ_REMAINING_PERCENT,
+    SZ_REQ_REASON as SZ_REQ_REASON,
+    SZ_REQ_SPEED as SZ_REQ_SPEED,
     SZ_SCHEDULE as SZ_SCHEDULE,
     SZ_SENSOR as SZ_SENSOR,
     SZ_SETPOINT as SZ_SETPOINT,

ramses_rf/device/hvac.py

@@ -31,6 +31,8 @@ from ramses_rf.const import (
     SZ_REMAINING_DAYS,
     SZ_REMAINING_MINS,
     SZ_REMAINING_PERCENT,
+    SZ_REQ_REASON,
+    SZ_REQ_SPEED,
     SZ_SPEED_CAPABILITIES,
     SZ_SUPPLY_FAN_SPEED,
     SZ_SUPPLY_FLOW,
@@ -506,6 +508,18 @@ class HvacVentilator(FilterChange):  # FAN: RP/31DA, I/31D[9A]
     def remaining_mins(self) -> int | None:
         return self._msg_value(Code._31DA, key=SZ_REMAINING_MINS)
 
+    @property
+    def request_fan_speed(self) -> float | None:
+        return self._msg_value(Code._2210, key=SZ_REQ_SPEED)
+
+    @property
+    def request_src(self) -> str | None:
+        """
+        Orcon, others?
+        :return: source sensor of auto speed request: IDL, CO2 or HUM
+        """
+        return self._msg_value(Code._2210, key=SZ_REQ_REASON)
+
     @property
     def speed_cap(self) -> int | None:
         return self._msg_value(Code._31DA, key=SZ_SPEED_CAPABILITIES)

ramses_rf/dispatcher.py

@@ -91,7 +91,7 @@ def _create_devices_from_addrs(gwy: Gateway, this: Message) -> None:
     if not gwy.config.enable_eavesdrop:
         return
 
-    if not isinstance(this.dst, Device) and this.src is not gwy.hgi:  # type: ignore[unreachable]
+    if not isinstance(this.dst, Device) and this.src != gwy.hgi:  # type: ignore[unreachable]
         with contextlib.suppress(LookupError):
             this.dst = gwy.get_device(this.dst.id)  # type: ignore[assignment]
 
@@ -188,9 +188,9 @@ def process_msg(gwy: Gateway, msg: Message) -> None:
     def logger_xxxx(msg: Message) -> None:
         if _DBG_FORCE_LOG_MESSAGES:
             _LOGGER.warning(msg)
-        elif msg.src is not gwy.hgi or (msg.code != Code._PUZZ and msg.verb != RQ):
+        elif msg.src != gwy.hgi or (msg.code != Code._PUZZ and msg.verb != RQ):
             _LOGGER.info(msg)
-        elif msg.src is not gwy.hgi or msg.verb != RQ:
+        elif msg.src != gwy.hgi or msg.verb != RQ:
             _LOGGER.info(msg)
         elif _LOGGER.getEffectiveLevel() == logging.DEBUG:
             _LOGGER.info(msg)
@@ -215,7 +215,7 @@ def process_msg(gwy: Gateway, msg: Message) -> None:
         if (
             msg.src._SLUG != DevType.HGI  # avoid: msg.src.id != gwy.hgi.id
             and msg.verb != I_
-            and msg.dst is not msg.src
+            and msg.dst != msg.src
         ):
             # HGI80 can do what it likes
             # receiving an I isn't currently in the schema & so can't yet be tested
@@ -234,10 +234,10 @@ def process_msg(gwy: Gateway, msg: Message) -> None:
         # TODO: only be for fully-faked (not Fakable) dst (it picks up via RF if not)
 
         if msg.code == Code._1FC9 and msg.payload[SZ_PHASE] == SZ_OFFER:
-            devices = [d for d in gwy.devices if d is not msg.src and d._is_binding]
+            devices = [d for d in gwy.devices if d != msg.src and d._is_binding]
 
         elif msg.dst == ALL_DEV_ADDR:  # some offers use dst=63:, so after 1FC9 offer
-            devices = [d for d in gwy.devices if d is not msg.src and d.is_faked]
+            devices = [d for d in gwy.devices if d != msg.src and d.is_faked]
 
         elif msg.dst is not msg.src and isinstance(msg.dst, Fakeable):  # type: ignore[unreachable]
             # to eavesdrop pkts from other devices, but relevant to this device

ramses_rf/entity_base.py

@@ -387,7 +387,7 @@ class _MessageDB(_Entity):
         codes = {
             k: (CODES_SCHEMA[k][SZ_NAME] if k in CODES_SCHEMA else None)
             for k in sorted(self._msgs)
-            if self._msgs[k].src is (self if hasattr(self, "addr") else self.ctl)
+            if self._msgs[k].src == (self if hasattr(self, "addr") else self.ctl)
         }
 
         return {"_sent": list(codes.keys())}

ramses_rf/system/heat.py

@@ -193,19 +193,19 @@ class SystemBase(Parent, Entity):  # 3B00 (multi-relay)
                 this.code in (Code._22D9, Code._3220) and this.verb == RQ
             ):  # TODO: RPs too?
                 # dst could be an Address...
-                if this.src is self.ctl and isinstance(this.dst, OtbGateway):  # type: ignore[unreachable]
+                if this.src == self.ctl and isinstance(this.dst, OtbGateway):  # type: ignore[unreachable]
                     app_cntrl = this.dst  # type: ignore[unreachable]
 
             elif this.code == Code._3EF0 and this.verb == RQ:
                 # dst could be an Address...
-                if this.src is self.ctl and isinstance(
+                if this.src == self.ctl and isinstance(
                     this.dst,  # type: ignore[unreachable]
                     BdrSwitch | OtbGateway,
                 ):
                     app_cntrl = this.dst  # type: ignore[unreachable]
 
             elif this.code == Code._3B00 and this.verb == I_ and prev is not None:
-                if this.src is self.ctl and isinstance(prev.src, BdrSwitch):  # type: ignore[unreachable]
+                if this.src == self.ctl and isinstance(prev.src, BdrSwitch):  # type: ignore[unreachable]
                     if prev.code == this.code and prev.verb == this.verb:  # type: ignore[unreachable]
                         app_cntrl = prev.src
 

ramses_rf/system/zones.py

@@ -266,7 +266,7 @@ class DhwZone(ZoneSchedule):  # CS92A
         #     self._get_dhw(sensor=this.dst)
 
         assert (
-            msg.src is self.ctl
+            msg.src == self.ctl
             and msg.code in (Code._0005, Code._000C, Code._10A0, Code._1260, Code._1F41)
             or msg.payload.get(SZ_DOMAIN_ID) in (F9, FA)
             or msg.payload.get(SZ_ZONE_IDX) == "HW"
@@ -633,13 +633,13 @@ class Zone(ZoneSchedule):
                     self._update_schema(**{SZ_CLASS: ZON_ROLE_MAP[ZoneRole.UFH]})
 
             assert (
-                msg.src is self.ctl or msg.src.type == DEV_TYPE_MAP.UFC
+                msg.src == self.ctl or msg.src.type == DEV_TYPE_MAP.UFC
             ) and (  # DEX
                 isinstance(msg.payload, dict)
                 or [d for d in msg.payload if d.get(SZ_ZONE_IDX) == self.idx]
             ), f"msg inappropriately routed to {self}"
 
-        assert (msg.src is self.ctl or msg.src.type == DEV_TYPE_MAP.UFC) and (  # DEX
+        assert (msg.src == self.ctl or msg.src.type == DEV_TYPE_MAP.UFC) and (  # DEX
             isinstance(msg.payload, list)
             or msg.code == Code._0005
             or msg.payload.get(SZ_ZONE_IDX) == self.idx

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ramses_rf
-Version: 0.51.3
+Version: 0.51.5
 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.5.dist-info}/RECORD

@@ -6,50 +6,50 @@ ramses_cli/utils/cat_slow.py,sha256=AhUpM5gnegCitNKU-JGHn-DrRzSi-49ZR1Qw6lxe_t8,
 ramses_cli/utils/convert.py,sha256=D_YiCyX5na9pgC-_NhBlW9N1dgRKUK-uLtLBfofjzZM,1804
 ramses_rf/__init__.py,sha256=zONFBiRdf07cPTSxzr2V3t-b3CGokZjT9SGit4JUKRA,1055
 ramses_rf/binding_fsm.py,sha256=uZAOl3i19KCXqqlaLJWkEqMMP7NJBhVPW3xTikQD1fY,25996
-ramses_rf/const.py,sha256=DSo4ROWDlOlcdXQdrpAF17vOsTLgmf2u0UppjYa5qJI,5390
+ramses_rf/const.py,sha256=L3z31CZ-xqno6oZp_h-67CB_5tDDqTwSWXsqRtsjMcs,5460
 ramses_rf/database.py,sha256=6k5MLtK5Lplz8THfluQoQU-eniUkqSwEUMvVW7VyGhI,9880
-ramses_rf/dispatcher.py,sha256=b7Cg1vAP6FECC6GeZsJ0BZVqy-ZjJTXhZquzcwE87WI,11221
-ramses_rf/entity_base.py,sha256=vH4lmwXnylSM-1MWmat0_QRSNVCRi3iVhcqj9O41Pms,39602
+ramses_rf/dispatcher.py,sha256=L-XQ-mbE3HyyxExkhe5kfD4elKlGZnV0kHT4OHTWzE8,11197
+ramses_rf/entity_base.py,sha256=EaIyGIu3fU1Ks30jdqS69nYmcWRKXaWx81oBGDiaXGw,39602
 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/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=2CNEExhYqbwGxmDWyifsA3RubG0bCgN6a1NUTKnIfBM,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
-ramses_rf/device/hvac.py,sha256=QAlWx6jBArbHzZD5Mm1wZPmIbrQrw4ljbTDV0P4IH3I,23438
+ramses_rf/device/hvac.py,sha256=fRzFGQD6zrkii0Ns9EV1uqh8MTXHn2CO3LZ1WOXLjhs,23835
 ramses_rf/system/__init__.py,sha256=uZLKio3gLlBzePa2aDQ1nxkcp1YXOGrn6iHTG8LiNIw,711
 ramses_rf/system/faultlog.py,sha256=GdGmVGT3137KsTlV_nhccgIFEmYu6DFsLTn4S-8JSok,12799
-ramses_rf/system/heat.py,sha256=dARzcwL39JGwOBJkKJBi0_i7rr8IvY-qaNmWmgJLpdo,39223
+ramses_rf/system/heat.py,sha256=3jaFEChU-HlWCRMY1y7u09s7AH4hT0pC63hnqwdmZOc,39223
 ramses_rf/system/schedule.py,sha256=Ts6tdZPTQLV5NkgwA73tPa5QUsnZNIIuYoKC-8VsXDk,18808
-ramses_rf/system/zones.py,sha256=QwRtSHY5c-Amcs6JD16uQcimOsEQTZcMm1dW-pqEFqM,36041
+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=B2db8Yxks-lMNsQAK1DoPkF1gvwNIacLmKwXuApUyLk,30221
+ramses_tx/const.py,sha256=ILZvbIp9qI2ZTmGDDJ0YFoxOH3GtQ7g9MT3vAUtHWAE,30291
 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=WJ5JtAT9iyhkcW53AIPNPuvGEUWFwLumZc-mCG2kIOc,32236
+ramses_tx/helpers.py,sha256=qDJTsTU2tfSZrfJuFi1q29efkkHzqRtg85M6ItQH6qA,32247
 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=uwu_HsMjpsSyMYzoBpVnAxu2pqBJiQDL5ls8_B60V7c,109708
 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=aLpULRSivoJqzH8GDPRDcbehETOhFflEqmHbaniGLvg,56210
 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=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/const.py

@@ -88,6 +88,8 @@ SZ_REL_HUMIDITY: Final = "rel_humidity"
 SZ_REMAINING_DAYS: Final = "days_remaining"
 SZ_REMAINING_MINS: Final = "remaining_mins"
 SZ_REMAINING_PERCENT: Final = "percent_remaining"
+SZ_REQ_REASON: Final = "req_reason"
+SZ_REQ_SPEED: Final = "req_speed"
 SZ_SUPPLY_FAN_SPEED: Final = "supply_fan_speed"
 SZ_SUPPLY_FLOW: Final = "supply_flow"
 SZ_SUPPLY_TEMP: Final = "supply_temp"

ramses_tx/helpers.py

@@ -757,7 +757,7 @@ def parse_fan_info(value: HexStr2) -> PayDictT.FAN_INFO:
     }
 
 
-# 31DA[38:40]
+# 31DA[38:40], also 2210
 def parse_exhaust_fan_speed(value: HexStr2) -> PayDictT.EXHAUST_FAN_SPEED:
     """Return the exhaust fan speed (% of max speed)."""
     return _parse_fan_speed(SZ_EXHAUST_FAN_SPEED, value)  # type: ignore[return-value]

ramses_tx/parsers.py

@@ -72,6 +72,7 @@ from .const import (
     SZ_RELAY_DEMAND,
     SZ_REMAINING_DAYS,
     SZ_REMAINING_PERCENT,
+    SZ_REQ_REASON,
     SZ_SETPOINT,
     SZ_SETPOINT_BOUNDS,
     SZ_SYSTEM_MODE,
@@ -1378,29 +1379,42 @@ def parser_1fd4(payload: str, msg: Message) -> PayDictT._1FD4:
     return {"ticker": int(payload[2:], 16)}
 
 
-# WIP: unknown, HVAC
+# WIP: HVAC auto requests (confirmed for Orcon, others?)
 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 (
-            "58",
-            "96",
-            "FF",
-        ), f"expected (58|96|FF), not {payload[10:12]}"
+        assert payload[10:12] == payload[38:40], (
+            f"expected byte 19 {payload[10:12]}, not {payload[38:40]}"
+        )  # auto requested fan speed %. Identical [38:40] is for supply?
         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:]}"
+            "00",  # idle
+            "02",  # requested by CO2 level/sensor
+            "03",  # requested by humidity level/sensor
+        ), f"expected req_reason (00|02|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})")
 
+    _req = "IDL"
+    if payload[20:22] == "02":
+        _req = "CO2"
+    elif payload[20:22] == "03":
+        _req = "HUM"
+
     return {
-        "unknown_10": payload[10:12],
-        "unknown_20": payload[20:22],
+        **parse_exhaust_fan_speed(
+            payload[10:12]
+        ),  # for Orcon: 29 hex == 41 decimal divided by 2 gives 20.5 (%)
+        SZ_REQ_REASON: _req,
         "unknown_78": payload[78:80],
         "unknown_80": payload[80:82],
         "unknown_82": payload[82:],

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
@@ -1069,7 +1073,7 @@ class MqttTransport(_FullTransport, _MqttTransportAbstractor):
         self._connecting = True
         try:
             self.client.connect_async(
-                self._broker_url.hostname,  # type: ignore[arg-type]
+                str(self._broker_url.hostname or "localhost"),
                 self._broker_url.port or 1883,
                 60,
             )
@@ -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,
@@ -1155,19 +1172,36 @@ class MqttTransport(_FullTransport, _MqttTransportAbstractor):
         self,
         client: mqtt.Client,
         userdata: Any,
-        reason_code: Any,
-        properties: Any | None,
+        *args: Any,
+        **kwargs: Any,
     ) -> None:
-        _LOGGER.warning(f"MQTT disconnected: {reason_code.getName()}")
+        # Handle different paho-mqtt callback signatures
+        reason_code = args[0] if len(args) >= 1 else None
+
+        reason_name = (
+            reason_code.getName()
+            if reason_code is not None and hasattr(reason_code, "getName")
+            else str(reason_code)
+        )
+        _LOGGER.warning(f"MQTT disconnected: {reason_name}")
 
+        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
-            self._schedule_reconnect()
-        elif reason_code.is_failure and not self._closing:
-            # Connection failed, also schedule reconnection
+
+        if not self._closing:
+            # Schedule reconnection for any disconnect (unexpected or failure)
             self._schedule_reconnect()
 
     def _create_connection(self, msg: mqtt.MQTTMessage) -> None:
@@ -1191,7 +1225,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 +1250,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.5"
 VERSION = __version__