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

Add features to WW messages (0x33, 0x34) to improve WW monitoring.

Browse Source
This commit is contained in:
ypaindaveine
2020-02-29 21:11:49 +01:00
parent 81188eccd9
commit 658a230ea3
4 changed files with 66 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/ems-esp.cpp
View File

@@ -299,6 +299,18 @@ void showInfo() {
// UBAParameterWW
_renderBoolValue("Warm Water activated", EMS_Boiler.wWActivated);
_renderBoolValue("Warm Water circulation pump available", EMS_Boiler.wWCircPump);
myDebug_P(PSTR(" Warm Water circulation pump type: %s"), EMS_Boiler.wWCircPumpType ? "charge pump" : "3-way pump");
if (EMS_Boiler.wWCircPumpMode == 7) {
myDebug_P(PSTR(" Warm Water circulation pump freq: continuous"));
} else {
char s[7];
char buffer[2];
buffer[0] = (EMS_Boiler.wWCircPumpMode % 10) + '0';
buffer[1] = '\0';
strlcpy(s, buffer, 3);
strlcat(s, "x3min", sizeof(s));
myDebug_P(PSTR(" Warm Water circulation pump freq: %s"), s);
}
if (EMS_Boiler.wWComfort == EMS_VALUE_UBAParameterWW_wwComfort_Hot) {
myDebug_P(PSTR(" Warm Water comfort setting: Hot"));
} else if (EMS_Boiler.wWComfort == EMS_VALUE_UBAParameterWW_wwComfort_Eco) {
@@ -309,7 +321,7 @@ void showInfo() {
_renderIntValue("Warm Water selected temperature", "C", EMS_Boiler.wWSelTemp);
_renderIntValue("Warm Water desinfection temperature", "C", EMS_Boiler.wWDesinfectTemp);
_renderBoolValue("Warm Water Circulation active", EMS_Boiler.wWCirc);
_renderBoolValue("Warm Water circulation active", EMS_Boiler.wWCirc);
// UBAMonitorWWMessage
_renderUShortValue("Warm Water current temperature", "C", EMS_Boiler.wWCurTmp);
@@ -635,7 +647,7 @@ bool publishSensorValues() {
// publish Boiler data via MQTT
bool publishEMSValues_boiler() {
const size_t capacity = JSON_OBJECT_SIZE(41); // must recalculate if more objects addded https://arduinojson.org/v6/assistant/
const size_t capacity = JSON_OBJECT_SIZE(47); // must recalculate if more objects addded https://arduinojson.org/v6/assistant/
DynamicJsonDocument doc(capacity);
JsonObject rootBoiler = doc.to<JsonObject>();
@@ -670,6 +682,12 @@ bool publishEMSValues_boiler() {
if (EMS_Boiler.wWCircPump != EMS_VALUE_BOOL_NOTSET) {
rootBoiler["wWCircPump"] = EMS_Boiler.wWCircPump;
}
if (EMS_Boiler.wWCircPumpType != EMS_VALUE_BOOL_NOTSET) {
rootBoiler["wWCiPuType"] = EMS_Boiler.wWCircPumpType;
}
if (EMS_Boiler.wWCircPumpMode != EMS_VALUE_INT_NOTSET) {
rootBoiler["wWCiPuMode"] = EMS_Boiler.wWCircPumpMode;
}
if (EMS_Boiler.extTemp > EMS_VALUE_SHORT_NOTSET) {
rootBoiler["outdoorTemp"] = (float)EMS_Boiler.extTemp / 10;
}
@@ -709,6 +727,18 @@ bool publishEMSValues_boiler() {
if (EMS_Boiler.wWActivated != EMS_VALUE_BOOL_NOTSET) {
rootBoiler["wWOnetime"] = _bool_to_char(s, EMS_Boiler.wWOneTime);
}
if (EMS_Boiler.wWActivated != EMS_VALUE_BOOL_NOTSET) {
rootBoiler["wWDesinfecting"] = _bool_to_char(s, EMS_Boiler.wWDesinfecting);
}
if (EMS_Boiler.wWActivated != EMS_VALUE_BOOL_NOTSET) {
rootBoiler["wWReady"] = _bool_to_char(s, EMS_Boiler.wWReadiness);
}
if (EMS_Boiler.wWActivated != EMS_VALUE_BOOL_NOTSET) {
rootBoiler["wWRecharge"] = _bool_to_char(s, EMS_Boiler.wWRecharging);
}
if (EMS_Boiler.wWActivated != EMS_VALUE_BOOL_NOTSET) {
rootBoiler["wWTempOK"] = _bool_to_char(s, EMS_Boiler.wWTemperaturOK);
}
if (EMS_Boiler.wWCirc != EMS_VALUE_BOOL_NOTSET) {
rootBoiler["wWCirc"] = _bool_to_char(s, EMS_Boiler.wWCirc);
}
@@ -846,7 +876,19 @@ bool publishEMSValues_thermostat() {
} else if (thermoMode == EMS_THERMOSTAT_MODE_NIGHT) {
dataThermostat[THERMOSTAT_MODE] = "night";
}
// Render Thermostat Mode2, only if its in Auto mode
if (thermoMode == EMS_THERMOSTAT_MODE_AUTO) {
thermoMode = _getThermostatMode2(hc_v);
if (thermoMode == EMS_THERMOSTAT_MODE_NIGHT) {
dataThermostat[THERMOSTAT_MODETYPE] = "night";
} else if (thermoMode == EMS_THERMOSTAT_MODE_DAY) {
dataThermostat[THERMOSTAT_MODETYPE] = "day";
} else if (thermoMode == EMS_THERMOSTAT_MODE_COMFORT) {
dataThermostat[THERMOSTAT_MODETYPE] = "comfort";
} else if (thermoMode == EMS_THERMOSTAT_MODE_ECO) {
dataThermostat[THERMOSTAT_MODETYPE] = "eco";
}
}
// if its not nested, send immediately
if (!myESP.mqttUseNestedJson()) {