From d658b67e93a57bf3aa72bc3eaff8a29aa0b83760 Mon Sep 17 00:00:00 2001 From: MichaelDvP Date: Thu, 12 Jan 2023 07:31:57 +0100 Subject: [PATCH] add fluegastemp #906 --- src/devices/heatsource.cpp | 7 +++++++ src/devices/heatsource.h | 1 + src/locale_translations.h | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/devices/heatsource.cpp b/src/devices/heatsource.cpp index 87c0e706a..f0b8b20c6 100644 --- a/src/devices/heatsource.cpp +++ b/src/devices/heatsource.cpp @@ -74,6 +74,12 @@ Heatsource::Heatsource(uint8_t device_type, uint8_t device_id, uint8_t product_i DeviceValueNumOp::DV_NUMOP_DIV10, FL_(aCylBottomTemp), DeviceValueUOM::DEGREES); + register_device_value(DeviceValueTAG::TAG_AHS1 + ahs, + &flueGasTemp_, + DeviceValueType::SHORT, + DeviceValueNumOp::DV_NUMOP_DIV10, + FL_(flueGasTemp), + DeviceValueUOM::DEGREES); // register_device_value(DeviceValueTAG::TAG_AHS1 + ahs, &valveByPass_, DeviceValueType::BOOL, nullptr, FL_(valveByPass), DeviceValueUOM::NONE); register_device_value(DeviceValueTAG::TAG_AHS1 + ahs, &valveBuffer_, DeviceValueType::UINT, FL_(valveBuffer), DeviceValueUOM::PERCENT); register_device_value(DeviceValueTAG::TAG_AHS1 + ahs, &valveReturn_, DeviceValueType::UINT, FL_(valveReturn), DeviceValueUOM::PERCENT); @@ -220,6 +226,7 @@ void Heatsource::process_UBAMonitorFastPlus(std::shared_ptr tele void Heatsource::process_amTempMessage(std::shared_ptr telegram) { has_update(telegram, curFlowTemp_, 0); // TB4 has_update(telegram, retTemp_, 2); // TR2 + has_update(telegram, flueGasTemp_, 4); has_update(telegram, aFlowTemp_, 6); has_update(telegram, aRetTemp_, 8); has_update(telegram, cylTopTemp_, 10); diff --git a/src/devices/heatsource.h b/src/devices/heatsource.h index 1df1110ec..3b9a3a9fe 100644 --- a/src/devices/heatsource.h +++ b/src/devices/heatsource.h @@ -44,6 +44,7 @@ class Heatsource : public EMSdevice { uint8_t aPumpMod_; // PR1 - percent uint8_t valveBuffer_; // VB1 uint8_t valveReturn_; // VR1 + uint16_t flueGasTemp_; // uint8_t valveBypass_; // VR2 position unknown // uint8_t heatSource_; // OEV diff --git a/src/locale_translations.h b/src/locale_translations.h index 517bbaa3f..55e837690 100644 --- a/src/locale_translations.h +++ b/src/locale_translations.h @@ -456,7 +456,7 @@ MAKE_PSTR_LIST(burner, "burner", "burner", "Brenner", "", "", "", "", "") // TOD MAKE_PSTR_LIST(heatRequest, "heatrequest", "heat request", "Wärmeanforderung", "", "", "", "", "") // TODO translate MAKE_PSTR_LIST(blockRemain, "blockremain", "remaining blocktime", "verbleibende Blockzeit", "", "", "", "", "") // TODO translate MAKE_PSTR_LIST(blockRemainWw, "blockremainww", "remaining blocktime dhw", "verbleibende Blockzeit WW", "", "", "", "", "") // TODO translate - +MAKE_PSTR_LIST(flueGasTemp, "fluegastemp", "flue gas temperature", "Abgastemperatur", "", "", "", "", "") // TODO translate MAKE_PSTR_LIST(vr2Config, "vr2config", "vr2 configuration", "VR2 Konfiguration", "VR2 configuratie", "VR2 Konfiguration", "konfiguracja VR2", "vr2 konfigurasjon", "configuration vr2") MAKE_PSTR_LIST(ahsActivated, "ahsactivated", "alternate heat source activation", "Alt. Wärmeerzeuger aktiviert", "Altenatieve warmtebron geactiveerd", "Alternativ värmekälla aktivering", "aktywacja alternatywnego źródła ciepła", "alternativ varmekilde aktivering", "activation source chaleur alternative")