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

https://github.com/proddy/EMS-ESP/issues/145

Browse Source
This commit is contained in:
Paul Derbyshire
2019-07-16 11:29:20 +02:00
parent 03106d27c5
commit 2fd84b2ba4
2 changed files with 65 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
src/ems-esp.cpp
View File

@@ -579,13 +579,44 @@ void showInfo() {
EMS_Thermostat.month, EMS_Thermostat.month,
EMS_Thermostat.year + 2000); EMS_Thermostat.year + 2000);
// thermostat mode (-1=unknown, 0=low, 1=manual, 2=auto, 3=night, 4=day)
int thermoMode = -1;
if (ems_getThermostatModel() == EMS_MODEL_RC20) {
if (EMS_Thermostat.mode == 0) {
thermoMode = 0; // low
} else if (EMS_Thermostat.mode == 1) {
thermoMode = 1; // manual
} else {
thermoMode = 2; // auto
}
} else if (ems_getThermostatModel() == EMS_MODEL_1010) {
if (EMS_Thermostat.mode == 0) {
thermoMode = 1; // manual
} else if (EMS_Thermostat.mode == 1) {
thermoMode = 2; // auto
}
} else { // default for all thermostats
if (EMS_Thermostat.mode == 0) {
thermoMode = 3; // night
} else if (EMS_Thermostat.mode == 1) {
thermoMode = 4; // day
} else {
thermoMode = 2; // auto
}
}
// Render Termostat Mode // Render Termostat Mode
if (EMS_Thermostat.mode == 0) { if (thermoMode == 0) {
myDebug_P(PSTR(" Mode is set to low")); myDebug_P(PSTR(" Mode is set to low"));
} else if (EMS_Thermostat.mode == 1) { } else if (thermoMode == 1) {
myDebug_P(PSTR(" Mode is set to manual")); myDebug_P(PSTR(" Mode is set to manual"));
} else if (EMS_Thermostat.mode == 2) { } else if (thermoMode == 2) {
myDebug_P(PSTR(" Mode is set to auto")); myDebug_P(PSTR(" Mode is set to auto"));
} else if (thermoMode == 3) {
myDebug_P(PSTR(" Mode is set to night"));
} else if (thermoMode == 4) {
myDebug_P(PSTR(" Mode is set to day"));
} else { } else {
myDebug_P(PSTR(" Mode is set to ?")); myDebug_P(PSTR(" Mode is set to ?"));
} }
@@ -787,23 +818,44 @@ void publishValues(bool force) {
rootThermostat[THERMOSTAT_CIRCUITCALCTEMP] = EMS_Thermostat.circuitcalctemp; rootThermostat[THERMOSTAT_CIRCUITCALCTEMP] = EMS_Thermostat.circuitcalctemp;
} }
// RC20 has different mode settings // thermostat mode (-1=unknown, 0=low, 1=manual, 2=auto, 3=night, 4=day)
int thermoMode = -1;
if (ems_getThermostatModel() == EMS_MODEL_RC20) { if (ems_getThermostatModel() == EMS_MODEL_RC20) {
if (EMS_Thermostat.mode == 0) { if (EMS_Thermostat.mode == 0) {
rootThermostat[THERMOSTAT_MODE] = "low"; thermoMode = 0; // low
} else if (EMS_Thermostat.mode == 1) { } else if (EMS_Thermostat.mode == 1) {
rootThermostat[THERMOSTAT_MODE] = "manual"; thermoMode = 1; // manual
} else { } else {
rootThermostat[THERMOSTAT_MODE] = "auto"; thermoMode = 2; // auto
} }
} else { } else if (ems_getThermostatModel() == EMS_MODEL_1010) {
if (EMS_Thermostat.mode == 0) { if (EMS_Thermostat.mode == 0) {
rootThermostat[THERMOSTAT_MODE] = "night"; thermoMode = 1; // manual
} else if (EMS_Thermostat.mode == 1) { } else if (EMS_Thermostat.mode == 1) {
rootThermostat[THERMOSTAT_MODE] = "day"; thermoMode = 2; // auto
} else {
rootThermostat[THERMOSTAT_MODE] = "auto";
} }
} else { // default for all thermostats
if (EMS_Thermostat.mode == 0) {
thermoMode = 3; // night
} else if (EMS_Thermostat.mode == 1) {
thermoMode = 4; // day
} else {
thermoMode = 2; // auto
}
}
// Termostat Mode
if (thermoMode == 0) {
rootThermostat[THERMOSTAT_MODE] = "low";
} else if (thermoMode == 1) {
rootThermostat[THERMOSTAT_MODE] = "manual";
} else if (thermoMode == 2) {
rootThermostat[THERMOSTAT_MODE] = "auto";
} else if (thermoMode == 3) {
rootThermostat[THERMOSTAT_MODE] = "night";
} else if (thermoMode == 4) {
rootThermostat[THERMOSTAT_MODE] = "day";
} }
data[0] = '\0'; // reset data for next package data[0] = '\0'; // reset data for next package

2
src/version.h
View File

@@ -6,5 +6,5 @@
#pragma once #pragma once
#define APP_NAME "EMS-ESP" #define APP_NAME "EMS-ESP"
#define APP_VERSION "1.8.1b16" #define APP_VERSION "1.8.1b17"
#define APP_HOSTNAME "ems-esp" #define APP_HOSTNAME "ems-esp"