Merge pull request #196 from kstaniek:dev

Add switch temperature
emsesp · Oct 6, 2019 · 70f38fd · 70f38fd
2 parents cce0771 + 2a8ed4d
commit 70f38fd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/src/ems-esp.cpp b/src/ems-esp.cpp
@@ -521,6 +521,7 @@ void showInfo() {
     _renderIntValue("Selected flow temperature", "C", EMS_Boiler.selFlowTemp);
     _renderUShortValue("Current flow temperature", "C", EMS_Boiler.curFlowTemp);
     _renderUShortValue("Return temperature", "C", EMS_Boiler.retTemp);
+    _renderUShortValue("Switch temperature", "C", EMS_Boiler.switchTemp);
     _renderBoolValue("Gas", EMS_Boiler.burnGas);
     _renderBoolValue("Boiler pump", EMS_Boiler.heatPmp);
     _renderBoolValue("Fan", EMS_Boiler.fanWork);
@@ -775,6 +776,8 @@ void publishValues(bool force) {
         rootBoiler["curFlowTemp"] = (double)EMS_Boiler.curFlowTemp / 10;
     if (EMS_Boiler.retTemp != EMS_VALUE_USHORT_NOTSET)
         rootBoiler["retTemp"] = (double)EMS_Boiler.retTemp / 10;
+    if (EMS_Boiler.switchTemp != EMS_VALUE_USHORT_NOTSET)
+        rootBoiler["switchTemp"] = (double)EMS_Boiler.switchTemp / 10;
     if (EMS_Boiler.sysPress != EMS_VALUE_INT_NOTSET)
         rootBoiler["sysPress"] = (double)EMS_Boiler.sysPress / 10;
     if (EMS_Boiler.boilTemp != EMS_VALUE_USHORT_NOTSET)

diff --git a/src/ems.cpp b/src/ems.cpp
@@ -1345,6 +1345,7 @@ void _process_UBAMonitorSlow(_EMS_RxTelegram * EMS_RxTelegram) {
     EMS_Boiler.burnStarts  = _toLong(10);
     EMS_Boiler.burnWorkMin = _toLong(13);
     EMS_Boiler.heatWorkMin = _toLong(19);
+    EMS_Boiler.switchTemp  = _toShort(25);
 }
 
 /**

diff --git a/src/ems.h b/src/ems.h
@@ -322,6 +322,7 @@ typedef struct {
     uint32_t burnStarts;  // # burner starts
     uint32_t burnWorkMin; // Total burner operating time
     uint32_t heatWorkMin; // Total heat operating time
+    uint16_t switchTemp;  // Switch temperature
 
     // UBAMonitorWWMessage
     uint16_t wWCurTmp;  // Warm Water current temperature