From 3c5773df79398cc77f420ccf2d46f881aeb77786 Mon Sep 17 00:00:00 2001 From: Oleksandr Kurbatov <45320692+aqualx@users.noreply.github.com> Date: Thu, 29 Aug 2019 15:54:15 +0300 Subject: [PATCH 1/8] Support for Lessar LV-RACU Adding support for next heat recovery units: * Lessar LV-RACU/PACU * Salda RIRS V EKO --- .../config-lessar_lv_racu.json | 107 ++++++++++++++++++ 1 file changed, 107 insertions(+) create mode 100644 wb-mqtt-serial-templates/config-lessar_lv_racu.json diff --git a/wb-mqtt-serial-templates/config-lessar_lv_racu.json b/wb-mqtt-serial-templates/config-lessar_lv_racu.json new file mode 100644 index 000000000..11d48fd1b --- /dev/null +++ b/wb-mqtt-serial-templates/config-lessar_lv_racu.json @@ -0,0 +1,107 @@ +{ + "device_type" : "LESSAR_LV_RACU", + "device" : { + "name": "LESSAR_LV_RACU", + "id": "lessar_lv_racu", + "enabled": true, + "guard_interval_us": 50000, + "poll_interval": 100000, + "max_read_registers": 1, + "channels": [ + { + "name": "Filter", + "reg_type": "coil", + "address": "0x2", + "type": "text" + }, + { + "name": "Preheater", + "reg_type": "coil", + "address": "0xC", + "type": "text" + }, + { + "name": "Heater", + "reg_type": "coil", + "address": "0xE", + "type": "text" + }, + { + "name": "Speed", + "reg_type": "holding", + "address": "0x0", + "type": "range", + "max": 3 + }, + { + "name": "TsetPoint", + "reg_type": "holding", + "address": "0x1", + "type": "range", + "max": 30 + }, + { + "name": "Tlimit", + "reg_type": "input", + "address": "0x0", + "type": "temperature", + "format": "u8", + "scale": 0.1 + }, + { + "name": "Texhaust", + "reg_type": "input", + "address": "0x6", + "type": "temperature", + "format": "u8", + "scale": 0.1 + }, + { + "name": "Textract", + "reg_type": "input", + "address": "0x3", + "type": "temperature", + "format": "u8", + "scale": 0.1 + }, + { + "name": "ToutDoor", + "reg_type": "input", + "address": "0x9", + "type": "temperature", + "format": "s16", + "scale": 0.1 + }, + { + "name": "RH_value", + "reg_type": "input", + "address": "0xD", + "type": "text" + }, + { + "name": "InDumper", + "reg_type": "input", + "address": "0xE", + "type": "text" + }, + { + "name": "Motor1", + "reg_type": "input", + "address": "0xF", + "type": "text" + }, + { + "name": "Motor2", + "reg_type": "input", + "address": "0x10", + "type": "text" + }, + { + "name": "MotorActive", + "reg_type": "coil", + "address": "0xD", + "type": "text" + } + ] + } +} From 1a03f22bf22b5a6e8a1ec1fc31d366b21fd22bc6 Mon Sep 17 00:00:00 2001 From: Oleksandr Kurbatov <45320692+aqualx@users.noreply.github.com> Date: Thu, 29 Aug 2019 16:09:38 +0300 Subject: [PATCH 2/8] update readme with new Lessar / Salda devices --- README.md | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 80fee4379..f5b781c2a 100644 --- a/README.md +++ b/README.md @@ -460,28 +460,29 @@ Uniel. Устройства Милур требуют дополнительны **Modbus-RTU** -| Device | device_type | id_prefix | name_prefix | -|:-------------------------------------------------------:|:-----------:|:----------:|:-------------:| -| "Разумный дом" четырёхканальный диммер светодиодов DDL4 | DDL24 | ddl24 | DDL24 | -| "Разумный дом" релейный модуль DRB88 | DRB88 | drb88 | DRB88 | -| "ICP DAS" модуль управления освещением LC-103 | LC-103 | lc-103 | LC-103 | -| "Разумный дом" MSU24 | MSU24 | msu24 | MSU24 | -| "Разумный дом" MSU21 | MSU21 | msu21 | MSU21 | -| "Разумный дом" MSU34+TLP | MSU34 | msu34tlp | MSU34+TLP | -| "Разумный дом" MSU34+TLHP | MSU34TLHP | msu34tlhp | MSU34+TLHP | -| "ICP DAS" модуль ввода-вывода TM-P3R3 | TM-P3R3 | TM-P3R3 | tmp3r3 | -| "Kvadro" модуль подключения термометров 1-wire |kvadro-1wire |kvadro-1wire| Kvadro 1-Wire | -| PD561Z-9SY счётчик электроэнергии | PD561Z | pd561z | pd561z | -| SDM220 счётчик электроэнергии | SDM220 | sdm220 | sdm220 | -| SDM120 счётчик электроэнергии | SDM120 | sdm120 | sdm120 | -| WELLPRO WP8028ADAM (8DI/8DO) | WP8028ADAM | wp8028adam | WP8028ADAM | -| Wiren Board RGB-диммер WB-MRGB | WB-MRGB | WB-MRGB | wb-mrgb | -| Wiren Board Релейный модуль WB-MRM2 | WB-MRM2 | WB-MRM2 | wb-mrm2 | -| Wiren Board Релейный модуль WB-MR11 | WB-MR11 | WB-MR11 | wb-mr11 | -| Wiren Board Релейный модуль WB-MR14 | WB-MR14 | WB-MR14 | wb-mr14 | -| Wiren Board модуль дискретных/счётных входов WB-MCM16 | WB-MCM16 | WB-MCM16 | wb-mcm16 | -| Wiren Board Датчик WB-MS-THLS / WB-MSW-THLS | WB-MS-THLS | wb-ms-thls | WB-MS-THLS | -| Wiren Board Датчик WB-MS-THLS / WB-MSW-THLS (fw. v.2) | WB-MS-THLS v.2 | wb-ms-thls | WB-MS-THLS | +| Device | device_type | id_prefix | name_prefix | +|:-------------------------------------------------------:|:--------------:|:--------------:|:--------------:| +| "Разумный дом" четырёхканальный диммер светодиодов DDL4 | DDL24 | ddl24 | DDL24 | +| "Разумный дом" релейный модуль DRB88 | DRB88 | drb88 | DRB88 | +| "ICP DAS" модуль управления освещением LC-103 | LC-103 | lc-103 | LC-103 | +| "Разумный дом" MSU24 | MSU24 | msu24 | MSU24 | +| "Разумный дом" MSU21 | MSU21 | msu21 | MSU21 | +| "Разумный дом" MSU34+TLP | MSU34 | msu34tlp | MSU34+TLP | +| "Разумный дом" MSU34+TLHP | MSU34TLHP | msu34tlhp | MSU34+TLHP | +| "ICP DAS" модуль ввода-вывода TM-P3R3 | TM-P3R3 | TM-P3R3 | tmp3r3 | +| "Kvadro" модуль подключения термометров 1-wire | kvadro-1wire | kvadro-1wire | Kvadro 1-Wire | +| PD561Z-9SY счётчик электроэнергии | PD561Z | pd561z | pd561z | +| SDM220 счётчик электроэнергии | SDM220 | sdm220 | sdm220 | +| SDM120 счётчик электроэнергии | SDM120 | sdm120 | sdm120 | +| WELLPRO WP8028ADAM (8DI/8DO) | WP8028ADAM | wp8028adam | WP8028ADAM | +| Wiren Board RGB-диммер WB-MRGB | WB-MRGB | WB-MRGB | wb-mrgb | +| Wiren Board Релейный модуль WB-MRM2 | WB-MRM2 | WB-MRM2 | wb-mrm2 | +| Wiren Board Релейный модуль WB-MR11 | WB-MR11 | WB-MR11 | wb-mr11 | +| Wiren Board Релейный модуль WB-MR14 | WB-MR14 | WB-MR14 | wb-mr14 | +| Wiren Board модуль дискретных/счётных входов WB-MCM16 | WB-MCM16 | WB-MCM16 | wb-mcm16 | +| Wiren Board Датчик WB-MS-THLS / WB-MSW-THLS | WB-MS-THLS | wb-ms-thls | WB-MS-THLS | +| Wiren Board Датчик WB-MS-THLS / WB-MSW-THLS (fw. v.2) | WB-MS-THLS v.2 | wb-ms-thls | WB-MS-THLS | +| Lessar LV-RACU(PACU) / Salda RIRS | LESSAR_LV_RACU | lessar_lv_racu | LESSAR_LV_RACU | **Милур** From c711611427fa05541206f604f522a6d9dc2143cb Mon Sep 17 00:00:00 2001 From: Oleksandr Kurbatov <45320692+aqualx@users.noreply.github.com> Date: Fri, 11 Oct 2019 23:30:43 +0300 Subject: [PATCH 3/8] Corrections based on review --- .../config-lessar_lv_racu.json | 38 ++++++++++--------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/wb-mqtt-serial-templates/config-lessar_lv_racu.json b/wb-mqtt-serial-templates/config-lessar_lv_racu.json index 11d48fd1b..4627f291e 100644 --- a/wb-mqtt-serial-templates/config-lessar_lv_racu.json +++ b/wb-mqtt-serial-templates/config-lessar_lv_racu.json @@ -1,30 +1,31 @@ { - "device_type" : "LESSAR_LV_RACU", + "device_type" : "Lessar LV-RACU/Salda RIRS", "device" : { - "name": "LESSAR_LV_RACU", - "id": "lessar_lv_racu", - "enabled": true, + "name": "Lessar LV-RACU/Salda RIRS", + "id": "lessar-lv-racu", "guard_interval_us": 50000, - "poll_interval": 100000, "max_read_registers": 1, "channels": [ { "name": "Filter", "reg_type": "coil", "address": "0x2", - "type": "text" + "type": "switch", + "channel_readonly": 1 }, { - "name": "Preheater", + "name": "Preheater", "reg_type": "coil", "address": "0xC", - "type": "text" + "type": "switch", + "channel_readonly": 1 }, { "name": "Heater", "reg_type": "coil", "address": "0xE", - "type": "text" + "type": "switch", + "channel_readonly": 1 }, { "name": "Speed", @@ -45,32 +46,32 @@ "reg_type": "input", "address": "0x0", "type": "temperature", - "format": "u8", - "scale": 0.1 + "format": "u8", + "scale": 0.1 }, { "name": "Texhaust", "reg_type": "input", "address": "0x6", "type": "temperature", - "format": "u8", - "scale": 0.1 + "format": "u8", + "scale": 0.1 }, { "name": "Textract", "reg_type": "input", "address": "0x3", "type": "temperature", - "format": "u8", - "scale": 0.1 + "format": "u8", + "scale": 0.1 }, { "name": "ToutDoor", "reg_type": "input", "address": "0x9", "type": "temperature", - "format": "s16", - "scale": 0.1 + "format": "s16", + "scale": 0.1 }, { "name": "RH_value", @@ -100,7 +101,8 @@ "name": "MotorActive", "reg_type": "coil", "address": "0xD", - "type": "text" + "type": "switch", + "channel_readonly": 1 } ] } From afb82a7e836221ae8dbaa9a8b533c2d829b57621 Mon Sep 17 00:00:00 2001 From: Oleksandr Kurbatov <45320692+aqualx@users.noreply.github.com> Date: Sat, 31 Oct 2020 10:56:13 +0200 Subject: [PATCH 4/8] Update config-lessar_lv_racu.json --- wb-mqtt-serial-templates/config-lessar_lv_racu.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wb-mqtt-serial-templates/config-lessar_lv_racu.json b/wb-mqtt-serial-templates/config-lessar_lv_racu.json index 4627f291e..f6163cabf 100644 --- a/wb-mqtt-serial-templates/config-lessar_lv_racu.json +++ b/wb-mqtt-serial-templates/config-lessar_lv_racu.json @@ -1,5 +1,5 @@ { - "device_type" : "Lessar LV-RACU/Salda RIRS", + "device_type" : "LESSAR-LV-RACU", "device" : { "name": "Lessar LV-RACU/Salda RIRS", "id": "lessar-lv-racu", From bf80e4da035198393de70b7c849603bb106dd081 Mon Sep 17 00:00:00 2001 From: Oleksandr Kurbatov <45320692+aqualx@users.noreply.github.com> Date: Sat, 31 Oct 2020 10:57:36 +0200 Subject: [PATCH 5/8] Rename config-lessar_lv_racu.json to config-lessar-lv-racu.json --- .../{config-lessar_lv_racu.json => config-lessar-lv-racu.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename wb-mqtt-serial-templates/{config-lessar_lv_racu.json => config-lessar-lv-racu.json} (100%) diff --git a/wb-mqtt-serial-templates/config-lessar_lv_racu.json b/wb-mqtt-serial-templates/config-lessar-lv-racu.json similarity index 100% rename from wb-mqtt-serial-templates/config-lessar_lv_racu.json rename to wb-mqtt-serial-templates/config-lessar-lv-racu.json From b13cbccfd6ad6db183212d7c4fafb09786e73e52 Mon Sep 17 00:00:00 2001 From: Oleksandr Kurbatov <45320692+aqualx@users.noreply.github.com> Date: Tue, 5 Oct 2021 22:13:34 +0300 Subject: [PATCH 6/8] Update config-lessar-lv-racu.json Fix boolean value assignment. --- wb-mqtt-serial-templates/config-lessar-lv-racu.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wb-mqtt-serial-templates/config-lessar-lv-racu.json b/wb-mqtt-serial-templates/config-lessar-lv-racu.json index f6163cabf..d4ba4a8ee 100644 --- a/wb-mqtt-serial-templates/config-lessar-lv-racu.json +++ b/wb-mqtt-serial-templates/config-lessar-lv-racu.json @@ -11,21 +11,21 @@ "reg_type": "coil", "address": "0x2", "type": "switch", - "channel_readonly": 1 + "channel_readonly": true }, { "name": "Preheater", "reg_type": "coil", "address": "0xC", "type": "switch", - "channel_readonly": 1 + "channel_readonly": true }, { "name": "Heater", "reg_type": "coil", "address": "0xE", "type": "switch", - "channel_readonly": 1 + "channel_readonly": true }, { "name": "Speed", @@ -102,7 +102,7 @@ "reg_type": "coil", "address": "0xD", "type": "switch", - "channel_readonly": 1 + "channel_readonly": true } ] } From e8f1a8bcd16644e36b5f191753f9eb310049a640 Mon Sep 17 00:00:00 2001 From: Oleksandr Kurbatov <45320692+aqualx@users.noreply.github.com> Date: Thu, 28 Oct 2021 17:27:33 +0300 Subject: [PATCH 7/8] format update used https://jsonformatter.org with "2 Tab Space" option --- .../config-lessar-lv-racu.json | 214 +++++++++--------- 1 file changed, 107 insertions(+), 107 deletions(-) diff --git a/wb-mqtt-serial-templates/config-lessar-lv-racu.json b/wb-mqtt-serial-templates/config-lessar-lv-racu.json index d4ba4a8ee..41bb29c7b 100644 --- a/wb-mqtt-serial-templates/config-lessar-lv-racu.json +++ b/wb-mqtt-serial-templates/config-lessar-lv-racu.json @@ -1,109 +1,109 @@ { - "device_type" : "LESSAR-LV-RACU", - "device" : { - "name": "Lessar LV-RACU/Salda RIRS", - "id": "lessar-lv-racu", - "guard_interval_us": 50000, - "max_read_registers": 1, - "channels": [ - { - "name": "Filter", - "reg_type": "coil", - "address": "0x2", - "type": "switch", - "channel_readonly": true - }, - { - "name": "Preheater", - "reg_type": "coil", - "address": "0xC", - "type": "switch", - "channel_readonly": true - }, - { - "name": "Heater", - "reg_type": "coil", - "address": "0xE", - "type": "switch", - "channel_readonly": true - }, - { - "name": "Speed", - "reg_type": "holding", - "address": "0x0", - "type": "range", - "max": 3 - }, - { - "name": "TsetPoint", - "reg_type": "holding", - "address": "0x1", - "type": "range", - "max": 30 - }, - { - "name": "Tlimit", - "reg_type": "input", - "address": "0x0", - "type": "temperature", - "format": "u8", - "scale": 0.1 - }, - { - "name": "Texhaust", - "reg_type": "input", - "address": "0x6", - "type": "temperature", - "format": "u8", - "scale": 0.1 - }, - { - "name": "Textract", - "reg_type": "input", - "address": "0x3", - "type": "temperature", - "format": "u8", - "scale": 0.1 - }, - { - "name": "ToutDoor", - "reg_type": "input", - "address": "0x9", - "type": "temperature", - "format": "s16", - "scale": 0.1 - }, - { - "name": "RH_value", - "reg_type": "input", - "address": "0xD", - "type": "text" - }, - { - "name": "InDumper", - "reg_type": "input", - "address": "0xE", - "type": "text" - }, - { - "name": "Motor1", - "reg_type": "input", - "address": "0xF", - "type": "text" - }, - { - "name": "Motor2", - "reg_type": "input", - "address": "0x10", - "type": "text" - }, - { - "name": "MotorActive", - "reg_type": "coil", - "address": "0xD", - "type": "switch", - "channel_readonly": true - } - ] - } + "device_type": "LESSAR-LV-RACU", + "device": { + "name": "Lessar LV-RACU/Salda RIRS", + "id": "lessar-lv-racu", + "guard_interval_us": 50000, + "max_read_registers": 1, + "channels": [ + { + "name": "Filter", + "reg_type": "coil", + "address": "0x2", + "type": "switch", + "channel_readonly": true + }, + { + "name": "Preheater", + "reg_type": "coil", + "address": "0xC", + "type": "switch", + "channel_readonly": true + }, + { + "name": "Heater", + "reg_type": "coil", + "address": "0xE", + "type": "switch", + "channel_readonly": true + }, + { + "name": "Speed", + "reg_type": "holding", + "address": "0x0", + "type": "range", + "max": 3 + }, + { + "name": "TsetPoint", + "reg_type": "holding", + "address": "0x1", + "type": "range", + "max": 30 + }, + { + "name": "Tlimit", + "reg_type": "input", + "address": "0x0", + "type": "temperature", + "format": "u8", + "scale": 0.1 + }, + { + "name": "Texhaust", + "reg_type": "input", + "address": "0x6", + "type": "temperature", + "format": "u8", + "scale": 0.1 + }, + { + "name": "Textract", + "reg_type": "input", + "address": "0x3", + "type": "temperature", + "format": "u8", + "scale": 0.1 + }, + { + "name": "ToutDoor", + "reg_type": "input", + "address": "0x9", + "type": "temperature", + "format": "s16", + "scale": 0.1 + }, + { + "name": "RH_value", + "reg_type": "input", + "address": "0xD", + "type": "text" + }, + { + "name": "InDumper", + "reg_type": "input", + "address": "0xE", + "type": "text" + }, + { + "name": "Motor1", + "reg_type": "input", + "address": "0xF", + "type": "text" + }, + { + "name": "Motor2", + "reg_type": "input", + "address": "0x10", + "type": "text" + }, + { + "name": "MotorActive", + "reg_type": "coil", + "address": "0xD", + "type": "switch", + "channel_readonly": true + } + ] + } } From 44fa64dffe3a299ab1179f6836d6976a668b6d74 Mon Sep 17 00:00:00 2001 From: Oleksandr Kurbatov <45320692+aqualx@users.noreply.github.com> Date: Tue, 21 Dec 2021 12:00:41 +0200 Subject: [PATCH 8/8] Fix incorrect negative temperature presentation --- wb-mqtt-serial-templates/config-lessar-lv-racu.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wb-mqtt-serial-templates/config-lessar-lv-racu.json b/wb-mqtt-serial-templates/config-lessar-lv-racu.json index 41bb29c7b..1bc219677 100644 --- a/wb-mqtt-serial-templates/config-lessar-lv-racu.json +++ b/wb-mqtt-serial-templates/config-lessar-lv-racu.json @@ -46,7 +46,7 @@ "reg_type": "input", "address": "0x0", "type": "temperature", - "format": "u8", + "format": "s16", "scale": 0.1 }, { @@ -54,7 +54,7 @@ "reg_type": "input", "address": "0x6", "type": "temperature", - "format": "u8", + "format": "s16", "scale": 0.1 }, { @@ -62,7 +62,7 @@ "reg_type": "input", "address": "0x3", "type": "temperature", - "format": "u8", + "format": "s16", "scale": 0.1 }, {