andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-08 00:39:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

use DHW temp instead of boiler temp, removed return temp - #345

Browse Source
This commit is contained in:
Paul
2020-03-08 21:49:09 +01:00
parent c55ed82c30
commit 37fe454278
7 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/custom.htm
View File

@@ -192,10 +192,8 @@
<td id="b4"></td> <td id="b4"></td>
</tr> </tr>
<tr> <tr>
<th>Boiler Temperature:</th> <th>DHW Temperature:</th>
<td id="b5"></td> <td id="b5"></td>
<th>Return Temperature:</th>
<td id="b6"></td>
</tr> </tr>
</table> </table>
</div> </div>

1
src/custom.js
View File

@@ -122,7 +122,6 @@ function listCustomStats() {
document.getElementById("b3").innerHTML = ajaxobj.boiler.b3 + " &#8451;"; document.getElementById("b3").innerHTML = ajaxobj.boiler.b3 + " &#8451;";
document.getElementById("b4").innerHTML = ajaxobj.boiler.b4 + " &#8451;"; document.getElementById("b4").innerHTML = ajaxobj.boiler.b4 + " &#8451;";
document.getElementById("b5").innerHTML = ajaxobj.boiler.b5 + " &#8451;"; document.getElementById("b5").innerHTML = ajaxobj.boiler.b5 + " &#8451;";
document.getElementById("b6").innerHTML = ajaxobj.boiler.b6 + " &#8451;";
} else { } else {
document.getElementById("boiler_show").style.display = "none"; document.getElementById("boiler_show").style.display = "none";
} }

22
src/ems-esp.cpp
View File

