ramses-rf 0.51.6__py3-none-any.whl → 0.51.7__py3-none-any.whl

ramses_rf/helpers.py

@@ -67,7 +67,7 @@ def shrink(
     """Return a minimized dict, after removing all the meaningless items.
 
     Specifically, removes items with:
-    - uwanted keys (starting with '_')
+    - unwanted keys (starting with '_')
     - falsey values
     """
 

ramses_rf/version.py

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

{ramses_rf-0.51.6.dist-info → ramses_rf-0.51.7.dist-info}/METADATA

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

@@ -12,10 +12,10 @@ ramses_rf/dispatcher.py,sha256=JGkqSi1o-YhQ2rj8tNkXwYLLeJIC7F061xpHoH8sSsM,11201
 ramses_rf/entity_base.py,sha256=V9m_Q5SOLP5ko3sok0NDvyz3YdYch1QsxM6tHCIE7cA,39212
 ramses_rf/exceptions.py,sha256=rzVZDcYxFH7BjUAQ3U1fHWtgBpwk3BgjX1TO1L1iM8c,2538
 ramses_rf/gateway.py,sha256=WdIIGgs87CYfXwSCSVb2YzqOgLC7W4bkpulWQb7PFNw,20564
-ramses_rf/helpers.py,sha256=LcrVLqnF2qJWqXrC7UXKOQE8khCT3OhoTpZ_ZVBjw3A,4249
+ramses_rf/helpers.py,sha256=TNk_QkpIOB3alOp1sqnA9LOzi4fuDCeapNlW3zTzNas,4250
 ramses_rf/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ramses_rf/schemas.py,sha256=mYOUZOH5OIDNBxRM2vd8POzDWEEmLhxh5UtqjTpFNek,13287
-ramses_rf/version.py,sha256=QtONmxsLFzHSx9Z1ddbRf5_x-XAddalTD9dH8-naWpo,125
+ramses_rf/version.py,sha256=4EfbWfYC4nSL7JCP_xnhFTpV6Yt5Vc4kNosAUW-CKNs,125
 ramses_rf/device/__init__.py,sha256=sUbH5dhbYFXSoM_TPFRutpRutBRpup7_cQ9smPtDTy8,4858
 ramses_rf/device/base.py,sha256=WGkBTUNjRUEe-phxdtdiXVCZnTi6-i1i_YT6g689UTM,17450
 ramses_rf/device/heat.py,sha256=2sCsggySVcuTzyXDmgWy76QbhlU5MQWSejy3zgI5BDE,54242
@@ -33,23 +33,23 @@ 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=TXLYwT6tFpmSokD29Qyj1ze7UGCxKidooeyP557Jfoo,11266
-ramses_tx/helpers.py,sha256=0zIvMY2zZ5V52fDAyVGXxNBND1HI-9fBN3dlgDNKNyo,33040
-ramses_tx/logger.py,sha256=9xTxKVdZEoNZvvbjKSeKtMmlSzLhocTRW-61O6WpVsk,11397
+ramses_tx/helpers.py,sha256=0VAJ505kpq4K9b9ZeskWI1o2sWwyCbdnKOKZviKFdgY,32913
+ramses_tx/logger.py,sha256=qYbUoNPnPaFWKVsYvLG6uTVuPTdZ8HsMzBbGx0DpBqc,10177
 ramses_tx/message.py,sha256=hl_gLfwrF79ftUNnsgNt3XGsIhM2Pts0MtZZuGjfaxk,13169
 ramses_tx/opentherm.py,sha256=58PXz9l5x8Ou6Fm3y-R_UnGHCYahoi2RKIDdYStUMzk,42378
 ramses_tx/packet.py,sha256=NGunaGCkEjhTp9t4mARK5e7kbqT-Z_JKCH7ibMYMJXU,7357
-ramses_tx/parsers.py,sha256=ngKmZNFPp4k-HmpOtX8_zWnrjM4O68OzjqAOEMznHFE,109863
+ramses_tx/parsers.py,sha256=PVTbPqcYPUko3BKDaOQoFDwIo4LWAUx5kfRb2KURAMI,109917
 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=9R-JrInORWUNMPklrAPQWwtr_2aaruQmFqQPw5mFkrE,52223
 ramses_tx/schemas.py,sha256=h2AcArVROy1_C4n6F0Crj4e-2BxXxH74xogFlc6nKHI,12769
-ramses_tx/transport.py,sha256=aLpULRSivoJqzH8GDPRDcbehETOhFflEqmHbaniGLvg,56210
+ramses_tx/transport.py,sha256=MwPnkQ0L-2qJt4mIJy3-C9XmHwBDjT7Kg-1LthPByVw,58331
 ramses_tx/typed_dicts.py,sha256=w-0V5t2Q3GiNUOrRAWiW9GtSwbta_7luME6GfIb1zhI,10869
 ramses_tx/typing.py,sha256=eF2SlPWhNhEFQj6WX2AhTXiyRQVXYnFutiepllYl2rI,5042
-ramses_tx/version.py,sha256=Jvb0klvS67N7SxexepgSmtxSwb8sKcIR8MBBeUXTfSM,123
-ramses_rf-0.51.6.dist-info/METADATA,sha256=OzEjMdl75qcH3T8URoBIKgSNQKAualdYRRD8giwa034,3909
-ramses_rf-0.51.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ramses_rf-0.51.6.dist-info/entry_points.txt,sha256=NnyK29baOCNg8DinPYiZ368h7MTH7bgTW26z2A1NeIE,50
-ramses_rf-0.51.6.dist-info/licenses/LICENSE,sha256=-Kc35W7l1UkdiQ4314_yVWv7vDDrg7IrJfMLUiq6Nfs,1074
-ramses_rf-0.51.6.dist-info/RECORD,,
+ramses_tx/version.py,sha256=hWp2I2S7p1_tlItYBqDNAFpsM7kL_J8xYU-6mC2e_Ws,123
+ramses_rf-0.51.7.dist-info/METADATA,sha256=w3QiOIRJncgPc3R3h1MaxjMDOjzm0NYBHFEoeAr6o6A,3909
+ramses_rf-0.51.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ramses_rf-0.51.7.dist-info/entry_points.txt,sha256=NnyK29baOCNg8DinPYiZ368h7MTH7bgTW26z2A1NeIE,50
+ramses_rf-0.51.7.dist-info/licenses/LICENSE,sha256=-Kc35W7l1UkdiQ4314_yVWv7vDDrg7IrJfMLUiq6Nfs,1074
+ramses_rf-0.51.7.dist-info/RECORD,,

ramses_tx/helpers.py

@@ -470,7 +470,7 @@ def parse_valve_demand(
     if int(value, 16) & 0xF0 == 0xF0:
         return _faulted_device(SZ_HEAT_DEMAND, value)
 
-    result = int(value, 16) / 200  # c.f. hex_to_percentage
+    result = int(value, 16) / 200  # c.f. hex_to_percent
     if result == 1.01:  # HACK - does it mean maximum?
         result = 1.0
     elif result > 1.0:
@@ -606,12 +606,9 @@ def _parse_hvac_humidity(
     if int(value, 16) & 0xF0 == 0xF0:
         return _faulted_sensor(param_name, value)
 
-    percentage = int(value, 16) / 100  # TODO: confirm not 200
-    assert percentage <= 1.0, value  # TODO: raise exception if > 1.0?
+    percentage = hex_to_percent(value, False)  # TODO: confirm not /200
 
-    result: dict[str, float | str | None] = {
-        param_name: percentage
-    }  # was: percent_from_hex(value, high_res=False)
+    result: dict[str, float | str | None] = {param_name: percentage}
     if temp:
         result |= {SZ_TEMPERATURE: hex_to_temp(temp)}
     if dewpoint:
@@ -881,7 +878,7 @@ def _parse_fan_heater(param_name: str, value: HexStr2) -> Mapping[str, float | N
     if int(value, 16) & 0xF0 == 0xF0:
         return _faulted_sensor(param_name, value)  # type: ignore[return-value]
 
-    percentage = int(value, 16) / 200  # Siber DF EVO 2 is /200, not /100 (?Others)
+    percentage = int(value, 16) / 200  # Siber DF EVO 2 is /200, not /100 (Others?)
     assert percentage <= 1.0, value  # TODO: raise exception if > 1.0?
 
     return {param_name: percentage}  # was: percent_from_hex(value, high_res=False)

ramses_tx/logger.py

@@ -173,33 +173,6 @@ class TimedRotatingFileHandler(_TimedRotatingFileHandler):
     #         self.doRollover()
     #     return super().emit(record)
 
-    # To fix issue ramses_cc 293, test if this override is still required
-    # async def getFilesToDelete(self) -> list[str]:  # zxdavb: my version
-    #     """Determine the files to delete when rolling over.
-    #
-    #     Overridden as old log files were not being deleted.
-    #     """
-    #     # See bpo-44753 (this code is as was before that commit), bpo45628, bpo-46063
-    #     dirName, baseName = os.path.split(self.baseFilename)
-    #     loop = asyncio.get_running_loop()
-    #     # Must run async in executor to prevent HA blocking call on rollover (ramses_cc issue 293)
-    #     file_names = await loop.run_in_executor(None, os.listdir, dirName) < doesn't work
-    #
-    #     result = []
-    #     prefix = baseName + "."
-    #     plen = len(prefix)
-    #     for fileName in file_names:
-    #         if fileName[:plen] == prefix:
-    #             suffix = fileName[plen:]
-    #             if self.extMatch.match(suffix):
-    #                 result.append(os.path.join(dirName, fileName))
-    #     if len(result) < self.backupCount:
-    #         result = []
-    #     else:
-    #         result.sort()
-    #         result = result[: len(result) - self.backupCount]
-    #     return result
-
 
 def getLogger(  # permits a bespoke Logger class
     name: str | None = None, pkt_log: bool = False

ramses_tx/parsers.py

@@ -1648,21 +1648,17 @@ def parser_22f3(payload: str, msg: Message) -> dict[str, Any]:
         _LOGGER.warning(f"{msg!r} < {_INFORM_DEV_MSG} ({err})")
 
     new_speed = {  # from now, until timer expiry
-        0x00: "fan_boost",  # #    set fan off, or 'boost' mode?
-        0x01: "per_request",  # #  set fan as per payload[6:10]?
-        0x02: "per_vent_speed",  # set fan as per current fan mode/speed?
+        0x00: "fan_boost",  # set fan off, or 'boost' mode?
+        0x01: "per_request?",  # set fan as per payload[6:10]?
+        0x02: "per_request",  # set fan as per payload[6:10]
     }.get(int(payload[2:4], 0x10) & 0x07)  # 0b0000-0111
 
-    fallback_speed: str | None
-    if msg.len == 7 and payload[9:10] == "06":  # Vasco and ClimaRad REM
-        fallback_speed = "per_vent_speed"  # after timer expiry
-        # set fan as per current fan mode/speed
-    else:
-        fallback_speed = {  # after timer expiry
-            0x08: "fan_off",  # #      set fan off?
-            0x10: "per_request",  # #  set fan as per payload[6:10], or payload[10:]?
-            0x18: "per_vent_speed",  # set fan as per current fan mode/speed?
-        }.get(int(payload[2:4], 0x10) & 0x38)  # 0b0011-1000
+    fallback_speed = {  # after timer expiry
+        0x00: "per_vent_speed",  # set fan as per current fan mode
+        0x08: "fan_off",  # set fan off?
+        0x10: "per_request",  # set fan as per payload[10:14]
+        0x18: "per_vent_speed?",  # set fan as per current fan mode/speed?
+    }.get(int(payload[2:4], 0x10) & 0x38)  # 0b0011-1000
 
     units = {
         0x00: "minutes",
@@ -1677,15 +1673,21 @@ def parser_22f3(payload: str, msg: Message) -> dict[str, Any]:
         result = {
             "minutes" if units != "index" else "index": duration,
             "flags": hex_to_flag8(payload[2:4]),
-            "_new_speed_mode": new_speed,
-            "_fallback_speed_mode": fallback_speed,
+            "new_speed_mode": new_speed,
+            "fallback_speed_mode": fallback_speed,
         }
 
-    if msg.len >= 5 and payload[6:10] != "0000":  # new speed?
-        result["rate"] = parser_22f1(f"00{payload[6:10]}", msg).get("rate")
+    if msg._addrs[0] == NON_DEV_ADDR and msg.len <= 3:
+        result["_scheme"] = "itho"
+
+    if msg.len >= 5 and payload[6:10] != "0000":  # new speed
+        mode_info = parser_22f1(f"00{payload[6:10]}", msg)
+        result["_scheme"] = mode_info.get("_scheme")
+        result["fan_mode"] = mode_info.get("fan_mode")
 
-    if msg.len >= 7:  # fallback speed?
-        result.update({"_unknown_5": payload[10:]})
+    if msg.len >= 7 and payload[10:14] != "0000":  # fallback speed
+        mode_info = parser_22f1(f"00{payload[10:14]}", msg)
+        result["fallback_fan_mode"] = mode_info.get("fan_mode")
 
     return result
 

ramses_tx/transport.py

@@ -1033,6 +1033,8 @@ class MqttTransport(_FullTransport, _MqttTransportAbstractor):
         self._topic_base = validate_topic_path(self._broker_url.path)
         self._topic_pub = ""
         self._topic_sub = ""
+        # Track if we've subscribed to a wildcard data topic (e.g. ".../+/rx")
+        self._data_wildcard_topic = ""
 
         self._mqtt_qos = int(parse_qs(self._broker_url.query).get("qos", ["0"])[0])
 
@@ -1143,17 +1145,30 @@ class MqttTransport(_FullTransport, _MqttTransportAbstractor):
         # 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("/+"):
+        # Also subscribe to data topics with wildcard for reliability, but only
+        # until a specific device topic is known. Once _topic_sub is set, avoid
+        # overlapping subscriptions that would duplicate messages.
+        if self._topic_base.endswith("/+") and not (
+            hasattr(self, "_topic_sub") and self._topic_sub
+        ):
             data_wildcard = self._topic_base.replace("/+", "/+/rx")
             self.client.subscribe(data_wildcard, qos=self._mqtt_qos)
+            self._data_wildcard_topic = data_wildcard
             _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}")
+            # If we had a wildcard subscription, drop it to prevent duplicates
+            if getattr(self, "_data_wildcard_topic", ""):
+                try:
+                    self.client.unsubscribe(self._data_wildcard_topic)
+                    _LOGGER.debug(
+                        f"Unsubscribed data wildcard after specific subscribe: {self._data_wildcard_topic}"
+                    )
+                finally:
+                    self._data_wildcard_topic = ""
 
     def _on_connect_fail(
         self,
@@ -1225,6 +1240,17 @@ class MqttTransport(_FullTransport, _MqttTransportAbstractor):
 
         self.client.subscribe(self._topic_sub, qos=self._mqtt_qos)
 
+        # If we previously subscribed to a wildcard data topic, unsubscribe now
+        # to avoid duplicate delivery (wildcard and specific both matching)
+        if getattr(self, "_data_wildcard_topic", ""):
+            try:
+                self.client.unsubscribe(self._data_wildcard_topic)
+                _LOGGER.debug(
+                    f"Unsubscribed data wildcard after device online: {self._data_wildcard_topic}"
+                )
+            finally:
+                self._data_wildcard_topic = ""
+
         # Only call connection_made on first connection, not reconnections
         if not self._connection_established:
             self._connection_established = True
@@ -1295,6 +1321,21 @@ class MqttTransport(_FullTransport, _MqttTransportAbstractor):
                 self._connection_established = True
                 self._make_connection(gwy_id=gateway_id)  # type: ignore[arg-type]
 
+                # Ensure we subscribe specifically to the device topic and drop the
+                # wildcard subscription to prevent duplicates
+                try:
+                    self.client.subscribe(self._topic_sub, qos=self._mqtt_qos)
+                except Exception as err:  # pragma: no cover - defensive
+                    _LOGGER.debug(f"Error subscribing specific topic: {err}")
+                if getattr(self, "_data_wildcard_topic", ""):
+                    try:
+                        self.client.unsubscribe(self._data_wildcard_topic)
+                        _LOGGER.debug(
+                            f"Unsubscribed data wildcard after inferring device: {self._data_wildcard_topic}"
+                        )
+                    finally:
+                        self._data_wildcard_topic = ""
+
         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.6"
+__version__ = "0.51.7"
 VERSION = __version__