REM bindings minibox and vasco fans

zxdavb · Nov 7, 2024 · 160494d · 160494d
1 parent aa742c0
commit 160494d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/src/ramses_tx/parsers.py b/src/ramses_tx/parsers.py
@@ -1288,12 +1288,12 @@ def parser_1fc9(payload: str, msg: Message) -> PayDictT._1FC9:
     def _parser(seqx: str) -> list[str]:
         if seqx[:2] not in ("90",):
             assert (
-                seqx[6:] == payload[6:12]
+                seqx[6:] == payload[6:12]  # [6:12] is repeated
             ), f"{seqx[6:]} != {payload[6:12]}"  # all with same controller
         if seqx[:2] not in (
             "21",  # HVAC, Nuaire
             "63",  # HVAC
-            "66",  # HVAC, Vasco?
+            "66",  # HVAC, Vasco
             "67",  # HVAC
             "6C",  # HVAC
             "90",  # HEAT

diff --git a/src/ramses_tx/ramses.py b/src/ramses_tx/ramses.py
@@ -344,9 +344,6 @@
         W_: r"^00[0-9A-F]{30}$",
     },
     Code._1FC9: {  # rf_bind
-        # RP --- 13:035462 18:013393 --:------ 1FC9 018 00-3EF0-348A86 00-11F0-348A86 90-3FF1-956ABD  # noqa: E501
-        # RP --- 13:035462 18:013393 --:------ 1FC9 018 00-3EF0-348A86 00-11F0-348A86 90-7FE1-DD6ABD  # noqa: E501
-        # RP --- 01:145038 18:013393 --:------ 1FC9 012 FF-10E0-06368E FF-1FC9-06368E
         SZ_NAME: "rf_bind",  # idx-code-dev_id
         RQ: r"^00$",
         RP: r"^((0[0-9A-F]|F[69ABCF]|[0-9A-F]{2})([0-9A-F]{10}))+$",

diff --git a/tests/tests/parsers/code_1fc9.log b/tests/tests/parsers/code_1fc9.log
@@ -1,5 +1,8 @@
 ########################################################################################
 ### Heat domain ###
+# RP --- 13:035462 18:013393 --:------ 1FC9 018 00-3EF0-348A86 00-11F0-348A86 90-3FF1-956ABD  # noqa: E501
+# RP --- 13:035462 18:013393 --:------ 1FC9 018 00-3EF0-348A86 00-11F0-348A86 90-7FE1-DD6ABD  # noqa: E501
+# RP --- 01:145038 18:013393 --:------ 1FC9 012 FF-10E0-06368E FF-1FC9-06368E
 
 # CTL binding to an OTB (FC|0008, FC|3150, FB|3150, FC|1FC9): : Domain id FB|3150 (+FC)
 2020-11-23T14:35:23.043166 045  I --- 01:078710 --:------ 01:078710 1FC9 024 FC0008053376FC3150053376FB3150053376FC1FC9053376  # {'phase': 'offer',   'bindings': [['FC', '0008', '01:078710'], ['FC', '3150', '01:078710'], ['FB', '3150', '01:078710'], ['FC', '1FC9', '01:078710']]}
@@ -70,7 +73,6 @@
 2022-01-07T14:48:48.604387 ...  W --- 30:248208 01:054173 --:------ 1FC9 012 0010E07BC9900012907BC990                          # {'phase': 'accept',  'bindings': [['00', '10E0', '30:248208'], ['00', '1290', '30:248208']]}
 2022-01-07T14:48:48.769229 ...  I --- 01:054173 30:248208 --:------ 1FC9 006 00FFFF04D39D                                      # {'phase': 'confirm', 'bindings': [['00', 'FFFF', '01:054173']]}
 
-
 # The first BDR91 (which has a 3B00 in the payload) is the TPI relay (it turns the boiler on/off), the 2nd is not.
 2020-01-01T20:32:58.273000 ... RQ --- 18:013393 13:237335 --:------ 1FC9 001 00
 2020-01-01T20:32:58.297000 ... RP --- 13:237335 18:013393 --:------ 1FC9 012 003EF0379F17003B00379F17
@@ -99,3 +101,13 @@
 2022-08-17T19:32:32.785062 ...  I --- 37:155617 --:------ 37:155617 1FC9 024 0022F1965FE10022F3965FE16710E0965FE1001FC9965FE1  # {'phase': 'offer',   'bindings': [['00', '22F1', '37:155617'], ['00', '22F3', '37:155617'], ['67', '10E0', '37:155617'], ['00', '1FC9', '37:155617']]}
 2022-08-17T19:32:34.825700 ...  W --- 32:155617 37:155617 --:------ 1FC9 012 0031D9825FE10031DA825FE1                          # {'phase': 'accept',  'bindings': [['00', '31D9', '32:155617'], ['00', '31DA', '32:155617']]}
 2022-08-17T19:32:35.418914 ...  I --- 37:155617 32:155617 --:------ 1FC9 001 00                                                # {'phase': 'confirm', 'bindings': [['00']]}
+
+# Vasco remote binding to a D60 HRU FAN (31D9/A)
+2024-11-07T14:39:29.639500 072  I --- 29:091138 --:------ 29:091138 1FC9 024 0022F17564020022F37564026610E0756402001FC9756402  # {'phase': 'offer', 'bindings': [['00', '22F1', '29:091138'], ['00', '22F3', '29:091138'], ['66', '10E0', '29:091138'], ['00', '1FC9', '29:091138']]}
+2024-11-07T14:39:29.687203 083  W --- 32:022222 29:091138 --:------ 1FC9 012 0031D98056CE0031DA8056CE                          # {'phase': 'accept', 'bindings': [['00', '31D9', '32:022222'], ['00', '31DA', '32:022222']]}
+2024-11-07T14:39:29.693284 071  I --- 29:091138 32:022222 --:------ 1FC9 001 00                                                # {'phase': 'confirm', 'bindings': [['00']]}
+
+# ClimaRad remote binding to a ClimaRad MiniBox FAN (0001/)
+2024-11-07T19:32:38.578052 ...  I --- 29:123160 --:------ 29:123160 1FC9 012 0031D975E118001FC975E118                          # {'phase': 'offer', 'bindings': [['00', '31D9', '29:123160'], ['00', '1FC9', '29:123160']]}
+2024-11-07T13:01:37.338144 090  W --- 29:099029 29:123150 --:------ 1FC9 006 0031D97582D5                                      # {'phase': 'accept', 'bindings': [['00', '31D9', '29:099029']]}
+2024-11-07T13:01:37.355235 092  I --- 29:123150 29:099029 --:------ 1FC9 001 00                                                # {'phase': 'confirm', 'bindings': [['00']]}