From 10dd117d0f9e91b5f869548e40fe1173cf3d28dd Mon Sep 17 00:00:00 2001 From: paludi <46299059+paludi@users.noreply.github.com> Date: Fri, 16 Aug 2024 10:48:04 +0200 Subject: [PATCH 1/3] Update CHANGELOG_LATEST.md added hint to manually preserve value of dhw energy (nrgww) --- CHANGELOG_LATEST.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG_LATEST.md b/CHANGELOG_LATEST.md index a11958fb5..285d71770 100644 --- a/CHANGELOG_LATEST.md +++ b/CHANGELOG_LATEST.md @@ -5,7 +5,7 @@ ## **IMPORTANT! BREAKING CHANGES with 3.6.5** - new device WATER shows dhw entities from MM100 and SM100 in dhw setting -- renamed WWC to DHW, always create DHW nests/topics, remove ww prefix from mqtt names [#1634](https://github.com/emsesp/EMS-ESP32/issues/1634) +- renamed WWC to DHW, always create DHW nests/topics, remove ww prefix from mqtt names [#1634](https://github.com/emsesp/EMS-ESP32/issues/1634). To preserve current value of dhw energy (nrgww), follow ([#1938]https://github.com/emsesp/EMS-ESP32/issues/1938) - change temperaturesensor id to underscore - system/info API command has it's JSON keys and names changed to camelCase From 668334d1393a651154ccc296a5ec5b0f18e48245 Mon Sep 17 00:00:00 2001 From: mattreim <80219712+mattreim@users.noreply.github.com> Date: Fri, 16 Aug 2024 15:32:40 +0200 Subject: [PATCH 2/3] Add German translation --- interface/src/i18n/de/index.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/interface/src/i18n/de/index.ts b/interface/src/i18n/de/index.ts index b065d8824..97275df0b 100644 --- a/interface/src/i18n/de/index.ts +++ b/interface/src/i18n/de/index.ts @@ -331,9 +331,9 @@ const de: Translation = { RENAME: 'Umbenennen', ENABLE_MODBUS: 'Modbus aktivieren', VIEW_LOG: 'Sehen Sie sich das Protokoll an, um Probleme zu diagnostizieren', - UPLOAD_DRAG: 'drag and drop a file here or click to select one', // TODO translate - SERVICES: 'Services', // TODO translate - ALLVALUES: 'All Values' // TODO translate + UPLOAD_DRAG: 'Ziehen Sie eine Datei hierher oder klicken Sie, um eine auszuwählen', // TODO translate + SERVICES: 'Dienstleistungen', // TODO translate + ALLVALUES: 'Alle Werte' // TODO translate }; export default de; From 388245ece92d041771681d4ecdc5168070dbcb8a Mon Sep 17 00:00:00 2001 From: MichaelDvP Date: Fri, 16 Aug 2024 16:42:16 +0200 Subject: [PATCH 3/3] add energy and meter for cooling #1940 --- src/devices/boiler.cpp | 14 ++++++++++++++ src/devices/boiler.h | 2 ++ src/locale_translations.h | 2 ++ 3 files changed, 18 insertions(+) diff --git a/src/devices/boiler.cpp b/src/devices/boiler.cpp index 74cf5d0a3..5d6dd8d9f 100644 --- a/src/devices/boiler.cpp +++ b/src/devices/boiler.cpp @@ -439,6 +439,12 @@ Boiler::Boiler(uint8_t device_type, int8_t device_id, uint8_t product_id, const DeviceValueNumOp::DV_NUMOP_DIV100, FL_(nrgHeat), DeviceValueUOM::KWH); + register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, + &nrgCool_, + DeviceValueType::UINT24, + DeviceValueNumOp::DV_NUMOP_DIV100, + FL_(nrgCool), + DeviceValueUOM::KWH); register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &meterTotal_, DeviceValueType::UINT24, @@ -463,6 +469,12 @@ Boiler::Boiler(uint8_t device_type, int8_t device_id, uint8_t product_id, const DeviceValueNumOp::DV_NUMOP_DIV100, FL_(meterHeat), DeviceValueUOM::KWH); + register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, + &meterCool_, + DeviceValueType::UINT24, + DeviceValueNumOp::DV_NUMOP_DIV100, + FL_(meterCool), + DeviceValueUOM::KWH); register_device_value(DeviceValueTAG::TAG_DHW1, &meterWw_, DeviceValueType::UINT24, DeviceValueNumOp::DV_NUMOP_DIV100, FL_(meterWw), DeviceValueUOM::KWH); register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &upTimeTotal_, @@ -1970,6 +1982,7 @@ void Boiler::process_HpEnergy(std::shared_ptr telegram) { has_update(telegram, nrgTotal_, 0); has_update(telegram, nrgHeat_, 4); has_update(telegram, nrgWw_, 12); + has_update(telegram, nrgCool_, 20); } // boiler(0x08) -W-> Me(0x0B), ?(0x04AF), data: 00 00 48 B2 00 00 48 55 00 00 00 5D 00 00 01 78 00 00 00 00 00 00 07 61 @@ -1981,6 +1994,7 @@ void Boiler::process_HpMeters(std::shared_ptr telegram) { has_update(telegram, meterEHeat_, 8); has_update(telegram, meterHeat_, 24); has_update(telegram, meterWw_, 32); + has_update(telegram, meterCool_, 40); } void Boiler::process_HpPressure(std::shared_ptr telegram) { diff --git a/src/devices/boiler.h b/src/devices/boiler.h index dc12d7c72..6e1c5ff6c 100644 --- a/src/devices/boiler.h +++ b/src/devices/boiler.h @@ -225,11 +225,13 @@ class Boiler : public EMSdevice { uint32_t nrgHeat_; uint32_t nrgWw2_; uint32_t nrgHeat2_; + uint32_t nrgCool_; uint32_t meterTotal_; uint32_t meterComp_; uint32_t meterEHeat_; uint32_t meterHeat_; uint32_t meterWw_; + uint32_t meterCool_; uint32_t gasMeterHeat_; uint32_t gasMeterWw_; uint8_t hpEA0_; diff --git a/src/locale_translations.h b/src/locale_translations.h index fbd7e455d..d6b8ef44d 100644 --- a/src/locale_translations.h +++ b/src/locale_translations.h @@ -554,6 +554,7 @@ MAKE_TRANSLATION(releaseWait, "releasewait", "boiler release wait time", "Wartez // energy MAKE_TRANSLATION(nrgTotal, "nrgtotal", "total energy", "Energie gesamt", "", "", "całkowita energia", "", "", "", "", "celková energia") // TODO translate MAKE_TRANSLATION(nrgHeat, "nrgheat", "energy heating", "Energie Heizen", "", "", "energia na ogrzewanie", "", "", "ısıtma enerjisi", "", "energetické vykurovanie") // TODO translate +MAKE_TRANSLATION(nrgCool, "nrgcool", "energy cooling", "Energie Kühlen", "", "", "", "", "", "", "", "") // TODO translate MAKE_TRANSLATION(nrgWw, "nrg", "energy", "Energie", "", "", "energia", "", "", "sıcak kullanım suyu enerjisi", "", "energia") // TODO translate MAKE_TRANSLATION(nrgHeat2, "nrgheat2", "energy heating 2", "Energie Heizen 2", "", "", "energia na ogrzewanie 2", "", "", "ısıtma enerjisi 2", "", "energetické vykurovanie") // TODO translate MAKE_TRANSLATION(nrgWw2, "nrg2", "energy 2", "Energie 2", "", "", "energia 2", "", "", "sıcak kullanım suyu enerjisi 2", "", "energia 2") // TODO translate @@ -562,6 +563,7 @@ MAKE_TRANSLATION(meterTotal, "metertotal", "meter total", "Messung gesamt", "", MAKE_TRANSLATION(meterComp, "metercomp", "meter compressor", "Messung Kompressor", "", "", "licznik sprężarki", "", "", "", "", "meter kompresor") // TODO translate MAKE_TRANSLATION(meterEHeat, "metereheat", "meter e-heater", "Messung E-Heizer", "", "", "licznik dogrzewacza", "", "", "", "", "elektrický ohrievač") // TODO translate MAKE_TRANSLATION(meterHeat, "meterheat", "meter heating", "Messung Heizen", "", "", "licznik ogrzewania", "", "", "", "", "") // TODO translate +MAKE_TRANSLATION(meterCool, "metercool", "meter cooling", "Messung Kühlen", "", "", "", "", "", "", "", "") // TODO translate MAKE_TRANSLATION(meterWw, "meter", "meter", "Messung", "", "", "licznik", "", "", "", "", "") // TODO translate MAKE_TRANSLATION(gasMeterHeat, "gasmeterheat", "gas meter heating", "Gas Messung Heizen", "", "", "licznik gazu na ogrzewanie", "", "", "", "", "") // TODO translate MAKE_TRANSLATION(gasMeterWw, "gasmeter", "gas meter", "Gas Messung", "", "", "licznik gazu", "", "", "", "", "") // TODO translate