@@ -322,7 +322,11 @@ void showInfo() {
_renderBoolValue("Warm Water circulation active", EMS_Boiler.wWCirc); _renderBoolValue("Warm Water circulation active", EMS_Boiler.wWCirc);
// UBAMonitorWWMessage // UBAMonitorWWMessage
_renderIntValue("Warm Water set temperature", "C", EMS_Boiler.wWSetTmp);
_renderUShortValue("Warm Water current temperature", "C", EMS_Boiler.wWCurTmp); _renderUShortValue("Warm Water current temperature", "C", EMS_Boiler.wWCurTmp);
_renderUShortValue("Warm water temperature (intern)", "C", EMS_Boiler.wwStorageTemp1);
_renderUShortValue("Warm water temperature (extern)", "C", EMS_Boiler.wwStorageTemp2);
_renderUShortValue("Warm Water current temperature (extern)", "C", EMS_Boiler.wWCurTmp2);
_renderIntValue("Warm Water current tap water flow", "l/min", EMS_Boiler.wWCurFlow, 10); _renderIntValue("Warm Water current tap water flow", "l/min", EMS_Boiler.wWCurFlow, 10);
_renderLongValue("Warm Water # starts", "times", EMS_Boiler.wWStarts); _renderLongValue("Warm Water # starts", "times", EMS_Boiler.wWStarts);
if (EMS_Boiler.wWWorkM != EMS_VALUE_LONG_NOTSET) { if (EMS_Boiler.wWWorkM != EMS_VALUE_LONG_NOTSET) {
@@ -336,6 +340,7 @@ void showInfo() {
// UBAMonitorFast // UBAMonitorFast
_renderIntValue("Selected flow temperature", "C", EMS_Boiler.selFlowTemp); _renderIntValue("Selected flow temperature", "C", EMS_Boiler.selFlowTemp);
_renderUShortValue("Current flow temperature", "C", EMS_Boiler.curFlowTemp); _renderUShortValue("Current flow temperature", "C", EMS_Boiler.curFlowTemp);
_renderUShortValue("Max boiler temperature", "C", EMS_Boiler.boilTemp);
_renderUShortValue("Return temperature", "C", EMS_Boiler.retTemp); _renderUShortValue("Return temperature", "C", EMS_Boiler.retTemp);
_renderBoolValue("Gas", EMS_Boiler.burnGas); _renderBoolValue("Gas", EMS_Boiler.burnGas);
_renderBoolValue("Boiler pump", EMS_Boiler.heatPmp); _renderBoolValue("Boiler pump", EMS_Boiler.heatPmp);
@@ -361,9 +366,6 @@ void showInfo() {
if (EMS_Boiler.extTemp > EMS_VALUE_SHORT_NOTSET) { if (EMS_Boiler.extTemp > EMS_VALUE_SHORT_NOTSET) {
_renderShortValue("Outside temperature", "C", EMS_Boiler.extTemp); _renderShortValue("Outside temperature", "C", EMS_Boiler.extTemp);
} }
_renderUShortValue("Boiler temperature", "C", EMS_Boiler.boilTemp);
_renderUShortValue("Warm water storage temperature1", "C", EMS_Boiler.wwStorageTemp1);
_renderUShortValue("Warm water storage temperature2", "C", EMS_Boiler.wwStorageTemp2);
_renderUShortValue("Exhaust temperature", "C", EMS_Boiler.exhaustTemp); _renderUShortValue("Exhaust temperature", "C", EMS_Boiler.exhaustTemp);
_renderIntValue("Pump modulation", "%", EMS_Boiler.pumpMod); _renderIntValue("Pump modulation", "%", EMS_Boiler.pumpMod);
@@ -2191,17 +2193,17 @@ void WebCallback(JsonObject root) {
boiler["b1"] = (EMS_Boiler.tapwaterActive ? "running" : "off"); boiler["b1"] = (EMS_Boiler.tapwaterActive ? "running" : "off");
boiler["b2"] = (EMS_Boiler.heatingActive ? "active" : "off"); boiler["b2"] = (EMS_Boiler.heatingActive ? "active" : "off");
if (EMS_Boiler.selFlowTemp != EMS_VALUE_INT_NOTSET) if (EMS_Boiler.selFlowTemp != EMS_VALUE_INT_NOTSET) {
boiler["b3"] = EMS_Boiler.selFlowTemp; boiler["b3"] = EMS_Boiler.selFlowTemp;
}
if (EMS_Boiler.curFlowTemp != EMS_VALUE_INT_NOTSET) if (EMS_Boiler.curFlowTemp != EMS_VALUE_INT_NOTSET) {
boiler["b4"] = EMS_Boiler.curFlowTemp / 10; boiler["b4"] = EMS_Boiler.curFlowTemp / 10;
}
if (EMS_Boiler.boilTemp < EMS_VALUE_USHORT_NOTSET) if (EMS_Boiler.wWCurTmp < EMS_VALUE_USHORT_NOTSET) {
boiler["b5"] = (float)EMS_Boiler.boilTemp / 10; boiler["b5"] = (float)EMS_Boiler.wWCurTmp / 10;
}
if (EMS_Boiler.retTemp < EMS_VALUE_USHORT_NOTSET)
boiler["b6"] = (float)EMS_Boiler.retTemp / 10;
} else { } else {
boiler["ok"] = false; boiler["ok"] = false;

10
src/ems.cpp
View File

@@ -180,7 +180,9 @@ void ems_init() {
EMS_Boiler.switchTemp = EMS_VALUE_USHORT_NOTSET; EMS_Boiler.switchTemp = EMS_VALUE_USHORT_NOTSET;
// UBAMonitorWWMessage // UBAMonitorWWMessage
EMS_Boiler.wWSetTmp = EMS_VALUE_INT_NOTSET; // Warm Water set temperature
EMS_Boiler.wWCurTmp = EMS_VALUE_USHORT_NOTSET; // Warm Water current temperature EMS_Boiler.wWCurTmp = EMS_VALUE_USHORT_NOTSET; // Warm Water current temperature
EMS_Boiler.wWCurTmp2 = EMS_VALUE_USHORT_NOTSET; // Warm Water current temperature storage
EMS_Boiler.wWStarts = EMS_VALUE_LONG_NOTSET; // Warm Water # starts EMS_Boiler.wWStarts = EMS_VALUE_LONG_NOTSET; // Warm Water # starts
EMS_Boiler.wWWorkM = EMS_VALUE_LONG_NOTSET; // Warm Water # minutes EMS_Boiler.wWWorkM = EMS_VALUE_LONG_NOTSET; // Warm Water # minutes
EMS_Boiler.wWOneTime = EMS_VALUE_INT_NOTSET; // Warm Water one time function on/off EMS_Boiler.wWOneTime = EMS_VALUE_INT_NOTSET; // Warm Water one time function on/off
@@ -989,15 +991,17 @@ void _process_UBAParametersMessage(_EMS_RxTelegram * EMS_RxTelegram) {
* received every 10 seconds * received every 10 seconds
*/ */
void _process_UBAMonitorWWMessage(_EMS_RxTelegram * EMS_RxTelegram) { void _process_UBAMonitorWWMessage(_EMS_RxTelegram * EMS_RxTelegram) {
_setValue(EMS_RxTelegram, &EMS_Boiler.wWSetTmp, 0);
_setValue(EMS_RxTelegram, &EMS_Boiler.wWCurTmp, 1); _setValue(EMS_RxTelegram, &EMS_Boiler.wWCurTmp, 1);
_setValue(EMS_RxTelegram, &EMS_Boiler.wWStarts, 13); _setValue(EMS_RxTelegram, &EMS_Boiler.wWCurTmp2, 3);
_setValue(EMS_RxTelegram, &EMS_Boiler.wWCurFlow, 9);
_setValue(EMS_RxTelegram, &EMS_Boiler.wWWorkM, 10); _setValue(EMS_RxTelegram, &EMS_Boiler.wWWorkM, 10);
_setValue(EMS_RxTelegram, &EMS_Boiler.wWStarts, 13);
_setValue(EMS_RxTelegram, &EMS_Boiler.wWOneTime, 5, 1); _setValue(EMS_RxTelegram, &EMS_Boiler.wWOneTime, 5, 1);
_setValue(EMS_RxTelegram, &EMS_Boiler.wWDesinfecting, 5, 2); _setValue(EMS_RxTelegram, &EMS_Boiler.wWDesinfecting, 5, 2);
_setValue(EMS_RxTelegram, &EMS_Boiler.wWReadiness, 5, 3); _setValue(EMS_RxTelegram, &EMS_Boiler.wWReadiness, 5, 3);
_setValue(EMS_RxTelegram, &EMS_Boiler.wWRecharging, 5, 4); _setValue(EMS_RxTelegram, &EMS_Boiler.wWRecharging, 5, 4);
_setValue(EMS_RxTelegram, &EMS_Boiler.wWTemperatureOK, 5, 5); _setValue(EMS_RxTelegram, &EMS_Boiler.wWTemperatureOK, 5, 5);
_setValue(EMS_RxTelegram, &EMS_Boiler.wWCurFlow, 9);
} }
/** /**
@@ -2608,7 +2612,7 @@ void ems_setThermostatMode(_EMS_THERMOSTAT_MODE mode, uint8_t hc_num) {
set_mode_value = 2; // auto set_mode_value = 2; // auto
break; break;
} }
// now override the mode value setting depending on the thermostat type // now override the mode value setting depending on the thermostat type
// handle the different mode values to send per thermostat type // handle the different mode values to send per thermostat type
uint8_t model = ems_getThermostatFlags(); uint8_t model = ems_getThermostatFlags();

2
src/ems.h
View File

@@ -316,7 +316,9 @@ typedef struct {
uint16_t switchTemp; // Switch temperature uint16_t switchTemp; // Switch temperature
// UBAMonitorWWMessage // UBAMonitorWWMessage
uint8_t wWSetTmp; // set temp WW (DHW)
uint16_t wWCurTmp; // Warm Water current temperature uint16_t wWCurTmp; // Warm Water current temperature
uint16_t wWCurTmp2; // Warm Water current temperature storage
uint32_t wWStarts; // Warm Water # starts uint32_t wWStarts; // Warm Water # starts
uint32_t wWWorkM; // Warm Water # minutes uint32_t wWWorkM; // Warm Water # minutes
uint8_t wWOneTime; // Warm Water one time function on/off uint8_t wWOneTime; // Warm Water one time function on/off

2
src/version.h
View File

@@ -1 +1 @@
#define APP_VERSION "1.9.5b52" #define APP_VERSION "1.9.5b53"

3
tools/wsemulator/wserver.js
View File

@@ -161,8 +161,7 @@ function sendCustomStatus() {
"b2": "off", "b2": "off",
"b3": 0, "b3": 0,
"b4": 53, "b4": 53,
"b5": 54.4, "b5": 54.4
"b6": 53.3
}, },
"sm": { "sm": {