add one entity #886

emsesp · Jan 6, 2023 · ad49267 · ad49267
1 parent 508dd39
commit ad49267
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/devices/heatsource.cpp b/src/devices/heatsource.cpp
@@ -165,8 +165,8 @@ Heatsource::Heatsource(uint8_t device_type, uint8_t device_id, uint8_t product_i
         register_device_value(DeviceValueTAG::TAG_AHS1 + ahs, &burner_, DeviceValueType::BOOL, FL_(burner), DeviceValueUOM::NONE);
         register_device_value(DeviceValueTAG::TAG_AHS1 + ahs, &aPump_, DeviceValueType::BOOL, FL_(aPump), DeviceValueUOM::NONE);
         register_device_value(DeviceValueTAG::TAG_AHS1 + ahs, &heatRequest_, DeviceValueType::UINT, FL_(heatRequest), DeviceValueUOM::PERCENT);
-        // register_device_value(DeviceValueTAG::TAG_AHS1 + ahs, &blocking_, DeviceValueType::BOOL, FL_(blocking), DeviceValueUOM::NONE);
         register_device_value(DeviceValueTAG::TAG_AHS1 + ahs, &blockRemain_, DeviceValueType::UINT, FL_(blockRemain), DeviceValueUOM::MINUTES);
+        register_device_value(DeviceValueTAG::TAG_AHS1 + ahs, &blockRemainWw_, DeviceValueType::UINT, FL_(blockRemainWw), DeviceValueUOM::MINUTES);
     }
 
     // cascaded heating sources, only some values per individual heatsource (hs)
@@ -278,8 +278,8 @@ void Heatsource::process_amCommandMessage(std::shared_ptr<const Telegram> telegr
 // Rx: 60 00 FF 00 04 50 00 FF 00 FF FF 00 0D 00 01 00 00 00 00 01 03 01 00 03 00 2D 19 C8 02 94 00 4A
 // Rx: 60 00 FF 19 04 50 00 FF FF 39
 void Heatsource::process_amExtraMessage(std::shared_ptr<const Telegram> telegram) {
-    has_update(telegram, blockRemain_, 24); // minutes
-    // has_update(telegram, blocking_, 24);    // bool
+    has_update(telegram, blockRemain_, 24);   // minutes
+    has_update(telegram, blockRemainWw_, 25); // minutes
 }
 
 #pragma GCC diagnostic pop

diff --git a/src/devices/heatsource.h b/src/devices/heatsource.h
@@ -51,7 +51,7 @@ class Heatsource : public EMSdevice {
     uint8_t aPump_;       // bit 0, offset 1, 54E
     uint8_t heatRequest_; // offset 2, percent
     uint8_t blockRemain_; // offset 24, 550 min
-    // uint8_t blocking_; // bool remain == 0
+    uint8_t blockRemainWw_; // offset 25, 550 min
 
     // Settings:
     uint8_t  vr2Config_;     // pos 12: off(00)/Keelbypass(01)/(hc1pump(02) only standalone)

diff --git a/src/locale_translations.h b/src/locale_translations.h
@@ -445,6 +445,7 @@ MAKE_PSTR_LIST(aPump, "apump", "alternative hs pump", "Alternativer WE Pumpe", "
 MAKE_PSTR_LIST(burner, "burner", "burner", "Brenner", "", "", "", "", "") // TODO translate
 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(vr2Config, "vr2config", "vr2 configuration", "VR2 Konfiguration", "VR2 configuratie", "VR2 Konfiguration", "konfiguracja VR2", "vr2 konfigurasjon", "configuration vr2")