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

minor prep for PR merge

Browse Source
This commit is contained in:
Paul
2020-04-22 15:58:16 +02:00
parent b51d34add0
commit 2f58f88ee3
4 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/ems-esp.cpp
View File

@@ -349,6 +349,7 @@ void showInfo() {
_renderUShortValue("Max boiler temperature", "C", EMS_Boiler.boilTemp);
_renderUShortValue("Return temperature", "C", EMS_Boiler.retTemp);
_renderBoolValue("Gas", EMS_Boiler.burnGas);
_renderBoolValue("Warm water mode", EMS_Boiler.wWMode);
_renderBoolValue("Boiler pump", EMS_Boiler.heatPmp);
_renderBoolValue("Fan", EMS_Boiler.fanWork);
_renderBoolValue("Ignition", EMS_Boiler.ignWork);
@@ -829,22 +830,22 @@ bool publishEMSValues_boiler() {
rootBoiler["wWHeat"] = _bool_to_char(s, EMS_Boiler.wWHeat);
}
if (abs(EMS_Boiler.wWStarts) != EMS_VALUE_LONG_NOTSET) {
rootBoiler["wWStarts"] = (float)EMS_Boiler.wWStarts;
rootBoiler["wWStarts"] = EMS_Boiler.wWStarts;
}
if (abs(EMS_Boiler.wWWorkM) != EMS_VALUE_LONG_NOTSET) {
rootBoiler["wWWorkM"] = (float)EMS_Boiler.wWWorkM;
rootBoiler["wWWorkM"] = EMS_Boiler.wWWorkM;
}
if (abs(EMS_Boiler.UBAuptime) != EMS_VALUE_LONG_NOTSET) {
rootBoiler["UBAuptime"] = (float)EMS_Boiler.UBAuptime;
rootBoiler["UBAuptime"] = EMS_Boiler.UBAuptime;
}
if (abs(EMS_Boiler.burnStarts) != EMS_VALUE_LONG_NOTSET) {
rootBoiler["burnStarts"] = (float)EMS_Boiler.burnStarts;
rootBoiler["burnStarts"] = EMS_Boiler.burnStarts;
}
if (abs(EMS_Boiler.burnWorkMin) != EMS_VALUE_LONG_NOTSET) {
rootBoiler["burnWorkMin"] = (float)EMS_Boiler.burnWorkMin;
rootBoiler["burnWorkMin"] = EMS_Boiler.burnWorkMin;
}
if (abs(EMS_Boiler.heatWorkMin) != EMS_VALUE_LONG_NOTSET) {
rootBoiler["heatWorkMin"] = (float)EMS_Boiler.heatWorkMin;
rootBoiler["heatWorkMin"] = EMS_Boiler.heatWorkMin;
}
if (EMS_Boiler.serviceCode != EMS_VALUE_USHORT_NOTSET) {

3
src/ems.cpp
View File

@@ -165,6 +165,7 @@ void ems_init() {
EMS_Boiler.wwStorageTemp2 = EMS_VALUE_USHORT_NOTSET; // warm water storage temp 2
EMS_Boiler.retTemp = EMS_VALUE_USHORT_NOTSET; // Return temperature
EMS_Boiler.burnGas = EMS_VALUE_BOOL_NOTSET; // Gas on/off
EMS_Boiler.wWMode = EMS_VALUE_BOOL_NOTSET; // Warm Water mode
EMS_Boiler.fanWork = EMS_VALUE_BOOL_NOTSET; // Fan on/off
EMS_Boiler.ignWork = EMS_VALUE_BOOL_NOTSET; // Ignition on/off
EMS_Boiler.heatPmp = EMS_VALUE_BOOL_NOTSET; // Boiler pump on/off
@@ -1067,6 +1068,7 @@ void _process_UBAMonitorFast(_EMS_RxTelegram * EMS_RxTelegram) {
_setValue(EMS_RxTelegram, &EMS_Boiler.curBurnPow, 4);
_setValue(EMS_RxTelegram, &EMS_Boiler.burnGas, 7, 0);
_setValue(EMS_RxTelegram, &EMS_Boiler.wWMode, 7, 1);
_setValue(EMS_RxTelegram, &EMS_Boiler.fanWork, 7, 2);
_setValue(EMS_RxTelegram, &EMS_Boiler.ignWork, 7, 3);
_setValue(EMS_RxTelegram, &EMS_Boiler.heatPmp, 7, 5);
@@ -1102,6 +1104,7 @@ void _process_UBAMonitorFast(_EMS_RxTelegram * EMS_RxTelegram) {
void _process_UBAMonitorFast2(_EMS_RxTelegram * EMS_RxTelegram) {
_setValue(EMS_RxTelegram, &EMS_Boiler.selFlowTemp, 6);
_setValue(EMS_RxTelegram, &EMS_Boiler.burnGas, 11, 0);
_setValue(EMS_RxTelegram, &EMS_Boiler.wWMode, 11, 1);
_setValue(EMS_RxTelegram, &EMS_Boiler.wWHeat, 11, 2);
_setValue(EMS_RxTelegram, &EMS_Boiler.curBurnPow, 10);
_setValue(EMS_RxTelegram, &EMS_Boiler.selBurnPow, 9);

1
src/ems.h
View File

@@ -294,6 +294,7 @@ typedef struct {
uint16_t wwStorageTemp2; // warm water storage temp 2
uint16_t retTemp; // Return temperature
uint8_t burnGas; // Gas on/off
uint8_t wWMode; // warm water mode
uint8_t fanWork; // Fan on/off
uint8_t ignWork; // Ignition on/off
uint8_t heatPmp; // Circulating pump on/off

4
src/ems_devices.h
View File

@@ -256,7 +256,7 @@ static const _EMS_Device EMS_Devices[] = {
{64, EMS_DEVICE_TYPE_BOILER, "Sieger BK13,BK15/Nefit Smartline/Buderus GB1x2", EMS_DEVICE_FLAG_NONE},
{234, EMS_DEVICE_TYPE_BOILER, "Buderus Logamax Plus GB122", EMS_DEVICE_FLAG_NONE},
{84, EMS_DEVICE_TYPE_BOILER, "Buderus Logamax Plus GB022", EMS_DEVICE_FLAG_NONE},
{95, EMS_DEVICE_TYPE_BOILER, "Bosch Condens 2500/Buderus Logamax GB062/Junkers Cerapur Top/Worcester Greenstar i/Generic HT3", EMS_DEVICE_FLAG_NONE},
{95, EMS_DEVICE_TYPE_BOILER, "Bosch Condens 2500/Buderus Logamax,Logomatic/Junkers Cerapur Top/Worcester Greenstar i/Generic HT3", EMS_DEVICE_FLAG_NONE},
{122, EMS_DEVICE_TYPE_BOILER, "Nefit Proline", EMS_DEVICE_FLAG_NONE},
{170, EMS_DEVICE_TYPE_BOILER, "Buderus Logano GB212", EMS_DEVICE_FLAG_NONE},
{172, EMS_DEVICE_TYPE_BOILER, "Nefit Enviline", EMS_DEVICE_FLAG_NONE},
@@ -328,7 +328,7 @@ static const _EMS_Device EMS_Devices[] = {
// Sieger
{76, EMS_DEVICE_TYPE_THERMOSTAT, "Sieger ES73", EMS_DEVICE_FLAG_RC35}, // 0x10
{113, EMS_DEVICE_TYPE_THERMOSTAT, "Sieger ES72", EMS_DEVICE_FLAG_RC20}, // 0x17
{113, EMS_DEVICE_TYPE_THERMOSTAT, "Sieger ES72/Buderus RC20", EMS_DEVICE_FLAG_RC20}, // 0x17
// Junkers - all 0x10
{105, EMS_DEVICE_TYPE_THERMOSTAT, "Junkers FW100", EMS_DEVICE_FLAG_JUNKERS1}, // 0x10