diff --git a/src/ramses_tx/parsers.py b/src/ramses_tx/parsers.py index 5cef9bd2..e746682f 100644 --- a/src/ramses_tx/parsers.py +++ b/src/ramses_tx/parsers.py @@ -1363,15 +1363,11 @@ def parser_1fd4(payload: str, msg: Message) -> PayDictT._1FD4: # WIP: unknown, HVAC def parser_2210(payload: str, msg: Message) -> dict[str, Any]: - # RP --- 32:153258 18:005904 --:------ 2210 042 00FF 00FFFFFF0000000000FFFFFFFFFF 00FFFFFF0000000000FFFFFFFFFF FFFFFF000000000000000800 - # RP --- 32:153258 18:005904 --:------ 2210 042 00FF 00FFFF960000000003FFFFFFFFFF 00FFFF960000000003FFFFFFFFFF FFFFFF000000000000000800 - # RP --- 32:139773 18:072982 --:------ 2210 042 00FF 00FFFFFF0000000000FFFFFFFFFF 00FFFFFF0000000000FFFFFFFFFF FFFFFF000000000000020800 - - assert payload in ( - "00FF" + "00FFFFFF0000000000FFFFFFFFFF" * 2 + "FFFFFF000000000000000800", - ), _INFORM_DEV_MSG - - return {} + return { + "unknown_78": payload[78:80], + "unknown_80": payload[80:82], + "unknown_82": payload[82:], + } # now_next_setpoint - Programmer/Hometronics diff --git a/src/ramses_tx/ramses.py b/src/ramses_tx/ramses.py index afa951ab..a5752ae5 100644 --- a/src/ramses_tx/ramses.py +++ b/src/ramses_tx/ramses.py @@ -366,10 +366,10 @@ SZ_NAME: "opentherm_sync", I_: r"^00([0-9A-F]{4})$", }, - Code._2210: { # unknown_2210, HVAC, NB: no I + Code._2210: { # unknown_2210, HVAC, SZ_NAME: "unknown_2210", + I_: r"^00[0-9A-F]{82}$", RQ: r"^00$", - RP: r"^00[0-9A-F]{82}$", }, Code._2249: { # setpoint_now? SZ_NAME: "setpoint_now", # setpt_now_next diff --git a/tests/tests/parsers/code_2210.log b/tests/tests/parsers/code_2210.log index 23f9df49..27f015bc 100644 --- a/tests/tests/parsers/code_2210.log +++ b/tests/tests/parsers/code_2210.log @@ -1,5 +1,9 @@ -# HVAC - not well understood -- system with Orcon HRC 425 SmartComfort +# HVAC - not well understood -2023-11-12T00:00:11.000000 ... RP --- 32:153258 18:005904 --:------ 2210 042 00FF00FFFFFF0000000000FFFFFFFFFF00FFFFFF0000000000FFFFFFFFFFFFFFFF000000000000000800 -# 23-11-12T00:00:22.000000 ... RP --- 32:153258 18:005904 --:------ 2210 042 00FF00FFFF960000000003FFFFFFFFFF00FFFF960000000003FFFFFFFFFFFFFFFF000000000000000800 -# 23-11-12T00:00:33.000000 ... RP --- 32:139773 18:072982 --:------ 2210 042 00FF00FFFFFF0000000000FFFFFFFFFF00FFFFFF0000000000FFFFFFFFFFFFFFFF000000000000020800 +# system with Orcon HRC 425 SmartComfort +2023-11-12T00:00:11.000000 ... RP --- 32:153258 18:005904 --:------ 2210 042 00FF00FFFFFF0000000000FFFFFFFFFF00FFFFFF0000000000FFFFFFFFFFFFFFFF000000000000000800 # {'unknown_78': '00', 'unknown_80': '08', 'unknown_82': '00'} +2023-11-12T00:00:22.000000 ... RP --- 32:153258 18:005904 --:------ 2210 042 00FF00FFFF960000000003FFFFFFFFFF00FFFF960000000003FFFFFFFFFFFFFFFF000000000000000800 # {'unknown_78': '00', 'unknown_80': '08', 'unknown_82': '00'} +2023-11-12T00:00:33.000000 ... RP --- 32:139773 18:072982 --:------ 2210 042 00FF00FFFFFF0000000000FFFFFFFFFF00FFFFFF0000000000FFFFFFFFFFFFFFFF000000000000020800 # {'unknown_78': '02', 'unknown_80': '08', 'unknown_82': '00'} + +# ClimaRad Ventura V1x +2024-10-20T00:00:00.000000 ... I --- 37:153226 --:------ 37:153226 2210 042 00FF00FFFFFF0000000000FFFFFFFFFF00FFFFFF0000000000FFFFFFFFFFFFFFFF000000000000000140 # {'unknown_78': '00', 'unknown_80': '01', 'unknown_82': '40'}