diff --git a/src/ems-esp.cpp b/src/ems-esp.cpp index 9784c5ebd..1e73784f0 100644 --- a/src/ems-esp.cpp +++ b/src/ems-esp.cpp @@ -383,10 +383,12 @@ void showInfo() { myDebug_P(PSTR("")); // newline myDebug_P(PSTR("%sSolar Module data:%s"), COLOR_BOLD_ON, COLOR_BOLD_OFF); myDebug_P(PSTR(" Solar module: %s"), ems_getDeviceDescription(EMS_DEVICE_TYPE_SOLAR, buffer_type)); - _renderShortValue("Collector temperature", "C", EMS_SolarModule.collectorTemp); - _renderShortValue("Bottom temperature", "C", EMS_SolarModule.bottomTemp); + _renderShortValue("Collector temperature (TS1)", "C", EMS_SolarModule.collectorTemp); + _renderShortValue("Bottom temperature (TS2)", "C", EMS_SolarModule.bottomTemp); + _renderShortValue("Bottom temperature (TS5)", "C", EMS_SolarModule.bottomTemp2); _renderIntValue("Pump modulation", "%", EMS_SolarModule.pumpModulation); - _renderBoolValue("Pump active", EMS_SolarModule.pump); + _renderBoolValue("Valve (VS2) status", EMS_SolarModule.valveStatus); + _renderBoolValue("Pump (PS1) active", EMS_SolarModule.pump); if (EMS_SolarModule.pumpWorkMin != EMS_VALUE_LONG_NOTSET) { myDebug_P(PSTR(" Pump working time: %d days %d hours %d minutes"), EMS_SolarModule.pumpWorkMin / 1440, diff --git a/src/ems.cpp b/src/ems.cpp index 327dc2046..0e1adce6f 100644 --- a/src/ems.cpp +++ b/src/ems.cpp @@ -1527,8 +1527,8 @@ void _process_SM100Status(_EMS_RxTelegram * EMS_RxTelegram) { * byte 10 = PS1 Solar circuit pump for collector array 1: test=01, on=04 and off=03 */ void _process_SM100Status2(_EMS_RxTelegram * EMS_RxTelegram) { - _setValue(EMS_RxTelegram, &EMS_SolarModule.valveStatus, 4, 2); // 03=off 04=on - _setValue(EMS_RxTelegram, &EMS_SolarModule.pump, 10, 2); // 03=off 04=on + _setValue(EMS_RxTelegram, &EMS_SolarModule.valveStatus, 4, 2); // on if bit 2 set + _setValue(EMS_RxTelegram, &EMS_SolarModule.pump, 10, 2); // on if bit 2 set } /*