From 30b5cd90c3e8a5373f95a57a4f3b22c0cf6b56ae Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Sun, 25 Oct 2020 18:28:59 +0100
Subject: [PATCH 01/15] updates

---
 CHANGELOG.md          | 7 ++-----
 example_pio_local.ini | 6 ++++++
 2 files changed, 8 insertions(+), 5 deletions(-)
 create mode 100644 example_pio_local.ini

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb2b0d699..8a3c3079a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,15 +41,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - renamed wWCircPumpType to wWChargeType
 - Installation and Configuration notes moved to the official EMS-ESP documentation site
-- Removed the _cmd from the MQTT topic names
-- MQTT sensors topic renamed to sensor_data
 - `call` commands can be done from the Console root for all devices
-- renamed MQTT topic for Solar Module from `sm_data` to `solar_data`
 - Updated EMS-ESP official documentation (https://emsesp.github.io/docs/#/)
 - JWT Secret renamed to Super User Password
 - EMS Devices in Web UI shows button and tooltip to remind users they can click on a device
-- MQTT boiler_data payload split into two topics `boiler_data_main` and `boiler_data_ww`
-- "sensor" renamed to "dallassensor" as a command. MQTT topic not affected.
+- MQTT topic name changes (see doc)
+- Mixing renamed to Mixer
 
 ### Removed
 - Console contexts for thermostat and boiler
diff --git a/example_pio_local.ini b/example_pio_local.ini
new file mode 100644
index 000000000..1c60ad8e1
--- /dev/null
+++ b/example_pio_local.ini
@@ -0,0 +1,6 @@
+[env]
+upload_protocol = espota
+upload_flags = 
+  --port=8266
+  --auth=ems-esp-neo
+upload_port = ems-esp.local

From e5d16cd69a3798234f8b60c6507ccd0806317816 Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Sun, 25 Oct 2020 18:29:09 +0100
Subject: [PATCH 02/15] b12

---
 src/version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/version.h b/src/version.h
index b3bb60c14..0a1bf711c 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define EMSESP_APP_VERSION "2.1.0b11"
+#define EMSESP_APP_VERSION "2.1.0b12"

From a97b7351eca760f81a363b0500da40079245194f Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Sun, 25 Oct 2020 18:29:33 +0100
Subject: [PATCH 03/15] Sensor # to #

---
 interface/src/project/EMSESPDevicesForm.tsx | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/interface/src/project/EMSESPDevicesForm.tsx b/interface/src/project/EMSESPDevicesForm.tsx
index 895ea27c6..47043241d 100644
--- a/interface/src/project/EMSESPDevicesForm.tsx
+++ b/interface/src/project/EMSESPDevicesForm.tsx
@@ -80,7 +80,7 @@ function formatTemp(t: string) {
 class EMSESPDevicesForm extends Component<
   EMSESPDevicesFormProps,
   EMSESPDevicesFormState
-  > {
+> {
   state: EMSESPDevicesFormState = {
     confirmScanDevices: false,
     processing: false,
@@ -130,7 +130,11 @@ class EMSESPDevicesForm extends Component<
                   onClick={() => this.handleRowClick(device.id)}
                 >
                   <TableCell component="th" scope="row">
-                    <Tooltip title="click for details..." arrow placement="right-end">
+                    <Tooltip
+                      title="click for details..."
+                      arrow
+                      placement="right-end"
+                    >
                       <Button
                         startIcon={<ListIcon />}
                         size="small"
@@ -145,8 +149,8 @@ class EMSESPDevicesForm extends Component<
                   <TableCell align="center">
                     0x
                     {("00" + device.deviceid.toString(16).toUpperCase()).slice(
-                    -2
-                  )}
+                      -2
+                    )}
                   </TableCell>
                   <TableCell align="center">{device.productid}</TableCell>
                   <TableCell align="center">{device.version}</TableCell>
@@ -195,11 +199,9 @@ class EMSESPDevicesForm extends Component<
               {data.sensors.map((sensorData) => (
                 <TableRow key={sensorData.no}>
                   <TableCell component="th" scope="row">
-                    Sensor&nbsp;{sensorData.no}
-                  </TableCell>
-                  <TableCell align="center">
-                    {sensorData.id}
+                    {sensorData.no}
                   </TableCell>
+                  <TableCell align="center">{sensorData.id}</TableCell>
                   <TableCell align="right">
                     {formatTemp(sensorData.temp)}
                   </TableCell>

From e88ce82023e23b6d8b5b55a671b1e46cfb8e0228 Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Sun, 25 Oct 2020 18:29:48 +0100
Subject: [PATCH 04/15] fix delay causing crash in standalone

---
 lib_standalone/Arduino.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib_standalone/Arduino.cpp b/lib_standalone/Arduino.cpp
index 453a1539e..b06b8bf25 100644
--- a/lib_standalone/Arduino.cpp
+++ b/lib_standalone/Arduino.cpp
@@ -57,7 +57,7 @@ unsigned long millis() {
 }
 
 void delay(unsigned long millis) {
-    __millis += millis;
+    // __millis += millis;
 }
 
 void yield(void) {

From 3b99a58953560277b4add7d413330c6a6afbd486 Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Sun, 25 Oct 2020 18:30:05 +0100
Subject: [PATCH 05/15] renamed mixing to mixer to tests don't fail

---
 lib_standalone/ESP8266React.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib_standalone/ESP8266React.h b/lib_standalone/ESP8266React.h
index 8e66fb30c..35c4f2f0a 100644
--- a/lib_standalone/ESP8266React.h
+++ b/lib_standalone/ESP8266React.h
@@ -41,7 +41,7 @@ class DummySettings {
     uint16_t publish_time_boiler     = 10;
     uint16_t publish_time_thermostat = 10;
     uint16_t publish_time_solar      = 10;
-    uint16_t publish_time_mixing     = 10;
+    uint16_t publish_time_mixer      = 10;
     uint16_t publish_time_other      = 10;
     uint16_t publish_time_sensor     = 10;
     uint8_t  bool_format             = 1; // on off

From d2a1d65ca25880e6a8039d7dfa2eab5d79efea21 Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Sun, 25 Oct 2020 18:30:23 +0100
Subject: [PATCH 06/15] don't show commands for a device if it doesn't have any

---
 src/command.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/command.cpp b/src/command.cpp
index 6e8c5ad5c..d5abec3d4 100644
--- a/src/command.cpp
+++ b/src/command.cpp
@@ -146,7 +146,7 @@ void Command::show_devices(uuid::console::Shell & shell) {
 
     for (const auto & device_class : EMSFactory::device_handlers()) {
         for (const auto & emsdevice : EMSESP::emsdevices) {
-            if ((emsdevice) && (emsdevice->device_type() == device_class.first)) {
+            if ((emsdevice) && (emsdevice->device_type() == device_class.first) && (device_has_commands(device_class.first))) {
                 shell.printf("%s ", EMSdevice::device_type_2_device_name(device_class.first).c_str());
                 break; // we only want to show one (not multiple of the same device types)
             }

From 0314852a64c9ce7b9855a4e95407e12064c3778d Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Sun, 25 Oct 2020 18:30:43 +0100
Subject: [PATCH 07/15] rename admin user to su user

---
 src/console.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/console.cpp b/src/console.cpp
index df83619bd..466fa7853 100644
--- a/src/console.cpp
+++ b/src/console.cpp
@@ -51,7 +51,7 @@ void EMSESPShell::started() {
 
 void EMSESPShell::stopped() {
     if (has_flags(CommandFlags::ADMIN)) {
-        logger().log(LogLevel::INFO, LogFacility::AUTH, F("Admin session closed on console %s"), console_name().c_str());
+        logger().log(LogLevel::INFO, LogFacility::AUTH, F("su session closed on console %s"), console_name().c_str());
     }
     logger().log(LogLevel::INFO, LogFacility::CONSOLE, F("User session closed on console %s"), console_name().c_str());
 
@@ -570,7 +570,7 @@ void Console::load_standard_commands(unsigned int context) {
                                        flash_string_vector{F_(su)},
                                        [=](Shell & shell, const std::vector<std::string> & arguments __attribute__((unused))) {
                                            auto become_admin = [](Shell & shell) {
-                                               shell.logger().log(LogLevel::NOTICE, LogFacility::AUTH, F("Admin session opened on console"));
+                                               shell.logger().log(LogLevel::NOTICE, LogFacility::AUTH, F("su session opened on console"));
                                                shell.add_flags(CommandFlags::ADMIN);
                                            };
 
@@ -586,7 +586,7 @@ void Console::load_standard_commands(unsigned int context) {
                                                                become_admin(shell);
                                                            } else {
                                                                shell.delay_until(now + INVALID_PASSWORD_DELAY_MS, [](Shell & shell) {
-                                                                   shell.logger().log(LogLevel::NOTICE, LogFacility::AUTH, F("Invalid admin password on console"));
+                                                                   shell.logger().log(LogLevel::NOTICE, LogFacility::AUTH, F("Invalid su password on console"));
                                                                    shell.println(F("su: incorrect password"));
                                                                });
                                                            }

From 4c36f21582a708a3c223b10a1f73109005676128 Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Sun, 25 Oct 2020 18:31:02 +0100
Subject: [PATCH 08/15] topic renamed to dallassensor_data

---
 src/dallassensor.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/dallassensor.cpp b/src/dallassensor.cpp
index 1635a38bf..ac9267504 100644
--- a/src/dallassensor.cpp
+++ b/src/dallassensor.cpp
@@ -288,7 +288,7 @@ bool DallasSensor::command_info(const char * value, const int8_t id, JsonObject
 
 // creates JSON doc from values
 // returns false if empty
-// e.g. sensor_data = {"sensor1":{"id":"28-EA41-9497-0E03-5F","temp":23.30},"sensor2":{"id":"28-233D-9497-0C03-8B","temp":24.0}}
+// e.g. dallassensor_data = {"sensor1":{"id":"28-EA41-9497-0E03-5F","temp":23.30},"sensor2":{"id":"28-233D-9497-0C03-8B","temp":24.0}}
 bool DallasSensor::export_values(JsonObject & json) {
     if (sensors_.size() == 0) {
         return false;
@@ -324,12 +324,12 @@ void DallasSensor::publish_values() {
         char sensorID[10]; // sensor{1-n}
         snprintf_P(sensorID, 10, PSTR("sensor%d"), sensor_no);
         if (mqtt_format_ == Mqtt::Format::SINGLE) {
-            // e.g. sensor_data = {"28-EA41-9497-0E03":23.3,"28-233D-9497-0C03":24.0}
+            // e.g. dallassensor_data = {"28-EA41-9497-0E03":23.3,"28-233D-9497-0C03":24.0}
             if (Helpers::hasValue(sensor.temperature_c)) {
                 doc[sensor.to_string()] = (float)(sensor.temperature_c) / 10;
             }
         } else {
-            // e.g. sensor_data = {"sensor1":{"id":"28-EA41-9497-0E03","temp":23.3},"sensor2":{"id":"28-233D-9497-0C03","temp":24.0}}
+            // e.g. dallassensor_data = {"sensor1":{"id":"28-EA41-9497-0E03","temp":23.3},"sensor2":{"id":"28-233D-9497-0C03","temp":24.0}}
             JsonObject dataSensor = doc.createNestedObject(sensorID);
             dataSensor["id"]      = sensor.to_string();
             if (Helpers::hasValue(sensor.temperature_c)) {
@@ -345,7 +345,7 @@ void DallasSensor::publish_values() {
                 config["dev_cla"] = F("temperature");
 
                 char stat_t[50];
-                snprintf_P(stat_t, sizeof(stat_t), PSTR("%s/sensor_data"), System::hostname().c_str());
+                snprintf_P(stat_t, sizeof(stat_t), PSTR("%s/dallassensor_data"), System::hostname().c_str());
                 config["stat_t"] = stat_t;
 
                 config["unit_of_meas"] = F("°C");
@@ -376,7 +376,7 @@ void DallasSensor::publish_values() {
     }
 
     doc.shrinkToFit();
-    Mqtt::publish(F("sensor_data"), doc.as<JsonObject>());
+    Mqtt::publish(F("dallassensor_data"), doc.as<JsonObject>());
 }
 
 } // namespace emsesp

From 6540d2908550026a4d3992a19808826df383b196 Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Sun, 25 Oct 2020 18:31:33 +0100
Subject: [PATCH 09/15] added strings for all device names

---
 src/emsdevice.cpp | 57 ++++++++++++-----------------------------------
 1 file changed, 14 insertions(+), 43 deletions(-)

diff --git a/src/emsdevice.cpp b/src/emsdevice.cpp
index 03f32a904..b6eec34b4 100644
--- a/src/emsdevice.cpp
+++ b/src/emsdevice.cpp
@@ -73,6 +73,10 @@ std::string EMSdevice::device_type_2_device_name(const uint8_t device_type) {
         return read_flash_string(F_(solar));
         break;
 
+    case DeviceType::CONNECT:
+        return read_flash_string(F_(connect));
+        break;
+
     case DeviceType::MIXER:
         return read_flash_string(F_(mixer));
         break;
@@ -89,8 +93,12 @@ std::string EMSdevice::device_type_2_device_name(const uint8_t device_type) {
         return read_flash_string(F_(switch));
         break;
 
+    case DeviceType::GATEWAY:
+        return read_flash_string(F_(gateway));
+        break;
+
     default:
-        return std::string{};
+        return read_flash_string(F_(unknown));
         break;
     }
 }
@@ -121,55 +129,18 @@ uint8_t EMSdevice::device_name_2_device_type(const char * topic) {
         return DeviceType::MIXER;
     }
 
-    if (!strcmp_P(topic, reinterpret_cast<PGM_P>(F_(sensor)))) {
+    if (!strcmp_P(topic, reinterpret_cast<PGM_P>(F_(dallassensor)))) {
         return DeviceType::DALLASSENSOR;
     }
 
     return DeviceType::UNKNOWN;
 }
 
+// return name of the device type, capitalized
 std::string EMSdevice::device_type_name() const {
-    switch (device_type_) {
-    case DeviceType::BOILER:
-        return read_flash_string(F("Boiler"));
-        break;
-
-    case DeviceType::THERMOSTAT:
-        return read_flash_string(F("Thermostat"));
-        break;
-
-    case DeviceType::HEATPUMP:
-        return read_flash_string(F("Heat Pump"));
-        break;
-
-    case DeviceType::SOLAR:
-        return read_flash_string(F("Solar"));
-        break;
-
-    case DeviceType::CONNECT:
-        return read_flash_string(F("Connect"));
-        break;
-
-    case DeviceType::CONTROLLER:
-        return read_flash_string(F("Controller"));
-        break;
-
-    case DeviceType::MIXER:
-        return read_flash_string(F("Mixer"));
-        break;
-
-    case DeviceType::SWITCH:
-        return read_flash_string(F("Switch"));
-        break;
-
-    case DeviceType::GATEWAY:
-        return read_flash_string(F("Gateway"));
-        break;
-
-    default:
-        return read_flash_string(F("Unknown"));
-        break;
-    }
+    std::string s = device_type_2_device_name(device_type_);
+    s[0] = toupper(s[0]);
+    return s;
 }
 
 // 0=unknown, 1=bosch, 2=junkers, 3=buderus, 4=nefit, 5=sieger, 11=worcester

From 71ec36544fbc61cfbf80072e7f1ecabf750b68d7 Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Sun, 25 Oct 2020 18:32:07 +0100
Subject: [PATCH 10/15] use closure in lambdas for device type

---
 src/emsesp.cpp | 35 +++++++----------------------------
 1 file changed, 7 insertions(+), 28 deletions(-)

diff --git a/src/emsesp.cpp b/src/emsesp.cpp
index 096c793b6..cd24f0949 100644
--- a/src/emsesp.cpp
+++ b/src/emsesp.cpp
@@ -714,35 +714,14 @@ bool EMSESP::add_device(const uint8_t device_id, const uint8_t product_id, std::
     LOG_DEBUG(F("Adding new device %s (device ID 0x%02X, product ID %d, version %s)"), name.c_str(), device_id, product_id, version.c_str());
     fetch_device_values(device_id); // go and fetch its data
 
-    switch (device_p->device_type) {
-    case EMSdevice::DeviceType::BOILER:
-        Command::add_with_json(device_p->device_type, F_(info), [&](const char * value, const int8_t id, JsonObject & json) {
-            return command_info(EMSdevice::DeviceType::BOILER, json);
-        });
-        break;
-    case EMSdevice::DeviceType::MIXER:
-        Command::add_with_json(device_p->device_type, F_(info), [&](const char * value, const int8_t id, JsonObject & json) {
-            return command_info(EMSdevice::DeviceType::MIXER, json);
-        });
-        break;
-    case EMSdevice::DeviceType::SOLAR:
-        Command::add_with_json(device_p->device_type, F_(info), [&](const char * value, const int8_t id, JsonObject & json) {
-            return command_info(EMSdevice::DeviceType::SOLAR, json);
-        });
-        break;
-    case EMSdevice::DeviceType::THERMOSTAT:
-        Command::add_with_json(device_p->device_type, F_(info), [&](const char * value, const int8_t id, JsonObject & json) {
-            return command_info(EMSdevice::DeviceType::THERMOSTAT, json);
-        });
-        break;
-    case EMSdevice::DeviceType::HEATPUMP:
-        Command::add_with_json(device_p->device_type, F_(info), [&](const char * value, const int8_t id, JsonObject & json) {
-            return command_info(EMSdevice::DeviceType::HEATPUMP, json);
-        });
-        break;
-    default:
-        break;
+    // add info command, but not for all devices
+    uint8_t device_type = device_p->device_type;
+    if ((device_type == DeviceType::CONNECT) || (device_type == DeviceType::CONTROLLER) || (device_type == DeviceType::GATEWAY)) {
+        return true;
     }
+    Command::add_with_json(device_type, F_(info), [device_type](const char * value, const int8_t id, JsonObject & json) {
+        return command_info(device_type, json);
+    });
 
     return true;
 }

From 79622dbc2bd538296765f414d6f2f19d20734353 Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Sun, 25 Oct 2020 18:32:26 +0100
Subject: [PATCH 11/15] added all device types, removed sensor

---
 src/locale_EN.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/locale_EN.h b/src/locale_EN.h
index 86b268414..5c16177e1 100644
--- a/src/locale_EN.h
+++ b/src/locale_EN.h
@@ -94,7 +94,7 @@ MAKE_PSTR_WORD(connect)
 MAKE_PSTR_WORD(heatpump)
 MAKE_PSTR_WORD(generic)
 MAKE_PSTR_WORD(dallassensor)
-MAKE_PSTR_WORD(sensor)
+MAKE_PSTR_WORD(unknown)
 
 MAKE_PSTR(1space, " ")
 MAKE_PSTR(2spaces, "  ")
@@ -268,7 +268,7 @@ MAKE_PSTR(modetype, "Mode type")
 MAKE_PSTR(airHumidity, "Relative air humidity")
 MAKE_PSTR(dewTemperature, "Dew point temperature")
 
-// HA icons
+// Home Assistant icons
 MAKE_PSTR(icontemperature, "mdi:coolant-temperature")
 MAKE_PSTR(iconpercent, "mdi:sine-wave")
 MAKE_PSTR(iconfire, "mdi:fire")
@@ -284,5 +284,4 @@ MAKE_PSTR(iconthermostat, "mdi:home-thermometer-outline")
 MAKE_PSTR(iconheatpump, "mdi:water-pump")
 
 // MQTT topic suffix
-// MAKE_PSTR(mqtt_suffix_main, "_main")
 MAKE_PSTR(mqtt_suffix_ww, "_ww")

From b10e7311981db5fe22d3a57c514e823b69e9d62e Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Sun, 25 Oct 2020 18:32:52 +0100
Subject: [PATCH 12/15] rename admin password to su password

---
 src/system.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/system.cpp b/src/system.cpp
index a32a48d0e..0c6f1b37a 100644
--- a/src/system.cpp
+++ b/src/system.cpp
@@ -542,7 +542,7 @@ void System::console_commands(Shell & shell, unsigned int context) {
                                                                                             return StateUpdateResult::CHANGED;
                                                                                         },
                                                                                         "local");
-                                                                                    shell.println(F("Admin password updated"));
+                                                                                    shell.println(F("su password updated"));
                                                                                 } else {
                                                                                     shell.println(F("Passwords do not match"));
                                                                                 }
@@ -847,7 +847,7 @@ bool System::check_upgrade() {
 // value and id are ignored
 bool System::command_info(const char * value, const int8_t id, JsonObject & json) {
 #ifdef EMSESP_STANDALONE
-    json["test"] = "testing info command";
+    json["test"] = "testing system info command";
 #else
     EMSESP::esp8266React.getWiFiSettingsService()->read([&](WiFiSettings & settings) {
         char       s[7];

From b385dd9c7f696528960b4044db7a72ca204fefa8 Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Sun, 25 Oct 2020 18:33:31 +0100
Subject: [PATCH 13/15] auto formatting

---
 src/devices/mixer.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/devices/mixer.cpp b/src/devices/mixer.cpp
index 69dd9dc39..44c8a72bc 100644
--- a/src/devices/mixer.cpp
+++ b/src/devices/mixer.cpp
@@ -137,9 +137,9 @@ void Mixer::publish_values(JsonObject & json, bool force) {
         if (export_values_format(Mqtt::mqtt_format(), json)) {
             char topic[30];
             if (type() == Type::HC) {
-                snprintf_P(topic, 30, PSTR("mixer_data_hc%d"),hc_);
+                snprintf_P(topic, 30, PSTR("mixer_data_hc%d"), hc_);
             } else {
-                snprintf_P(topic, 30, PSTR("mixer_data_wwc%d"),hc_);
+                snprintf_P(topic, 30, PSTR("mixer_data_wwc%d"), hc_);
             }
             Mqtt::publish(topic, doc.as<JsonObject>());
         }

From a2153a78db7f4455c72a9ad40962a901ca8a0559 Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Sun, 25 Oct 2020 18:33:43 +0100
Subject: [PATCH 14/15] auto formatting

---
 src/devices/thermostat.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/devices/thermostat.cpp b/src/devices/thermostat.cpp
index 8cf56e29e..23f3639a6 100644
--- a/src/devices/thermostat.cpp
+++ b/src/devices/thermostat.cpp
@@ -615,7 +615,7 @@ bool Thermostat::export_values_hc(uint8_t mqtt_format, JsonObject & rootThermost
             // the topic will have the hc number appended
             if (mqtt_format == Mqtt::Format::SINGLE) {
                 char topic[30];
-                snprintf_P(topic, 30, PSTR("thermostat_data_hc%d"),hc->hc_num());
+                snprintf_P(topic, 30, PSTR("thermostat_data_hc%d"), hc->hc_num());
                 Mqtt::publish(topic, rootThermostat);
                 rootThermostat.clear(); // clear object
             }

From 9ee95985b71d065179fa86f928fadcd3a3e6c9ba Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Sun, 25 Oct 2020 18:33:54 +0100
Subject: [PATCH 15/15] updated tests

---
 src/test/test.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/test/test.cpp b/src/test/test.cpp
index b37c58d6f..cd5b2108a 100644
--- a/src/test/test.cpp
+++ b/src/test/test.cpp
@@ -27,7 +27,7 @@ namespace emsesp {
 // used with the 'test' command, under su/admin
 void Test::run_test(uuid::console::Shell & shell, const std::string & command) {
     if (command == "default") {
-        run_test(shell, "mixing"); // add the default test case here
+        run_test(shell, "general"); // add the default test case here
     }
 
     if (command.empty()) {
@@ -820,8 +820,11 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & command) {
         });
 
         EMSESP::rxservice_.ems_mask(EMSbus::EMS_MASK_BUDERUS);
-
         std::string version("1.2.3");
+
+        // add controller
+        EMSESP::add_device(0x09, 114, version, EMSdevice::Brand::BUDERUS);
+
         EMSESP::add_device(0x28, 160, version, EMSdevice::Brand::BUDERUS); // MM100, WWC
         EMSESP::add_device(0x29, 161, version, EMSdevice::Brand::BUDERUS); // MM200, WWC
         EMSESP::add_device(0x20, 160, version, EMSdevice::Brand::BOSCH);   // MM100
@@ -837,10 +840,10 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & command) {
 
         shell.invoke_command("show");
         shell.invoke_command("call");
-        shell.invoke_command("call mixing info");
+        shell.invoke_command("call mixer info");
         shell.invoke_command("publish");
         shell.invoke_command("show mqtt");
-        shell.invoke_command("call mixing");
+        shell.invoke_command("call mixer");
     }
 
     // finally dump to console