Merge branch 'master' of https://github.com/zxdavb/ramses_rf into eb-…

…31d9
zxdavb · Nov 3, 2024 · 58b8510 · 58b8510
2 parents 8639cfa + aa742c0
commit 58b8510
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/src/ramses_tx/ramses.py b/src/ramses_tx/ramses.py
@@ -566,12 +566,12 @@
         SZ_NAME: "fan_demand",
         I_: r"^00([0-9A-F]{4}){1,3}(00|FF)?$",
     },
-    Code._3200: {  # boiler output temp
+    Code._3200: {  # boiler (or CV?) output temp
         SZ_NAME: "boiler_output",
+        I_: r"^00[0-9A-F]{4}$",
         RQ: r"^00$",
-        RP: r"^00[0-9A-F]{4}$",
     },
-    Code._3210: {  # boiler return temp
+    Code._3210: {  # boiler (or CV?) return temp
         SZ_NAME: "boiler_return",
         RQ: r"^00$",
         RP: r"^00[0-9A-F]{4}$",
@@ -661,7 +661,7 @@
 CODE_NAME_LOOKUP = {k: v["name"] for k, v in CODES_SCHEMA.items()}
 
 
-for code in CODES_SCHEMA.values():  # map any RPs to (missing) I_s
+for code in CODES_SCHEMA.values():  # map any (missing) RPs to I_s
     if RQ in code and RP not in code and I_ in code:
         code[RP] = code[I_]
 #
@@ -1074,6 +1074,7 @@
         Code._31D9: {I_: {}, RP: {}},
         Code._31DA: {I_: {}, RP: {}},
         # Code._31E0: {I_: {}},
+        Code._3200: {I_: {}},
     },
     DevType.CO2: {
         Code._042F: {I_: {}},

diff --git a/tests/tests/parsers/code_22f2.log b/tests/tests/parsers/code_22f2.log
@@ -6,3 +6,9 @@
 # Vasco HRU D60
 2024-10-15T12:32:31.600425 000 RQ --- 18:130140 32:022222 --:------ 22F2 001 00            # {}
 2024-10-15T12:32:31.615141 082 RP --- 32:022222 18:130140 --:------ 22F2 006 000000010000  # [{'hvac_idx': '00', 'measure': 0.00}, {'hvac_idx': '01', 'measure': 0.00}]
+
+2024-10-18T14:49:18.332227 ... RP --- 32:022222 18:130140 --:------ 22F2 006 000000010000  # [{'hvac_idx': '00', 'measure': 0.00}, {'hvac_idx': '01', 'measure': 0.00}]
+2024-10-18T14:49:43.924873 ...  I 046 37:153226 --:------ 37:153226 31D9 017 000AFF0020202020202020202020202000  # {'hvac_id': '00', 'exhaust_fan_speed': None, 'fan_mode': 'FF', 'passive': True, 'damper_only': False, 'filter_dirty': False, 'frost_cycle': False, 'has_fault': False, '_flags': [0, 0, 0, 0, 1, 0, 1, 0], '_unknown_3': '00', '_unknown_4': '202020202020202020202020', 'unknown_16': '00', 'seqx_num': '046'}
+
+2024-10-18T14:50:50.594789 ... RP --- 32:022222 18:130140 --:------ 22F2 006 000000010000  # [{'hvac_idx': '00', 'measure': 0.00}, {'hvac_idx': '01', 'measure': 0.00}]
+2024-10-18T14:51:12.933458 ...  I --- 32:022222 --:------ 32:022222 31DA 030 00EF007FFFEFEF087008210841086EA800EF0232320000EF0004C6027E00  # {'hvac_id': '00', 'exhaust_fan_speed': 0.25, 'fan_info': 'speed 2, medium', '_unknown_fan_info_flags': [0, 0, 0], 'air_quality': None, 'co2_level': None, 'indoor_humidity': None, 'outdoor_humidity': None, 'exhaust_temp': 21.6, 'supply_temp': 20.81, 'indoor_temp': 21.13, 'outdoor_temp': 21.58, 'speed_capabilities': ['off', 'timer', 'auto'], 'bypass_position': None, 'supply_fan_speed': 0.25, 'remaining_mins': 0, 'post_heat': None, 'pre_heat': 0.0, 'supply_flow': 12.22, 'exhaust_flow': 6.38}
diff --git a/tests/tests/parsers/code_3200.log b/tests/tests/parsers/code_3200.log
@@ -1,6 +1,9 @@
+# boiler (or circulating volume) output temperature
+#
 
 2022-02-03T10:42:42.814255 ... RQ --- 18:132629 10:124973 --:------ 3200 001 00          # {}
 2022-02-03T10:42:42.838421 ... RP --- 10:124973 18:132629 --:------ 3200 003 001873      # {'temperature': 62.59}
 
-# contrived...
-2022-02-03T00:00:00.000000 ... RP --- 10:124973 18:132629 --:------ 3200 003 007FFF      # {'temperature': None}
+
+# sent by ClimaRad Ventura V1x
+2024-10-01T00:00:00.000000 064  I --- 37:153226 --:------ 37:153226 3200 003 007FFF      # {'temperature': None}