From dd865a2db591670ac4440c91df4fdcea063d6b84 Mon Sep 17 00:00:00 2001 From: sunbuzz Date: Thu, 2 Sep 2021 12:40:39 +0200 Subject: [PATCH] Fixed issues regarding pull request "Pool #104" --- src/device_library.h | 5 +++-- src/devices/boiler.cpp | 2 +- src/emsdevice.h | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/device_library.h b/src/device_library.h index f9619a3bc..0cbc3978e 100644 --- a/src/device_library.h +++ b/src/device_library.h @@ -36,7 +36,7 @@ {167, DeviceType::BOILER, F("Cerapur Aero"), DeviceFlags::EMS_DEVICE_FLAG_NONE}, {170, DeviceType::BOILER, F("Logano GB212"), DeviceFlags::EMS_DEVICE_FLAG_NONE}, {172, DeviceType::BOILER, F("Enviline/Compress 6000AW/Hybrid 7000iAW/SupraEco/Geo 5xx"), DeviceFlags::EMS_DEVICE_FLAG_HEATPUMP}, -{173, DeviceType::BOILER, F("IVT Geo 5xx"), DeviceFlags::EMS_DEVICE_FLAG_HEATPUMP}, +{173, DeviceType::BOILER, F("Geo 5xx"), DeviceFlags::EMS_DEVICE_FLAG_HEATPUMP}, {195, DeviceType::BOILER, F("Condens 5000i/Greenstar 8000"), DeviceFlags::EMS_DEVICE_FLAG_NONE}, {203, DeviceType::BOILER, F("Logamax U122/Cerapur"), DeviceFlags::EMS_DEVICE_FLAG_NONE}, {208, DeviceType::BOILER, F("Logamax Plus/GB192/Condens GC9000"), DeviceFlags::EMS_DEVICE_FLAG_NONE}, @@ -83,7 +83,7 @@ {158, DeviceType::THERMOSTAT, F("RC300/RC310/Moduline 3000/1010H/CW400/Sense II"), DeviceFlags::EMS_DEVICE_FLAG_RC300}, // 0x10 {165, DeviceType::THERMOSTAT, F("RC100/Moduline 1000/1010"), DeviceFlags::EMS_DEVICE_FLAG_RC100}, // 0x18, 0x38 {216, DeviceType::THERMOSTAT, F("CRF200S"), DeviceFlags::EMS_DEVICE_FLAG_CRF | DeviceFlags::EMS_DEVICE_FLAG_NO_WRITE}, // 0x18 -{172, DeviceType::THERMOSTAT, F("IVT Rego 2000/3000"), DeviceFlags::EMS_DEVICE_FLAG_RC300}, // 0x10 +{172, DeviceType::THERMOSTAT, F("Rego 2000/3000"), DeviceFlags::EMS_DEVICE_FLAG_RC300}, // 0x10 // Thermostat - Sieger - 0x10 / 0x17 { 66, DeviceType::THERMOSTAT, F("ES72/RC20"), DeviceFlags::EMS_DEVICE_FLAG_RC20_N}, // 0x17 or remote @@ -112,6 +112,7 @@ {102, DeviceType::MIXER, F("IPM"), DeviceFlags::EMS_DEVICE_FLAG_IPM}, {159, DeviceType::MIXER, F("MM50"), DeviceFlags::EMS_DEVICE_FLAG_MMPLUS}, {160, DeviceType::MIXER, F("MM100"), DeviceFlags::EMS_DEVICE_FLAG_MMPLUS}, +{161, DeviceType::MIXER, F("MM200"), DeviceFlags::EMS_DEVICE_FLAG_MMPLUS}, {204, DeviceType::MIXER, F("MP100"), DeviceFlags::EMS_DEVICE_FLAG_MP}, // Heat Pumps - 0x38 diff --git a/src/devices/boiler.cpp b/src/devices/boiler.cpp index dfd86758b..8882d9bab 100644 --- a/src/devices/boiler.cpp +++ b/src/devices/boiler.cpp @@ -46,7 +46,7 @@ Boiler::Boiler(uint8_t device_type, int8_t device_id, uint8_t product_id, const } // register values for master boiler/cascade module - reserve_telgram_functions(26); // reserve some space for the telegram registries, to avoid memory fragmentation + reserve_telgram_functions(25); // reserve some space for the telegram registries, to avoid memory fragmentation // the telegram handlers... // common for all boilers diff --git a/src/emsdevice.h b/src/emsdevice.h index 640d0797c..e574bd7e7 100644 --- a/src/emsdevice.h +++ b/src/emsdevice.h @@ -116,7 +116,8 @@ enum DeviceValueTAG : uint8_t { TAG_HS13, TAG_HS14, TAG_HS15, - TAG_HS16 + TAG_HS16, + TAG_MP };