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

don't show boiler details if it isnt connected

Browse Source
This commit is contained in:
Paul
2020-01-07 22:03:31 +01:00
parent f99991bf85
commit 46f32682f0
1 changed files with 85 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

166
src/ems-esp.cpp
View File

@@ -270,97 +270,101 @@ void showInfo() {
} }
myDebug_P(PSTR("")); myDebug_P(PSTR(""));
myDebug_P(PSTR("%sBoiler stats:%s"), COLOR_BOLD_ON, COLOR_BOLD_OFF);
// version details // show boiler stats if connected
myDebug_P(PSTR(" Boiler: %s"), ems_getDeviceDescription(EMS_DEVICE_TYPE_BOILER, buffer_type)); if (ems_getBoilerEnabled()) {
myDebug_P(PSTR("%sBoiler stats:%s"), COLOR_BOLD_ON, COLOR_BOLD_OFF);
// active stats // version details
if (ems_getBusConnected()) { myDebug_P(PSTR(" Boiler: %s"), ems_getDeviceDescription(EMS_DEVICE_TYPE_BOILER, buffer_type));
if (EMS_Boiler.tapwaterActive != EMS_VALUE_INT_NOTSET) {
myDebug_P(PSTR(" Hot tap water: %s"), EMS_Boiler.tapwaterActive ? "running" : "off"); // active stats
if (ems_getBusConnected()) {
if (EMS_Boiler.tapwaterActive != EMS_VALUE_INT_NOTSET) {
myDebug_P(PSTR(" Hot tap water: %s"), EMS_Boiler.tapwaterActive ? "running" : "off");
}
if (EMS_Boiler.heatingActive != EMS_VALUE_INT_NOTSET) {
myDebug_P(PSTR(" Central heating: %s"), EMS_Boiler.heatingActive ? "active" : "off");
}
} }
if (EMS_Boiler.heatingActive != EMS_VALUE_INT_NOTSET) { // UBAParameterWW
myDebug_P(PSTR(" Central heating: %s"), EMS_Boiler.heatingActive ? "active" : "off"); _renderBoolValue("Warm Water activated", EMS_Boiler.wWActivated);
_renderBoolValue("Warm Water circulation pump available", EMS_Boiler.wWCircPump);
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) {
myDebug_P(PSTR(" Warm Water comfort setting: Eco"));
} else if (EMS_Boiler.wWComfort == EMS_VALUE_UBAParameterWW_wwComfort_Intelligent) {
myDebug_P(PSTR(" Warm Water comfort setting: Intelligent"));
} }
}
// UBAParameterWW _renderIntValue("Warm Water selected temperature", "C", EMS_Boiler.wWSelTemp);
_renderBoolValue("Warm Water activated", EMS_Boiler.wWActivated); _renderIntValue("Warm Water desinfection temperature", "C", EMS_Boiler.wWDesinfectTemp);
_renderBoolValue("Warm Water circulation pump available", EMS_Boiler.wWCircPump);
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) {
myDebug_P(PSTR(" Warm Water comfort setting: Eco"));
} else if (EMS_Boiler.wWComfort == EMS_VALUE_UBAParameterWW_wwComfort_Intelligent) {
myDebug_P(PSTR(" Warm Water comfort setting: Intelligent"));
}
_renderIntValue("Warm Water selected temperature", "C", EMS_Boiler.wWSelTemp); // UBAMonitorWWMessage
_renderIntValue("Warm Water desinfection temperature", "C", EMS_Boiler.wWDesinfectTemp); _renderUShortValue("Warm Water current temperature", "C", EMS_Boiler.wWCurTmp);
_renderIntValue("Warm Water current tap water flow", "l/min", EMS_Boiler.wWCurFlow, 10);
_renderLongValue("Warm Water # starts", "times", EMS_Boiler.wWStarts);
if (EMS_Boiler.wWWorkM != EMS_VALUE_LONG_NOTSET) {
myDebug_P(PSTR(" Warm Water active time: %d days %d hours %d minutes"),
EMS_Boiler.wWWorkM / 1440,
(EMS_Boiler.wWWorkM % 1440) / 60,
EMS_Boiler.wWWorkM % 60);
}
_renderBoolValue("Warm Water 3-way valve", EMS_Boiler.wWHeat);
// UBAMonitorWWMessage // UBAMonitorFast
_renderUShortValue("Warm Water current temperature", "C", EMS_Boiler.wWCurTmp); _renderIntValue("Selected flow temperature", "C", EMS_Boiler.selFlowTemp);
_renderIntValue("Warm Water current tap water flow", "l/min", EMS_Boiler.wWCurFlow, 10); _renderUShortValue("Current flow temperature", "C", EMS_Boiler.curFlowTemp);
_renderLongValue("Warm Water # starts", "times", EMS_Boiler.wWStarts); _renderUShortValue("Return temperature", "C", EMS_Boiler.retTemp);
if (EMS_Boiler.wWWorkM != EMS_VALUE_LONG_NOTSET) { _renderBoolValue("Gas", EMS_Boiler.burnGas);
myDebug_P(PSTR(" Warm Water active time: %d days %d hours %d minutes"), _renderBoolValue("Boiler pump", EMS_Boiler.heatPmp);
EMS_Boiler.wWWorkM / 1440, _renderBoolValue("Fan", EMS_Boiler.fanWork);
(EMS_Boiler.wWWorkM % 1440) / 60, _renderBoolValue("Ignition", EMS_Boiler.ignWork);
EMS_Boiler.wWWorkM % 60); _renderBoolValue("Circulation pump", EMS_Boiler.wWCirc);
} _renderIntValue("Burner selected max power", "%", EMS_Boiler.selBurnPow);
_renderBoolValue("Warm Water 3-way valve", EMS_Boiler.wWHeat); _renderIntValue("Burner current power", "%", EMS_Boiler.curBurnPow);
_renderShortValue("Flame current", "uA", EMS_Boiler.flameCurr);
_renderIntValue("System pressure", "bar", EMS_Boiler.sysPress, 10);
if (EMS_Boiler.serviceCode == EMS_VALUE_USHORT_NOTSET) {
myDebug_P(PSTR(" System service code: %s"), EMS_Boiler.serviceCodeChar);
} else {
myDebug_P(PSTR(" System service code: %s (%d)"), EMS_Boiler.serviceCodeChar, EMS_Boiler.serviceCode);
}
// UBAMonitorFast // UBAParametersMessage
_renderIntValue("Selected flow temperature", "C", EMS_Boiler.selFlowTemp); _renderIntValue("Heating temperature setting on the boiler", "C", EMS_Boiler.heating_temp);
_renderUShortValue("Current flow temperature", "C", EMS_Boiler.curFlowTemp); _renderIntValue("Boiler circuit pump modulation max power", "%", EMS_Boiler.pump_mod_max);
_renderUShortValue("Return temperature", "C", EMS_Boiler.retTemp); _renderIntValue("Boiler circuit pump modulation min power", "%", EMS_Boiler.pump_mod_min);
_renderBoolValue("Gas", EMS_Boiler.burnGas);
_renderBoolValue("Boiler pump", EMS_Boiler.heatPmp);
_renderBoolValue("Fan", EMS_Boiler.fanWork);
_renderBoolValue("Ignition", EMS_Boiler.ignWork);
_renderBoolValue("Circulation pump", EMS_Boiler.wWCirc);
_renderIntValue("Burner selected max power", "%", EMS_Boiler.selBurnPow);
_renderIntValue("Burner current power", "%", EMS_Boiler.curBurnPow);
_renderShortValue("Flame current", "uA", EMS_Boiler.flameCurr);
_renderIntValue("System pressure", "bar", EMS_Boiler.sysPress, 10);
if (EMS_Boiler.serviceCode == EMS_VALUE_USHORT_NOTSET) {
myDebug_P(PSTR(" System service code: %s"), EMS_Boiler.serviceCodeChar);
} else {
myDebug_P(PSTR(" System service code: %s (%d)"), EMS_Boiler.serviceCodeChar, EMS_Boiler.serviceCode);
}
// UBAParametersMessage // UBAMonitorSlow
_renderIntValue("Heating temperature setting on the boiler", "C", EMS_Boiler.heating_temp); if (EMS_Boiler.extTemp != EMS_VALUE_SHORT_NOTSET) {
_renderIntValue("Boiler circuit pump modulation max power", "%", EMS_Boiler.pump_mod_max); _renderShortValue("Outside temperature", "C", EMS_Boiler.extTemp);
_renderIntValue("Boiler circuit pump modulation min power", "%", EMS_Boiler.pump_mod_min); }
_renderUShortValue("Boiler temperature", "C", EMS_Boiler.boilTemp);
// UBAMonitorSlow _renderUShortValue("Exhaust temperature", "C", EMS_Boiler.exhaustTemp);
if (EMS_Boiler.extTemp != EMS_VALUE_SHORT_NOTSET) { _renderIntValue("Pump modulation", "%", EMS_Boiler.pumpMod);
_renderShortValue("Outside temperature", "C", EMS_Boiler.extTemp); _renderLongValue("Burner # starts", "times", EMS_Boiler.burnStarts);
} if (EMS_Boiler.burnWorkMin != EMS_VALUE_LONG_NOTSET) {
_renderUShortValue("Boiler temperature", "C", EMS_Boiler.boilTemp); myDebug_P(PSTR(" Total burner operating time: %d days %d hours %d minutes"),
_renderUShortValue("Exhaust temperature", "C", EMS_Boiler.exhaustTemp); EMS_Boiler.burnWorkMin / 1440,
_renderIntValue("Pump modulation", "%", EMS_Boiler.pumpMod); (EMS_Boiler.burnWorkMin % 1440) / 60,
_renderLongValue("Burner # starts", "times", EMS_Boiler.burnStarts); EMS_Boiler.burnWorkMin % 60);
if (EMS_Boiler.burnWorkMin != EMS_VALUE_LONG_NOTSET) { }
myDebug_P(PSTR(" Total burner operating time: %d days %d hours %d minutes"), if (EMS_Boiler.heatWorkMin != EMS_VALUE_LONG_NOTSET) {
EMS_Boiler.burnWorkMin / 1440, myDebug_P(PSTR(" Total heat operating time: %d days %d hours %d minutes"),
(EMS_Boiler.burnWorkMin % 1440) / 60, EMS_Boiler.heatWorkMin / 1440,
EMS_Boiler.burnWorkMin % 60); (EMS_Boiler.heatWorkMin % 1440) / 60,
} EMS_Boiler.heatWorkMin % 60);
if (EMS_Boiler.heatWorkMin != EMS_VALUE_LONG_NOTSET) { }
myDebug_P(PSTR(" Total heat operating time: %d days %d hours %d minutes"), if (EMS_Boiler.UBAuptime != EMS_VALUE_LONG_NOTSET) {
EMS_Boiler.heatWorkMin / 1440, myDebug_P(PSTR(" Total UBA working time: %d days %d hours %d minutes"),
(EMS_Boiler.heatWorkMin % 1440) / 60, EMS_Boiler.UBAuptime / 1440,
EMS_Boiler.heatWorkMin % 60); (EMS_Boiler.UBAuptime % 1440) / 60,
} EMS_Boiler.UBAuptime % 60);
if (EMS_Boiler.UBAuptime != EMS_VALUE_LONG_NOTSET) { }
myDebug_P(PSTR(" Total UBA working time: %d days %d hours %d minutes"),
EMS_Boiler.UBAuptime / 1440,
(EMS_Boiler.UBAuptime % 1440) / 60,
EMS_Boiler.UBAuptime % 60);
} }
// For SM10/SM100/SM200 Solar Module // For SM10/SM100/SM200 Solar Module