From 78dee6c7fe1ad494c216b7794271c23258cfaa95 Mon Sep 17 00:00:00 2001 From: MichaelDvP Date: Mon, 18 Jul 2022 20:04:56 +0200 Subject: [PATCH] AM200 temperatures --- src/devices/boiler.cpp | 11 ++++++----- src/locale_EN.h | 6 +++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/devices/boiler.cpp b/src/devices/boiler.cpp index 02b421612..9c152b0b9 100644 --- a/src/devices/boiler.cpp +++ b/src/devices/boiler.cpp @@ -42,7 +42,7 @@ Boiler::Boiler(uint8_t device_type, int8_t device_id, uint8_t product_id, const 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, &aPump_, DeviceValueType::UINT, nullptr, FL_(aPump), DeviceValueUOM::PERCENT); register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &heatSource_, DeviceValueType::BOOL, nullptr, FL_(heatSource), DeviceValueUOM::NONE); return; } @@ -1153,11 +1153,13 @@ void Boiler::process_UBAMaintenanceData(std::shared_ptr telegram /* * alternative heatingsource AM200 */ +// Rx: 60 00 FF 00 04 4D 0103 0108 8000 00C6 0127 0205 8000 0200 0000 8000 6C +// TB4 TR2 TA1 TR1 TB1 TB2* TB3 void Boiler::process_amTempMessage(std::shared_ptr telegram) { - has_update(telegram, aRetTemp_, 0); + has_update(telegram, curFlowTemp_, 0); // TB4 + has_update(telegram, retTemp_, 2); // TR2 has_update(telegram, aFlowTemp_, 6); - has_update(telegram, curFlowTemp_, 8); - has_update(telegram, retTemp_, 2); + has_update(telegram, aRetTemp_, 8); has_update(telegram, cylTopTemp_, 10); has_update(telegram, cylCenterTemp_, 12); has_update(telegram, cylBottomTemp_, 14); @@ -1173,7 +1175,6 @@ void Boiler::process_amStatusMessage(std::shared_ptr telegram) { 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 diff --git a/src/locale_EN.h b/src/locale_EN.h index 0f1c61be6..3d6d163ac 100644 --- a/src/locale_EN.h +++ b/src/locale_EN.h @@ -540,12 +540,12 @@ MAKE_PSTR_LIST(tempDiffBoiler, F("tempdiffboiler"), F("tempediff boiler support" 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(aFlowTemp, F("altflowtemp"), F("alternative hs flow temperature")) +MAKE_PSTR_LIST(aRetTemp, F("altrettemp"), F("alternative hs 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(aPump, F("altpump"), F("alternative hs pump")) MAKE_PSTR_LIST(heatSource, F("heatsource"), F("alternative heating active")) // the following are dhw for the boiler and automatically tagged with 'ww'