add and rename solar parameters #137, #164

emsesp · Oct 23, 2021 · b276efb · b276efb
1 parent bc23d7f
commit b276efb
Show file tree

Hide file tree

Showing 6 changed files with 171 additions and 71 deletions.
diff --git a/CHANGELOG_LATEST.md b/CHANGELOG_LATEST.md
@@ -17,6 +17,8 @@
 - Added support for mDNS [#161](https://github.com/emsesp/EMS-ESP32/issues/161)
 - Added last system ESP32 reset code to log (and `system info` output)
 - Firmware Checker in WebUI [#168](https://github.com/emsesp/EMS-ESP32/issues/168)
+- solar cylinder priority [#137](https://github.com/emsesp/EMS-ESP32/issues/137)
+- second solar collector field [#164](https://github.com/emsesp/EMS-ESP32/issues/164)
 
 ## Fixed
 
@@ -36,6 +38,7 @@
 - Use program-names instead of numbers
 - Boiler's maintenancemessage always published in MQTT (to prevent HA missing entity)
 - Unit of Measure 'times' added to MQTT Fails, Rx fails, Rx received, Tx fails, Tx reads & Tx writes
+- renamed some solar parameters [#137]
 
 ## **BREAKING CHANGES**
 
@@ -44,3 +47,4 @@
 - HA: `binary_sensor.boiler_ww_disinfecting` renamed to `binary_sensor.boiler_ww_disinfection`
 - HA: # removed from counts in MQTT Fails, Rx fails, Rx received, Tx fails, Tx reads & Tx writes
 - `txread` renamed to `txreads` and `txwrite` renamed to `txwrites` in MQTT heartbeat payload
+- renamed `tank` to `cyl`/`cylinder`
diff --git a/src/devices/boiler.cpp b/src/devices/boiler.cpp
@@ -256,7 +256,7 @@ Boiler::Boiler(uint8_t device_type, int8_t device_id, uint8_t product_id, const
     register_device_value(TAG_DEVICE_DATA_WW, &wwHeat_, DeviceValueType::BOOL, nullptr, FL_(wwHeat), DeviceValueUOM::NONE);
     register_device_value(TAG_DEVICE_DATA_WW, &wwSetPumpPower_, DeviceValueType::UINT, nullptr, FL_(wwSetPumpPower), DeviceValueUOM::PERCENT);
     register_device_value(TAG_DEVICE_DATA_WW, &wwMixerTemp_, DeviceValueType::USHORT, FL_(div10), FL_(wwMixerTemp), DeviceValueUOM::DEGREES);
-    register_device_value(TAG_DEVICE_DATA_WW, &wwTankMiddleTemp_, DeviceValueType::USHORT, FL_(div10), FL_(wwTankMiddleTemp), DeviceValueUOM::DEGREES);
+    register_device_value(TAG_DEVICE_DATA_WW, &wwCylMiddleTemp_, DeviceValueType::USHORT, FL_(div10), FL_(wwCylMiddleTemp), DeviceValueUOM::DEGREES);
     register_device_value(TAG_DEVICE_DATA_WW, &wwStarts_, DeviceValueType::ULONG, nullptr, FL_(wwStarts), DeviceValueUOM::TIMES);
     register_device_value(TAG_DEVICE_DATA_WW, &wwWorkM_, DeviceValueType::TIME, nullptr, FL_(wwWorkM), DeviceValueUOM::MINUTES);
 
@@ -735,7 +735,7 @@ void Boiler::process_HpPool(std::shared_ptr<const Telegram> telegram) {
 // see https://github.com/emsesp/EMS-ESP/issues/397
 void Boiler::process_MC110Status(std::shared_ptr<const Telegram> telegram) {
     has_update(telegram->read_value(wwMixerTemp_, 14));
-    has_update(telegram->read_value(wwTankMiddleTemp_, 18));
+    has_update(telegram->read_value(wwCylMiddleTemp_, 18));
 }
 
 /*

diff --git a/src/devices/boiler.h b/src/devices/boiler.h
@@ -88,9 +88,9 @@ class Boiler : public EMSdevice {
     uint32_t wwWorkM_;            // Warm Water minutes
     int8_t   wwHystOn_;
     int8_t   wwHystOff_;
-    uint8_t  wwTapActivated_;   // maintenance-mode to switch DHW off
-    uint16_t wwMixerTemp_;      // mixing temperature
-    uint16_t wwTankMiddleTemp_; // Tank middle temperature (TS3)
+    uint8_t  wwTapActivated_;  // maintenance-mode to switch DHW off
+    uint16_t wwMixerTemp_;     // mixing temperature
+    uint16_t wwCylMiddleTemp_; // Tank middle temperature (TS3)
 
     // main
     uint8_t  id_;               // product id