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

fix RC30 mode - #318

Browse Source
This commit is contained in:
Paul
2020-02-03 23:16:26 +01:00
parent 416cd43e13
commit e8e7b22e30
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/ems-esp.cpp
View File

@@ -196,7 +196,7 @@ _EMS_THERMOSTAT_MODE _getThermostatDayMode(uint8_t hc_num) {
} else if (mode == 2) { } else if (mode == 2) {
thermoMode = EMS_THERMOSTAT_MODE_NIGHT; thermoMode = EMS_THERMOSTAT_MODE_NIGHT;
} }
} else if (model == EMS_DEVICE_FLAG_RC35) { } else if ((model == EMS_DEVICE_FLAG_RC35) || (model == EMS_DEVICE_FLAG_RC30N)) {
if (mode == 0) { if (mode == 0) {
thermoMode = EMS_THERMOSTAT_MODE_NIGHT; thermoMode = EMS_THERMOSTAT_MODE_NIGHT;
} else if (mode == 1) { } else if (mode == 1) {
@@ -435,7 +435,7 @@ void showInfo() {
// Render Day/Night/Holiday Temperature on RC35s // Render Day/Night/Holiday Temperature on RC35s
// there is no single setpoint temp, but one for day, night and vacation // there is no single setpoint temp, but one for day, night and vacation
if (model == EMS_DEVICE_FLAG_RC35) { if ((model == EMS_DEVICE_FLAG_RC35) || (model == EMS_DEVICE_FLAG_RC30N)) {
if (EMS_Thermostat.hc[hc_num - 1].summer_mode) { if (EMS_Thermostat.hc[hc_num - 1].summer_mode) {
myDebug_P(PSTR(" Program is set to Summer mode")); myDebug_P(PSTR(" Program is set to Summer mode"));
} else if (EMS_Thermostat.hc[hc_num - 1].holiday_mode) { } else if (EMS_Thermostat.hc[hc_num - 1].holiday_mode) {
@@ -1278,7 +1278,8 @@ void TelnetCommandCallback(uint8_t wc, const char * commandLine) {
if (wc == 2) { if (wc == 2) {
char * second_cmd = _readWord(); char * second_cmd = _readWord();
if (strcmp(second_cmd, "scan") == 0) { if (strcmp(second_cmd, "scan") == 0) {
ems_scanDevices(); // known device scan ems_clearDeviceList();
ems_scanDevices();
ok = true; ok = true;
} }
} else { } else {

5
src/ems.cpp
View File

@@ -1995,6 +1995,7 @@ void ems_getThermostatValues() {
ems_doReadCommand(EMS_TYPE_EasyStatusMessage, device_id); ems_doReadCommand(EMS_TYPE_EasyStatusMessage, device_id);
break; break;
case EMS_DEVICE_FLAG_RC35: case EMS_DEVICE_FLAG_RC35:
case EMS_DEVICE_FLAG_RC30N:
for (uint8_t hc_num = 1; hc_num <= EMS_THERMOSTAT_MAXHC; hc_num++) { for (uint8_t hc_num = 1; hc_num <= EMS_THERMOSTAT_MAXHC; hc_num++) {
if (hc_num == 1) { if (hc_num == 1) {
statusMsg = EMS_TYPE_RC35StatusMessage_HC1; statusMsg = EMS_TYPE_RC35StatusMessage_HC1;
@@ -2550,7 +2551,7 @@ void ems_setThermostatMode(uint8_t mode, uint8_t hc_num) {
EMS_TxTelegram.type_validate = EMS_TYPE_RC30Set; EMS_TxTelegram.type_validate = EMS_TYPE_RC30Set;
EMS_TxTelegram.comparisonPostRead = EMS_TYPE_RC30StatusMessage; EMS_TxTelegram.comparisonPostRead = EMS_TYPE_RC30StatusMessage;
} else if (model == EMS_DEVICE_FLAG_RC35) { } else if ((model == EMS_DEVICE_FLAG_RC35) || (model == EMS_DEVICE_FLAG_RC30N)) {
if (hc_num == 1) { if (hc_num == 1) {
EMS_TxTelegram.type = EMS_TYPE_RC35Set_HC1; EMS_TxTelegram.type = EMS_TYPE_RC35Set_HC1;
EMS_TxTelegram.comparisonPostRead = EMS_TYPE_RC35StatusMessage_HC1; EMS_TxTelegram.comparisonPostRead = EMS_TYPE_RC35StatusMessage_HC1;
@@ -3183,7 +3184,7 @@ void ems_doReadCommand(uint16_t type, uint8_t dest) {
* Find the versions of our connected devices * Find the versions of our connected devices
*/ */
void ems_scanDevices() { void ems_scanDevices() {
myDebug_P(PSTR("Started scanning the EMS bus for known devices")); myDebug_P(PSTR("Started scanning the EMS bus for known devices. This can take up to 10 seconds..."));
std::list<uint8_t> Device_Ids; // create a new list std::list<uint8_t> Device_Ids; // create a new list

2
src/version.h
View File

@@ -1 +1 @@
#define APP_VERSION "1.9.5b26" #define APP_VERSION "1.9.5b27"