From e8e7b22e30c80435831d0cb256ef8bfc4e5615bd Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Mon, 3 Feb 2020 23:16:26 +0100
Subject: [PATCH] fix RC30 mode - #318

---
 src/ems-esp.cpp | 7 ++++---
 src/ems.cpp     | 7 ++++---
 src/version.h   | 2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/ems-esp.cpp b/src/ems-esp.cpp
index 9a6c23476..261ca69e6 100644
--- a/src/ems-esp.cpp
+++ b/src/ems-esp.cpp
@@ -196,7 +196,7 @@ _EMS_THERMOSTAT_MODE _getThermostatDayMode(uint8_t hc_num) {
         } else if (mode == 2) {
             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) {
             thermoMode = EMS_THERMOSTAT_MODE_NIGHT;
         } else if (mode == 1) {
@@ -435,7 +435,7 @@ void showInfo() {
 
                 // Render Day/Night/Holiday Temperature on RC35s
                 // 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) {
                         myDebug_P(PSTR("   Program is set to Summer 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) {
             char * second_cmd = _readWord();
             if (strcmp(second_cmd, "scan") == 0) {
-                ems_scanDevices(); // known device scan
+                ems_clearDeviceList();
+                ems_scanDevices();
                 ok = true;
             }
         } else {
diff --git a/src/ems.cpp b/src/ems.cpp
index f0f2e6f57..c3b96ba3b 100644
--- a/src/ems.cpp
+++ b/src/ems.cpp
@@ -1995,6 +1995,7 @@ void ems_getThermostatValues() {
         ems_doReadCommand(EMS_TYPE_EasyStatusMessage, device_id);
         break;
     case EMS_DEVICE_FLAG_RC35:
+    case EMS_DEVICE_FLAG_RC30N:
         for (uint8_t hc_num = 1; hc_num <= EMS_THERMOSTAT_MAXHC; hc_num++) {
             if (hc_num == 1) {
                 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.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) {
             EMS_TxTelegram.type               = EMS_TYPE_RC35Set_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
  */
 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
 
@@ -3207,4 +3208,4 @@ void ems_scanDevices() {
     for (uint8_t device_id : Device_Ids) {
         ems_doReadCommand(EMS_TYPE_Version, device_id);
     }
-}
\ No newline at end of file
+}
diff --git a/src/version.h b/src/version.h
index f1f4fbb24..b887d7d04 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define APP_VERSION "1.9.5b26"
+#define APP_VERSION "1.9.5b27"