remove double values hpsuctionGas/hpHotGas, stick to hpTr5/hpTr6

emsesp · Dec 27, 2022 · d9ecf0e · d9ecf0e
1 parent f53fd74
commit d9ecf0e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 20 deletions.
diff --git a/src/devices/boiler.cpp b/src/devices/boiler.cpp
@@ -481,18 +481,6 @@ Boiler::Boiler(uint8_t device_type, int8_t device_id, uint8_t product_id, const
                               DeviceValueNumOp::DV_NUMOP_DIV10,
                               FL_(hpBrineOut),
                               DeviceValueUOM::DEGREES);
-        register_device_value(DeviceValueTAG::TAG_DEVICE_DATA,
-                              &hpSuctionGas_,
-                              DeviceValueType::SHORT,
-                              DeviceValueNumOp::DV_NUMOP_DIV10,
-                              FL_(hpSuctionGas),
-                              DeviceValueUOM::DEGREES);
-        register_device_value(DeviceValueTAG::TAG_DEVICE_DATA,
-                              &hpHotGas_,
-                              DeviceValueType::SHORT,
-                              DeviceValueNumOp::DV_NUMOP_DIV10,
-                              FL_(hpHotGas),
-                              DeviceValueUOM::DEGREES);
         register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &hpTc0_, DeviceValueType::SHORT, DeviceValueNumOp::DV_NUMOP_DIV10, FL_(hpTc0), DeviceValueUOM::DEGREES);
         register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &hpTc1_, DeviceValueType::SHORT, DeviceValueNumOp::DV_NUMOP_DIV10, FL_(hpTc1), DeviceValueUOM::DEGREES);
         register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &hpTc3_, DeviceValueType::SHORT, DeviceValueNumOp::DV_NUMOP_DIV10, FL_(hpTc3), DeviceValueUOM::DEGREES);
@@ -1267,16 +1255,14 @@ void Boiler::process_HpTemperatures(std::shared_ptr<const Telegram> telegram) {
     has_update(telegram, hpTr1_, 14);
     has_update(telegram, hpTr3_, 16);
     has_update(telegram, hpTr4_, 18);
-    // has_update(telegram, hpTr5_, 20);
-    // has_update(telegram, hpTr6_, 0);
+    has_update(telegram, hpTr5_, 20);
+    has_update(telegram, hpTr6_, 0);
     has_update(telegram, hpTr7_, 30);
     has_update(telegram, hpTl2_, 12);
     has_update(telegram, hpPl1_, 26);
     has_update(telegram, hpPh1_, 28);
     has_update(telegram, hpBrineIn_, 8);
     has_update(telegram, hpBrineOut_, 10);
-    has_update(telegram, hpSuctionGas_, 20);
-    has_update(telegram, hpHotGas_, 0);
 }
 
 // Heatpump pool unit - type 0x48A

diff --git a/src/devices/boiler.h b/src/devices/boiler.h
@@ -179,8 +179,6 @@ class Boiler : public EMSdevice {
     uint8_t  hpCircSpd_;
     uint16_t hpBrineIn_;
     uint16_t hpBrineOut_;
-    uint16_t hpSuctionGas_;
-    uint16_t hpHotGas_;
     uint8_t  hpSwitchValve_;
     uint8_t  hpActivity_;
     uint8_t  hpHeatingOn_;

diff --git a/src/locale_translations.h b/src/locale_translations.h
@@ -336,8 +336,6 @@ MAKE_PSTR_LIST(hpCompSpd, "hpcompspd", "compressor speed", "Kompressor-Geschw.",
 MAKE_PSTR_LIST(hpCircSpd, "hpcircspd", "circulation pump speed", "Zirkulationspumpen-Geschw.", "Snelheid circulatiepomp", "Hastighet Cirkulationspump", "wysterowanie pompy obiegu grzewczego", "hastighet sirkulationspumpe", "vitesse pompe à circulation")
 MAKE_PSTR_LIST(hpBrineIn, "hpbrinein", "brine in/evaporator", "Sole in/Verdampfer", "pekel in/verdamper", "Brine in (förangare)", "temperatura glikolu na wejściu kolektora (TB0)", "brine in/fordamper", "entrée saumure/évaporateur")
 MAKE_PSTR_LIST(hpBrineOut, "hpbrineout", "brine out/condenser", "Sole aus/Kondensator", "pekel uit/condensor", "Brine ut (kondensor)", "temperatura glikolu na wyjściu kolektora (TB1)", "Brine ut/kondensor", "sortie saumure/condenseur")
-MAKE_PSTR_LIST(hpSuctionGas, "hpsuctiongas", "suction gas", "Gasansaugung", "Gasaanzuiging", "Gasintag", "temperatura gazu zasysanego (TR5)", "gassintag", "aspiration des gaz")
-MAKE_PSTR_LIST(hpHotGas, "hphotgas", "hot gas/compressed", "Heißgas/verdichtet", "heet gas/samengeperst", "Hetgas/komprimerad", "temperatura gorącego gazu (TR6)", "hetgass/komprimert", "gaz chaud/compressé")
 MAKE_PSTR_LIST(hpSwitchValve, "hpswitchvalve", "switch valve", "Schaltventil", "schakelklep", "Växelventil", "zawór przełączający", "skifteventil", "valve de commutation")
 MAKE_PSTR_LIST(hpActivity, "hpactivity", "compressor activity", "Kompressoraktivität", "Compressoractiviteit", "Kompressoraktivitet", "pompa ciepła, aktywność sprężarki", "", "activité du compresseur")