diff --git a/src/device_library.h b/src/device_library.h index acbbc514c..e8a37ec9b 100644 --- a/src/device_library.h +++ b/src/device_library.h @@ -42,11 +42,12 @@ {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}, +{206, DeviceType::BOILER, F("Ecomline Excellent"), DeviceFlags::EMS_DEVICE_FLAG_NONE}, {208, DeviceType::BOILER, F("Logamax Plus/GB192/Condens GC9000"), DeviceFlags::EMS_DEVICE_FLAG_NONE}, {210, DeviceType::BOILER, F("Cascade MC400"), DeviceFlags::EMS_DEVICE_FLAG_NONE}, {211, DeviceType::BOILER, F("EasyControl Adapter"), DeviceFlags::EMS_DEVICE_FLAG_NONE}, +{228, DeviceType::BOILER, F("Alternative Heatsource"), DeviceFlags::EMS_DEVICE_FLAG_AM200}, {234, DeviceType::BOILER, F("Logamax Plus GB122/Condense 2300"), DeviceFlags::EMS_DEVICE_FLAG_NONE}, -{206, DeviceType::BOILER, F("Ecomline Excellent"), DeviceFlags::EMS_DEVICE_FLAG_NONE}, // Controllers - 0x09 / 0x10 / 0x50 { 68, DeviceType::CONTROLLER, F("BC10/RFM20"), DeviceFlags::EMS_DEVICE_FLAG_NONE}, // 0x09 diff --git a/src/devices/boiler.cpp b/src/devices/boiler.cpp index 6a5ca5ccc..02b421612 100644 --- a/src/devices/boiler.cpp +++ b/src/devices/boiler.cpp @@ -26,6 +26,26 @@ uuid::log::Logger Boiler::logger_{F_(boiler), uuid::log::Facility::CONSOLE}; Boiler::Boiler(uint8_t device_type, int8_t device_id, uint8_t product_id, const char * version, const std::string & name, uint8_t flags, uint8_t brand) : EMSdevice(device_type, device_id, product_id, version, name, flags, brand) { + // alternative heatsource special messages + if (device_id == EMSdevice::EMS_DEVICE_ID_AM200) { + register_telegram_type(0x54D, F("AmTemperatures"), false, MAKE_PF_CB(process_amTempMessage)); + register_telegram_type(0x54E, F("AmStatus"), false, MAKE_PF_CB(process_amStatusMessage)); + register_telegram_type(0x550, F("AmSettings"), false, MAKE_PF_CB(process_amSettingMessage)); + + register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &curFlowTemp_, DeviceValueType::SHORT, FL_(div10), FL_(curFlowTemp), DeviceValueUOM::DEGREES); + register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &retTemp_, DeviceValueType::SHORT, FL_(div10), FL_(retTemp), DeviceValueUOM::DEGREES); + register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &aFlowTemp_, DeviceValueType::SHORT, FL_(div10), FL_(aFlowTemp), DeviceValueUOM::DEGREES); + register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &aRetTemp_, DeviceValueType::SHORT, FL_(div10), FL_(aRetTemp), DeviceValueUOM::DEGREES); + register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &cylTopTemp_, DeviceValueType::SHORT, FL_(div10), FL_(aCylTopTemp), DeviceValueUOM::DEGREES); + register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &cylCenterTemp_, DeviceValueType::SHORT, FL_(div10), FL_(aCylCenterTemp), DeviceValueUOM::DEGREES); + register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &cylBottomTemp_, DeviceValueType::SHORT, FL_(div10), FL_(aCylBottomTemp), DeviceValueUOM::DEGREES); + register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &valveByPass_, DeviceValueType::BOOL, nullptr, FL_(valveByPass), DeviceValueUOM::NONE); + register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &valveBuffer_, DeviceValueType::BOOL, nullptr, FL_(valveBuffer), DeviceValueUOM::NONE); + register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &valveReturn_, DeviceValueType::BOOL, nullptr, FL_(valveReturn), DeviceValueUOM::NONE); + register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &aPump_, DeviceValueType::BOOL, nullptr, FL_(aPump), DeviceValueUOM::NONE); + register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &heatSource_, DeviceValueType::BOOL, nullptr, FL_(heatSource), DeviceValueUOM::NONE); + return; + } // cascaded heatingsources, only some values per individual heatsource (hs) if (device_id != EMSdevice::EMS_DEVICE_ID_BOILER) { uint8_t hs = device_id - EMSdevice::EMS_DEVICE_ID_BOILER_1; // heating source id, count from 0 @@ -424,7 +444,7 @@ Boiler::Boiler(uint8_t device_type, int8_t device_id, uint8_t product_id, const DeviceValueUOM::DEGREES_R, MAKE_CF_CB(set_ww_flowTempOffset), 0, - 40); + 45); register_device_value(DeviceValueTAG::TAG_BOILER_DATA_WW, &wwChargeOptimization_, DeviceValueType::BOOL, @@ -1130,6 +1150,31 @@ void Boiler::process_UBAMaintenanceData(std::shared_ptr telegram has_update(maintenanceDate_, date, sizeof(maintenanceDate_)); } } +/* + * alternative heatingsource AM200 + */ +void Boiler::process_amTempMessage(std::shared_ptr telegram) { + has_update(telegram, aRetTemp_, 0); + has_update(telegram, aFlowTemp_, 6); + has_update(telegram, curFlowTemp_, 8); + has_update(telegram, retTemp_, 2); + has_update(telegram, cylTopTemp_, 10); + has_update(telegram, cylCenterTemp_, 12); + has_update(telegram, cylBottomTemp_, 14); +} + +void Boiler::process_amStatusMessage(std::shared_ptr telegram) { + has_update(telegram, aPump_, 0); + has_update(telegram, valveByPass_, 1); + has_update(telegram, valveBuffer_, 2); + has_update(telegram, valveReturn_, 3); +} + +void Boiler::process_amSettingMessage(std::shared_ptr telegram) { + // has_update(telegram, setRetTemp_, 0); + // has_update(telegram, setFlowTemp_, 1); + +} /* * Hybrid heatpump with telegram 0xBB is readable and writeable in boiler and thermostat * thermostat always overwrites settings in boiler diff --git a/src/devices/boiler.h b/src/devices/boiler.h index ce2ae4b2a..0420c2ed7 100644 --- a/src/devices/boiler.h +++ b/src/devices/boiler.h @@ -198,6 +198,20 @@ class Boiler : public EMSdevice { // Pool unit int8_t poolSetTemp_; + // Alternative Heatsource AM200 + int16_t cylTopTemp_; // TB1 + int16_t cylCenterTemp_; // TB2 + int16_t cylBottomTemp_; // TB3 + int16_t aFlowTemp_; // TA1 + int16_t aRetTemp_; // TR1 + uint8_t aPump_; // PR1 + uint8_t valveByPass_; // VR2 + uint8_t valveBuffer_; // VB1 + uint8_t valveReturn_; // VR1 + uint8_t heatSource_; // OEV + // int8_t setRetTemp_; + + /* * Hybrid heatpump with telegram 0xBB is readable and writeable in boiler and thermostat * thermostat always overwrites settings in boiler @@ -242,6 +256,9 @@ class Boiler : public EMSdevice { void process_HpOutdoor(std::shared_ptr telegram); void process_HpPool(std::shared_ptr telegram); void process_HybridHp(std::shared_ptr telegram); + void process_amTempMessage(std::shared_ptr telegram); + void process_amStatusMessage(std::shared_ptr telegram); + void process_amSettingMessage(std::shared_ptr telegram); // commands - none of these use the additional id parameter bool set_ww_mode(const char * value, const int8_t id); diff --git a/src/emsdevice.h b/src/emsdevice.h index 85aaa9787..3cf5d5d99 100644 --- a/src/emsdevice.h +++ b/src/emsdevice.h @@ -309,6 +309,7 @@ class EMSdevice { static constexpr uint8_t EMS_DEVICE_ID_BOILER = 0x08; // fixed device_id for Master Boiler/UBA static constexpr uint8_t EMS_DEVICE_ID_BOILER_1 = 0x70; // fixed device_id for 1st. Cascade Boiler/UBA static constexpr uint8_t EMS_DEVICE_ID_BOILER_F = 0x7F; // fixed device_id for last Cascade Boiler/UBA + static constexpr uint8_t EMS_DEVICE_ID_AM200 = 0x60; // fixed device_id for alternative Heating AM200 // generic type IDs static constexpr uint16_t EMS_TYPE_VERSION = 0x02; // type ID for Version information. Generic across all EMS devices. @@ -326,6 +327,7 @@ class EMSdevice { static constexpr uint8_t EMS_DEVICE_FLAG_HT3 = 3; static constexpr uint8_t EMS_DEVICE_FLAG_HEATPUMP = 4; static constexpr uint8_t EMS_DEVICE_FLAG_HYBRID = 5; + static constexpr uint8_t EMS_DEVICE_FLAG_AM200 = 6; // Solar Module static constexpr uint8_t EMS_DEVICE_FLAG_SM10 = 1; diff --git a/src/locale_EN.h b/src/locale_EN.h index 9cfaf980d..0f1c61be6 100644 --- a/src/locale_EN.h +++ b/src/locale_EN.h @@ -536,6 +536,18 @@ MAKE_PSTR_LIST(electricFactor, F("electricfactor"), F("electric energy factor")) MAKE_PSTR_LIST(delayBoiler, F("delayboiler"), F("delay boiler support")) MAKE_PSTR_LIST(tempDiffBoiler, F("tempdiffboiler"), F("tempediff boiler support")) +// alternative heatsource AM200 +MAKE_PSTR_LIST(aCylTopTemp, F("cyltoptemp"), F("cylinder top temperature")) +MAKE_PSTR_LIST(aCylCenterTemp, F("cylcentertemp"), F("cylinder center temperature")) +MAKE_PSTR_LIST(aCylBottomTemp, F("cylbottomtemp"), F("cylinder bottom temperature")) +MAKE_PSTR_LIST(aFlowTemp, F("aflowtemp"), F("alternative flow temperature")) +MAKE_PSTR_LIST(aRetTemp, F("arettemp"), F("alternative return temperature")) +MAKE_PSTR_LIST(valveByPass, F("valvebypass"), F("bypass valve")) +MAKE_PSTR_LIST(valveBuffer, F("valvebuffer"), F("buffer valve")) +MAKE_PSTR_LIST(valveReturn, F("valvereturn"), F("return valve")) +MAKE_PSTR_LIST(aPump, F("apump"), F("alternative heating pump")) +MAKE_PSTR_LIST(heatSource, F("heatsource"), F("alternative heating active")) + // the following are dhw for the boiler and automatically tagged with 'ww' MAKE_PSTR_LIST(wwSelTemp, F("wwseltemp"), F("selected temperature")) MAKE_PSTR_LIST(wwSelTempLow, F("wwseltemplow"), F("selected lower temperature"))