Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tweak 10E0 for Vasco/ClimaRad HVAC #134

Merged
merged 13 commits into from
Nov 10, 2024
Merged

Tweak 10E0 for Vasco/ClimaRad HVAC #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
677467d
add Vasco and Climarad items
silverailscolo Oct 12, 2024
886a75f
shared bindings/fingerprints
silverailscolo Oct 13, 2024
8f6a1b7
new fingerprints, rollbacks
silverailscolo Oct 14, 2024
700913e
2 new signatures
silverailscolo Oct 15, 2024
ea982bf
Merge branch 'master' of https://github.com/zxdavb/ramses_rf into 10e0
silverailscolo Oct 15, 2024
9b36ebd
Add product log files, 2 new devices 12E0
silverailscolo Oct 16, 2024
947b7e1
Merge branch 'master' of https://github.com/zxdavb/ramses_rf into eb-…
silverailscolo Oct 17, 2024
1c6bbf3
fingerprints, copy in 10e0 log
silverailscolo Oct 17, 2024
2025126
fix eof
silverailscolo Oct 17, 2024
b2e644f
Merge branch 'master' of https://github.com/zxdavb/ramses_rf into eb-…
silverailscolo Oct 18, 2024
c0765b9
Merge branch 'master' of https://github.com/zxdavb/ramses_rf into eb-…
silverailscolo Oct 20, 2024
7683009
Merge branch 'master' of https://github.com/zxdavb/ramses_rf into eb-…
silverailscolo Oct 23, 2024
0e009b1
sort 10e0 devices
silverailscolo Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/ramses_rf/binding_fsm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,11 @@


class Vendor(StrEnum):
CLIMARAD = "climarad"
ITHO = "itho"
NUAIRE = "nuaire"
ORCON = "orcon"
VASCO = "vasco"
DEFAULT = "default"


Expand Down Expand Up @@ -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},
}
Expand Down
17 changes: 12 additions & 5 deletions src/ramses_tx/fingerprints.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,23 +43,27 @@
"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
# CO2 - some have PIR
"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
Expand All @@ -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)
Expand Down Expand Up @@ -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
Expand All @@ -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 -
Expand All @@ -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

Expand All @@ -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)
Expand Down
1 change: 1 addition & 0 deletions src/ramses_tx/parsers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions tests/tests/fingerprints/10e0_xxxx.log
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 2 additions & 0 deletions tests/tests/fingerprints/hvac/29_VMC-07RP01.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'}
2 changes: 2 additions & 0 deletions tests/tests/fingerprints/hvac/29_VMN-07LM01.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'}
2 changes: 2 additions & 0 deletions tests/tests/fingerprints/hvac/29_VMN-17LMP01.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'}
5 changes: 3 additions & 2 deletions tests/tests/fingerprints/hvac/32_VMD-17RPS01.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'}
3 changes: 3 additions & 0 deletions tests/tests/fingerprints/hvac/37_VMD-07RPS13.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'}
3 changes: 3 additions & 0 deletions tests/tests/fingerprints/hvac/99_VMS-17C01.log
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
10 changes: 9 additions & 1 deletion tests/tests/parsers/code_10e0.log
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
silverailscolo marked this conversation as resolved.
Show resolved Hide resolved
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
silverailscolo marked this conversation as resolved.
Show resolved Hide resolved
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
zxdavb marked this conversation as resolved.
Show resolved Hide resolved
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
Expand Down