diff --git a/.github/workflows/publish-hatch.yml b/.github/workflows/publish-hatch.yml index 19855eb9b..cb0bff40e 100644 --- a/.github/workflows/publish-hatch.yml +++ b/.github/workflows/publish-hatch.yml @@ -36,7 +36,7 @@ jobs: run: python -m build - name: Publish package - uses: pypa/gh-action-pypi-publish@f7600683efdcb7656dec5b29656edb7bc586e597 + uses: pypa/gh-action-pypi-publish@fb13cb306901256ace3dab689990e13a5550ffaa with: user: __token__ password: ${{ secrets.PYPI_API_TOKEN }} diff --git a/src/ramses_rf/binding_fsm.py b/src/ramses_rf/binding_fsm.py index 2b7fe7a4b..1c94ee64c 100644 --- a/src/ramses_rf/binding_fsm.py +++ b/src/ramses_rf/binding_fsm.py @@ -89,9 +89,11 @@ class Vendor(StrEnum): + CLIMARAD = "climarad" ITHO = "itho" NUAIRE = "nuaire" ORCON = "orcon" + VASCO = "vasco" DEFAULT = "default" @@ -141,6 +143,8 @@ class BindRole(StrEnum): SCHEME_LOOKUP = { Vendor.ITHO: {"oem_code": "01"}, Vendor.NUAIRE: {"oem_code": "6C"}, + Vendor.CLIMARAD: {"oem_code": "65"}, + Vendor.VASCO: {"oem_code": "66"}, Vendor.ORCON: {"oem_code": "67", "offer_to": ALL_DEVICE_ID}, Vendor.DEFAULT: {"oem_code": None}, } diff --git a/src/ramses_tx/fingerprints.py b/src/ramses_tx/fingerprints.py index 8a53f891d..df1191858 100644 --- a/src/ramses_tx/fingerprints.py +++ b/src/ramses_tx/fingerprints.py @@ -43,15 +43,19 @@ "0001001B371B01FEFF": ("FAN", "37", "2019-08-29", "CVE-RF"), # . 31D9, 31DA "0001001B381B01FEFF": ("FAN", "37", "2020-02-14", "CVE-RF"), # . 31D9, 31DA (and I|042F, I|3120) "0001001B391B01FEFF": ("FAN", "37", "2021-11-04", "CVE-RF"), - "0001C81C090466FEFF": ("FAN", "29", "0000-00-00", "VMC-17RP01"), # . appears to be an EXT + "0001C8830C0A65FEFF": ("FAN", "37", "2020-12-17", "VMD-07RPS13"), # . ClimaRad VenturaV1x + "0001C81C090466FEFF": ("FAN", "29", "0000-00-00", "VMC-17RP01"), # . appears to be an EXT "0001C8260A0367FFFF": ("FAN", "29", "0000-00-00", "VMC-15RP01"), - "0001C8260D0467FFFF": ("FAN", "29", "0000-00-00", "VMC-15RP01"), # . 31D9 + "0001C8260D0467FFFF": ("FAN", "29", "0000-00-00", "VMC-15RP01"), # . 31D9 "0001C83A0F0866FFFF": ("FAN", "32", "0000-00-00", "VMD-17RPS01"), # . 31D9, 31DA "0001C85F0E0267FFFF": ("FAN", "32", "0000-00-00", "VMC-15RPS34"), # . Orcon MVS-15 "0001C87D130D67FEFF": ("FAN", "32", "2019-02-28", "VMD-15RMS64"), # . Orcon HRC-300-EcoMax "0001C87D140D67FEFF": ("FAN", "32", "2019-12-23", "VMD-15RMS64"), # . 31D9, 31DA (and I|042F) "0001C895050567FEFF": ("FAN", "32", "2020-07-01", "VMD-15RMS86"), # . 31DA, 12A0, 22F7, 2411 (and I|042F, I|313F, I|3120) "0001C8950B0A67FEFF": ("FAN", "32", "2021-01-21", "VMD-15RMS86"), # . 31D9, 31DA, 12A0, 313F (and I|042F, I|3120) + "0001C81D150765FFFF": ("FAN", "29", "0000-00-00", "VMC-07RP01"), # . ClimaRad MiniBox + "0001C83A190F66FFFF": ("FAN", "32", "0000-00-00", "VMD-17RPS01"), # . Vasco D60Vasco D60 + # PIV - usu. Nuaire "0001C90011006CFEFF": ("FAN", "30", "2016-09-09", "BRDG-02JAS01"), # . NOTE: 30: 31D9, 31DA, 1F09 (a PIV) "0001C9001D006CFEFE": ("FAN", "30", "2019-07-18", "BRDG-02JAS01"), # . 31D9 @@ -59,7 +63,7 @@ "00010028080101FEFF": ("CO2", "37", "2019-04-29", "VMS-12C39"), # . 1298, 31E0, 2E10, 3120, and I|22F1! "00010028090101FEFF": ("CO2", "37", "2021-01-20", "VMS-12C39"), # . 1298, 31E0, 2E10, 3120 (and I|042F) "0001C822030166FEFF": ("CO2", "29", "2015-05-07", "VMS-17C01"), # . 1298, 31E0 - "0001C822060166FEFF": ("CO2", "37", "2016-12-22", "VMS-17C01"), # . 1298, 31E0 + "0001C822060166FEFF": ("CO2", "37", "2016-12-22", "VMS-17C01"), # . 1298, 31E0 (Vasco RF includes REM buttons TODO) "0001C8500B0167FEFF": ("CO2", "29", "2017-03-09", "VMS-15C16"), # . CO2 sensor (no remote) "0001C85701016CFFFF": ("CO2", "32", "2016-06-17", "VMS-23C33"), # . 1298, 31E0 (and I|042F) # HUM @@ -70,6 +74,7 @@ "0001C827050167FFFF": ("REM", "29", "0000-00-00", "VMN-15LF01"), # . 22F1, 22F3 "0001C827070167FFFF": ("REM", "29", "0000-00-00", "VMN-15LF01"), # . 22F1, 22F3 "0001C827090167FFFF": ("REM", "29", "2019-02-13", "VMN-15LF01"), # . 22F1, 22F3 (and I|042F) + "0001C8400F0166FFFF": ("REM", "29", "2021-11-01", "VMN-17LMP01"), # . Vasco remote 4-way "0001C85901016CFFFF": ("REM", "32", "2016-05-31", "VMN-23LMH23"), # . zxdavb 22F1, 1060, 4-way? "0001C85A01016CFFFF": ("REM", "32", "2016-06-01", "VMN-23LMH23"), # . zxdavb 22F1, 1060, 4-way? # REM (display, or with CO2 sensor) @@ -118,7 +123,7 @@ def check_signature(dev_type: str, signature: str) -> None: # VMD - Heat recovery unit # VMC - Mechanical extraction: To integrate in a single fan system # VMI - User interface with display -# VMN - +# VMN - Remote # VMS - Sensors platform: CO2, humidity and temperature (and PIR?) # BRDG-02A55 - Fan of some description @@ -133,6 +138,7 @@ def check_signature(dev_type: str, signature: str) -> None: # VMC-15RP01 - Orcon unit (senseair.com) # VMC-17RP01 - Vasco C400RF (fan) +# VMD-07RPS13 - FAN - ClimaRad VenturaV1x # VMD-15RMS64 - FAN - Orcon HRC-350 (Ventiline) / Orcon MVS 15RHB # VMD-15RMS86 - # VMD-17RPS01 - @@ -141,6 +147,7 @@ def check_signature(dev_type: str, signature: str) -> None: # VMI-15MC01 - REM - Orcon 15RF with integrated CO2 # VMN-15LF01 - REM - Orcon 15RF 6 button remote +# VMN-17LMP01 - REM - Vasco 4 button remote (NL 2021) # VMN-23LM33 - REM? # VMN-23LMH23 - REM - 4 button RF Switch @@ -149,7 +156,7 @@ def check_signature(dev_type: str, signature: str) -> None: # VMS-15C16 - CO2 - CO2 Sensor (no remote) # VMS-12C39 - CO2 - CO2 Sensor, incl. integrated control, PIR? # VMS-15CM17 - CO2 - CO2 Sensor -# VMS-17C01 - +# VMS-17C01 - CO2 - CO2 Sensor, incl. integrated control Vasco # VMS-17HB01 - # VMS-23C33 - CO2 - CO2 Sensor (no PIR) (e.g. Nuaire DRI-ECO-CO2) # VMS-23HB33 - HUM - RH/Temp Sensor (e.g. Nuaire DRI-ECO-RH) diff --git a/src/ramses_tx/parsers.py b/src/ramses_tx/parsers.py index 98f2e532b..3f38fd97c 100644 --- a/src/ramses_tx/parsers.py +++ b/src/ramses_tx/parsers.py @@ -139,6 +139,7 @@ # - janvken: 10D0, 1470, 1F70, 22B0, 2411, several others # - tomkooij: 3110 # - RemyDeRuysscher: 10E0, 31DA (and related), others +# - silverailscolo: 12A0, 31DA, others from .const import ( # noqa: F401, isort: skip, pylint: disable=unused-import @@ -1288,12 +1289,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 index 07fdf6568..afa951ab2 100644 --- 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}))+$", @@ -566,12 +563,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 +658,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 +1071,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/fingerprints/10e0_xxxx.log b/tests/tests/fingerprints/10e0_xxxx.log index e3f2815d0..9a90ad423 100644 --- a/tests/tests/fingerprints/10e0_xxxx.log +++ b/tests/tests/fingerprints/10e0_xxxx.log @@ -280,3 +280,8 @@ 2022-07-04T14:35:13.010859 095 I --- 37:240038 63:262142 --:------ 10E0 038 0000010028040101FEFFFFFFFFFF030B07E0564D532D31324333390000000000000000000000 2021-07-01T04:44:33.312900 ... I --- 37:258565 63:262142 --:------ 10E0 038 0000010028080101FEFFFFFFFFFF1D0407E3564D532D31324333390000000000000000000000 2021-07-01T09:15:00.949226 083 I --- 37:261128 --:------ 37:261128 10E0 038 000001001B361B01FEFFFFFFFFFF0B0407E34356452D52460000000000000000000000000000 +2024-10-16T18:43:52.761437 087 I --- 29:099029 63:262142 --:------ 10E0 029 000001C81D150765FFFFFFFFFFFFFFFFFFFF564D432D30375250303100 # {'description': 'VMC-07RP01', 'manufacturer_sub_id': 'C8', 'product_id': '1D', 'date_1': '0000-00-00', 'date_2': '0000-00-00', 'oem_code': '65'} # ClimaRad MiniBox Fan +2024-10-09T11:50:24.287879 123 I --- 37:153226 63:262142 --:------ 10E0 038 000001C8830C0A65FEFFFFFFFFFF110C07E4564D442D30375250533133000000000000000000 # {'description': 'VMD-07RPS13', 'manufacturer_sub_id': 'C8', 'product_id': '83', 'date_1': '2020-12-17', 'date_2': '0000-00-00', 'oem_code': '65'} # ClimaRad Ventura V1x HRU +2024-10-15T21:01:19.293000 083 I --- 32:022222 63:262142 --:------ 10E0 030 000001C83A190F66FFFFFFFFFFFFFFFFFFFF564D442D3137525053303100 # {'description': 'VMD-17RPS01', 'manufacturer_sub_id': 'C8', 'product_id': '3A', 'date_1': '0000-00-00', 'date_2': '0000-00-00', 'oem_code': '66'} # Vasco D60 HRU +2024-10-04 22:24:58.581000 ... I --- 29:091138 63:262142 --:------ 10E0 038 000001C8400F0166FFFFFFFFFFFF0E0207E3564D4E2D31374C4D503031000000000000000000 # {'description': 'VMN-17LMP01', 'manufacturer_sub_id': 'C8', 'product_id': '40', 'date_1': '2019-02-14', 'date_2': '0000-00-00', 'oem_code': '66'} # Vasco 4 button RF remote +2024-10-09T11:51:49.472184 059 I --- 37:117647 63:262142 --:------ 10E0 038 000001C822060166FEFFFFFFFFFF160C07E0564D532D31374330310000000000000000000000 # {'description': 'VMS-17C01', 'manufacturer_sub_id': 'C8', 'product_id': '22', 'date_1': '2016-12-22', 'date_2': '0000-00-00', 'oem_code': '66'} # Vasco CO2 sensor diff --git a/tests/tests/fingerprints/hvac/29_VMC-07RP01.log b/tests/tests/fingerprints/hvac/29_VMC-07RP01.log new file mode 100644 index 000000000..a0c8b7e28 --- /dev/null +++ b/tests/tests/fingerprints/hvac/29_VMC-07RP01.log @@ -0,0 +1,2 @@ +# ClimaRad MiniBox Fan +2024-10-16T18:43:52.761437 087 I --- 29:099029 63:262142 --:------ 10E0 029 000001C81D150765FFFFFFFFFFFFFFFFFFFF564D432D30375250303100 # {'description': 'VMC-07RP01', 'manufacturer_sub_id': 'C8', 'product_id': '1D', 'date_1': '0000-00-00', 'date_2': '0000-00-00', 'oem_code': '65'} diff --git a/tests/tests/fingerprints/hvac/29_VMN-07LM01.log b/tests/tests/fingerprints/hvac/29_VMN-07LM01.log new file mode 100644 index 000000000..6a36e3530 --- /dev/null +++ b/tests/tests/fingerprints/hvac/29_VMN-07LM01.log @@ -0,0 +1,2 @@ +# ClimaRad 4-button remote +2024-10-16T21:32:07.084793 073 I --- 29:123150 63:262142 --:------ 10E0 029 000001C8410D0165FFFFFFFFFFFF0D0407DF564D4E2D30374C4D303100 # {'description': 'VMN-07LM01', 'manufacturer_sub_id': 'C8', 'product_id': '41', 'date_1': '2015-04-13', 'date_2': '0000-00-00', 'oem_code': '65'} diff --git a/tests/tests/fingerprints/hvac/29_VMN-17LMP01.log b/tests/tests/fingerprints/hvac/29_VMN-17LMP01.log new file mode 100644 index 000000000..2a989185e --- /dev/null +++ b/tests/tests/fingerprints/hvac/29_VMN-17LMP01.log @@ -0,0 +1,2 @@ +# Vasco 4 button RF remote +2024-10-04 22:24:58.581000 ... I --- 29:091138 63:262142 --:------ 10E0 038 000001C8400F0166FFFFFFFFFFFF0E0207E3564D4E2D31374C4D503031000000000000000000 # {'description': 'VMN-17LMP01', 'manufacturer_sub_id': 'C8', 'product_id': '40', 'date_1': '2019-02-14', 'date_2': '0000-00-00', 'oem_code': '66'} diff --git a/tests/tests/fingerprints/hvac/32_VMD-17RPS01.log b/tests/tests/fingerprints/hvac/32_VMD-17RPS01.log index 71d91255b..860999b7d 100644 --- a/tests/tests/fingerprints/hvac/32_VMD-17RPS01.log +++ b/tests/tests/fingerprints/hvac/32_VMD-17RPS01.log @@ -1,2 +1,3 @@ - -2021-11-08T07:02:27.941100 ... I --- 32:023459 63:262142 --:------ 10E0 030 000001C83A0F0866FFFFFFFFFFFFFFFFFFFF564D442D3137525053303100 +# Vasco D60 HRU +2021-11-08T07:02:27.941100 ... I --- 32:023459 63:262142 --:------ 10E0 030 000001C83A0F0866FFFFFFFFFFFFFFFFFFFF564D442D3137525053303100 # {'oem_code': '66', 'manufacturer_sub_id': 'C8', 'product_id': '3A', 'date_1': '0000-00-00', 'date_2': '0000-00-00', 'description': 'VMD-17RPS01'} +2024-10-15T21:01:19.293000 083 I --- 32:022222 63:262142 --:------ 10E0 030 000001C83A190F66FFFFFFFFFFFFFFFFFFFF564D442D3137525053303100 # {'oem_code': '66', 'manufacturer_sub_id': 'C8', 'product_id': '3A', 'date_1': '0000-00-00', 'date_2': '0000-00-00', 'description': 'VMD-17RPS01'} diff --git a/tests/tests/fingerprints/hvac/37_VMD-07RPS13.log b/tests/tests/fingerprints/hvac/37_VMD-07RPS13.log new file mode 100644 index 000000000..f0e865540 --- /dev/null +++ b/tests/tests/fingerprints/hvac/37_VMD-07RPS13.log @@ -0,0 +1,3 @@ +# ClimaRad Ventura V1x HRU + +2024-10-09T11:50:24.287879 123 I --- 37:153226 63:262142 --:------ 10E0 038 000001C8830C0A65FEFFFFFFFFFF110C07E4564D442D30375250533133000000000000000000 # {'description': 'VMD-07RPS13', 'manufacturer_sub_id': 'C8', 'product_id': '83', 'date_1': '2020-12-17', 'date_2': '0000-00-00', 'oem_code': '65'} diff --git a/tests/tests/fingerprints/hvac/99_VMS-17C01.log b/tests/tests/fingerprints/hvac/99_VMS-17C01.log index a627987d1..597193042 100644 --- a/tests/tests/fingerprints/hvac/99_VMS-17C01.log +++ b/tests/tests/fingerprints/hvac/99_VMS-17C01.log @@ -5,6 +5,9 @@ # CONFIRMED: 2023-02-18T19:56:43.537735 059 I --- 29:136571 63:262142 --:------ 10E0 038 000001C822030166FEFFFFFFFFFF070507DF564D532D31374330310000000000000000000000 # {"signature": "0001C822030166FEFF", "oem": "Vasco"} +2024-10-09T11:51:49.472184 059 I --- 37:117647 63:262142 --:------ 10E0 038 000001C822060166FEFFFFFFFFFF160C07E0564D532D31374330310000000000000000000000 # {'description': 'VMS-17C01', 'manufacturer_sub_id': 'C8', 'product_id': '22', 'date_1': '2016-12-22', 'date_2': '0000-00-00', 'oem_code': '66'} +# Vasco CO2 sensor with 1 touch button (cycles through speed steps) + # SUSPECTED: diff --git a/tests/tests/parsers/code_10e0.log b/tests/tests/parsers/code_10e0.log index 901016158..55a7fc5b4 100644 --- a/tests/tests/parsers/code_10e0.log +++ b/tests/tests/parsers/code_10e0.log @@ -99,10 +99,18 @@ 2023-10-26T00:00:00.000000 ... I --- 37:211856 --:------ 37:211856 10E0 038 000001001B391B01FEFFFFFFFFFF040B07E54356452D52460000000000000000000000000000 # {'description': 'CVE-RF', 'manufacturer_sub_id': '00', 'product_id': '1B', 'date_2': '0000-00-00', 'date_1': '2021-11-04', 'oem_code': '01'} # Manufacturer is Buva? 2022-11-03T22:50:34.060486 ... I --- 37:255297 63:262142 --:------ 10E0 038 00000100290A0201FFFFFFFFFFFF140407E5564D532D31324842313600000000000000000000 # {'description': 'VMS-12HB16', 'manufacturer_sub_id': '00', 'product_id': '29', 'date_2': '0000-00-00', 'date_1': '2021-04-20', 'oem_code': '01'} # -# oem_code '66' - Vasco CH/DHW & HVAC +# oem_code '65' - ClimaRad HVAC +2024-10-09T11:50:24.287879 123 I --- 37:153226 63:262142 --:------ 10E0 038 000001C8830C0A65FEFFFFFFFFFF110C07E4564D442D30375250533133000000000000000000 # {'description': 'VMD-07RPS13', 'manufacturer_sub_id': 'C8', 'product_id': '83', 'date_1': '2020-12-17', 'date_2': '0000-00-00', 'oem_code': '65'} # ClimaRad VenturaV1x +2024-10-16T18:43:52.761437 087 I --- 29:099029 63:262142 --:------ 10E0 029 000001C81D150765FFFFFFFFFFFFFFFFFFFF564D432D30375250303100 # {'description': 'VMC-07RP01', 'manufacturer_sub_id': 'C8', 'product_id': '1D', 'date_1': '0000-00-00', 'date_2': '0000-00-00', 'oem_code': '65'} # ClimaRad MiniBox Fan +2024-10-16T21:32:07.084793 073 I --- 29:123150 63:262142 --:------ 10E0 029 000001C8410D0165FFFFFFFFFFFF0D0407DF564D4E2D30374C4D303100 # {'description': 'VMN-07LM01', 'manufacturer_sub_id': 'C8', 'product_id': '41', 'date_1': '2015-04-13', 'date_2': '0000-00-00', 'oem_code': '65'} # ClimaRad 4-button remote + +# oem_code '66' - Vasco CH/DHW & HVAC 2023-02-19T11:37:59.549235 072 RP --- 29:079817 30:006056 --:------ 10E0 029 000001C81C090466FEFFFFFFFFFFFFFFFFFF564D432D31375250303100 # {'description': 'VMC-17RP01', 'manufacturer_sub_id': 'C8', 'product_id': '1C', 'date_2': '0000-00-00', 'date_1': '0000-00-00', 'oem_code': '66'} # Vasco C400RF extraction unit (EXT, not HRU/PIV) 2023-02-18T19:56:43.537735 059 I --- 29:136571 63:262142 --:------ 10E0 038 000001C822030166FEFFFFFFFFFF070507DF564D532D31374330310000000000000000000000 # {'description': 'VMS-17C01', 'manufacturer_sub_id': 'C8', 'product_id': '22', 'date_2': '0000-00-00', 'date_1': '2015-05-07', 'oem_code': '66'} # CO2 sensor +2024-10-09T11:51:49.472184 059 I --- 37:117647 63:262142 --:------ 10E0 038 000001C822060166FEFFFFFFFFFF160C07E0564D532D31374330310000000000000000000000 # {'description': 'VMS-17C01', 'manufacturer_sub_id': 'C8', 'product_id': '22', 'date_1': '2016-12-22', 'date_2': '0000-00-00', 'oem_code': '66'} # CO2 sensor +2024-10-04 22:24:58.581000 ... I --- 29:091138 63:262142 --:------ 10E0 038 000001C8400F0166FFFFFFFFFFFF0E0207E3564D4E2D31374C4D503031000000000000000000 # {'description': 'VMN-17LMP01', 'manufacturer_sub_id': 'C8', 'product_id': '40', 'date_1': '2019-02-14', 'date_2': '0000-00-00', 'oem_code': '66'} # Vasco 4-button remote 2023-02-19T11:37:53.826773 032 I --- 30:006056 63:262142 --:------ 10E0 038 000001C848260066FEFEFFFFFFFF1C0B07E3425244472D3032454D3233000000000000000000 # {'description': 'BRDG-02EM23', 'manufacturer_sub_id': 'C8', 'product_id': '48', 'date_2': '0000-00-00', 'date_1': '2019-11-28', 'oem_code': '66'} # Vasco gateway (more like a CTL, but also RFG) +2024-10-15T21:01:19.293000 083 I --- 32:022222 63:262142 --:------ 10E0 030 000001C83A190F66FFFFFFFFFFFFFFFFFFFF564D442D3137525053303100 # {'description': 'VMD-17RPS01', 'manufacturer_sub_id': 'C8', 'product_id': '3A', 'date_1': '0000-00-00', 'date_2': '0000-00-00', 'oem_code': '66'} # Vasco D60 HRU # oem_code '67' - Orcon HVAC 2023-09-20 20:12:43.056000 ... I --- 32:161205 63:262142 --:------ 10E0 038 000001C87D130D67FEFFFFFFFFFF1C0207E3564D442D3135524D533634000000000000000000 # {'description': 'VMD-15RMS64', 'manufacturer_sub_id': 'C8', 'product_id': '7D', 'date_2': '0000-00-00', 'date_1': '2019-02-28', 'oem_code': '67'} # Orcon HRC-300-EcoMax diff --git a/tests/tests/parsers/code_1fc9.log b/tests/tests/parsers/code_1fc9.log index 5a0500c02..b61507498 100644 --- 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 (22F1/3) 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 (31D9) binding to a ClimaRad MiniBox FAN (31D9) +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']]} diff --git a/tests/tests/parsers/code_22f2.log b/tests/tests/parsers/code_22f2.log index 2fcfa1517..d605e585b 100644 --- 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 index bf768dddd..43f8273f3 100644 --- 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}