Merge remote-tracking branch 'upstream/dev' into dev

.github/workflows/build_firmware.yml

@@ -61,7 +61,7 @@ jobs:
         # if: startsWith(github.ref, 'refs/tags/')
         with:
           body_path: BODY.txt
-          name: Development Build version ${{steps.fetch_version.outputs.s}}
+          name: Development Build v${{steps.fetch_version.outputs.s}}
           tag_name: dev
           prerelease: true
           files: |

CHANGELOG.md

@@ -5,6 +5,57 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.1.0] October 31 2020
+
+### Added
+- boiler `heatingactivated`, automatic select parameter telegrams for write
+- boiler `wWType` parameter, in Console and MQTT
+- support for uploading compressed firmware binaries in web UI
+- setting to manually override the MQTT retain flag
+- New API via HTTP REST API to read and set values. See https://emsesp.github.io/docs/#/API
+- `show commands` command
+- exporting of system settings using the `system info` command in Web and Console. Added link into the Web's Settings page.
+- setting to change how booleans are rendered in MQTT (on/off, true/false, 1/0)
+- enable ADC setting, add boiler circulation commands, add thermostat RC300 summermodes
+- Added all device info to web UI for Thermostat and Boiler
+- Added all device values to Home Assistant MQTT Discovery under separate devices and entities
+- Show Rx and Tx quality in Console and Web UI
+- Added button and tooltip to EMS Devices in Web
+- wwtemp and wwtemplow to MQTT, Console and Web
+- summer, winter modes for the CW400 thermostat
+- new command under system called `report`. http://ems-esp/api?device=system&cmd=report to generate a report log for troubleshooting
+- thermostat error codes
+- Console command `publish ha` to also force the creation of the Home Assistant MQTT Discovery topics
+- Heat pump values (dew temperature and relative air humidity)
+- Console up key to repeat last command
+- added RC300 floordrying, building, damped temperature 
+
+### Fixed
+- fix wwontime readback
+- fixed support for RC300 via MQTT commands (#505)
+- Some minor optimizations to memory handling in the MQTT service
+- Prevent MQTT from publishing empty json payloads
+- Accurate detection of warm water and heating (#515)
+- Fix writing to the Junkers FR120 thermostat
+- support for changing summermode
+- added missing `heatingtype` to thermostat data
+- handle incomming ems+ read requests, ignore F7 telegrams with 3byte-id
+- fix month for setting clock from NTP
+
+### Changed
+- renamed wWCircPumpType to wWChargeType
+- Installation and Configuration notes moved to the official EMS-ESP documentation site
+- `call` commands can be done from the Console root for all devices
+- 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 topic name changes (see doc)
+- Mixing renamed to Mixer
+
+### Removed
+- Console contexts for thermostat and boiler
+- Removed option to enable/disable the MQTT Heartbeat. It's always on.
+
 ## [2.0.1] September 13 2020
 
 ### Added

CHANGELOG_LATEST.md

@@ -1,51 +1,11 @@
 # Changelog
 
 ### Added
-- boiler `heatingactivated`, automatic select parameter telegrams for write
-- boiler `wWType` parameter, in Console and MQTT
-- support for uploading compressed firmware binaries in web UI
-- setting to manually override the MQTT retain flag
-- New API via HTTP REST API to read and set values. See https://emsesp.github.io/docs/#/API
-- `show commands` command
-- exporting of system settings using the `system info` command in Web and Console. Added link into the Web's Settings page.
-- setting to change how booleans are rendered in MQTT (on/off, true/false, 1/0)
-- enable ADC setting, add boiler circulation commands, add thermostat RC300 summermodes
-- Added all device info to web UI for Thermostat and Boiler
-- Added all device values to Home Assistant MQTT Discovery under separate devices and entities
-- Show Rx and Tx quality in Console and Web UI
-- Added button and tooltip to EMS Devices in Web
-- wwtemp and wwtemplow to MQTT, Console and Web
-- summer, winter modes for the CW400 thermostat
-- new command under system called `report`. http://ems-esp/api?device=system&cmd=report to generate a report log for troubleshooting
-- thermostat error codes
-- Console command `publish ha` to also force the creation of the Home Assistant MQTT Discovery topics
-- Heat pump values (dew temperature and relative air humidity)
-- Console up key to repeat last command
-- added RC300 floordrying, error, building, damped temperature 
 
 ### Fixed
-- fix wwontime readback
-- fixed support for RC300 via MQTT commands (#505)
-- Some minor optimizations to memory handling in the MQTT service
-- Prevent MQTT from publishing empty json payloads
-- Accurate detection of warm water and heating (#515)
-- Fix writing to the Junkers FR120 thermostat
-- support for changing summermode
-- added missing `heatingtype` to thermostat data
-- handle incomming ems+ read requests, ignore F7 telegrams with 3byte-id
-- fix month for setting clock from NTP
 
 ### Changed
-- renamed wWCircPumpType to wWChargeType
-- Installation and Configuration notes moved to the official EMS-ESP documentation site
-- `call` commands can be done from the Console root for all devices
-- 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 topic name changes (see doc)
-- Mixing renamed to Mixer
 
 ### Removed
-- Console contexts for thermostat and boiler
+
-- Removed option to enable/disable the MQTT Heartbeat. It's always on.
 

lib/uuid-console/src/shell.cpp

@@ -226,8 +226,28 @@ void Shell::loop_normal() {
                 line_buffer_ = oldline_;
                 display_prompt();
             }
-            // cursor back, forw or down: Delete line
+            // cursor back, delete cursor chars
-            if (((c == 'B') || (c == 'C') || (c == 'D')) && (previous_ == '[')) {
+            if ((c == 'D') && (previous_ == '[')) {
+                line_buffer_.pop_back();
+                line_buffer_.pop_back();
+                // alternative work as backspace
+                // if (line_buffer_.length() > 0) {
+                //     line_buffer_.pop_back();
+                // }
+                erase_current_line();
+                prompt_displayed_ = false;
+                display_prompt();
+            }
+            // cursor forward, only delete cursor chars
+            if ((c == 'C') && (previous_ == '[')) {
+                line_buffer_.pop_back();
+                line_buffer_.pop_back();
+                erase_current_line();
+                prompt_displayed_ = false;
+                display_prompt();
+            }
+            // cursor down(B): Delete line
+            if ((c == 'B') && (previous_ == '[')) {
                 erase_current_line();
                 prompt_displayed_ = false;
                 line_buffer_.clear();

lib/uuid-console/src/uuid/console.h

@@ -905,7 +905,7 @@ class Shell : public std::enable_shared_from_this<Shell>, public uuid::log::Hand
     std::string                 line_buffer_; /*!< Command line buffer. Limited to maximum_command_line_length() bytes. @since 0.1.0 */
     size_t                      maximum_command_line_length_ = MAX_COMMAND_LINE_LENGTH; /*!< Maximum command line length in bytes. @since 0.6.0 */
     unsigned char               previous_  = 0; /*!< Previous character that was entered on the command line. Used to detect CRLF line endings. @since 0.1.0 */
-    std::string                 oldline_; /*!< old Command line buffer.*/
+    std::string                 oldline_;       /*!< old Command line buffer.*/
     Mode                        mode_      = Mode::NORMAL; /*!< Current execution mode. @since 0.1.0 */
     std::unique_ptr<ModeData>   mode_data_ = nullptr;      /*!< Data associated with the current execution mode. @since 0.1.0 */
     bool                        stopped_   = false;        /*!< Indicates that the shell has been stopped. @since 0.1.0 */

lib_standalone/emsuart_standalone.cpp

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

lib_standalone/emsuart_standalone.h

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

platformio.ini

@@ -51,6 +51,7 @@ extra_scripts =
   scripts/gzip_fw.py
 board = esp12e
 platform = espressif8266
+board_build.filesystem = littlefs
 board_build.f_cpu = 160000000L
 build_flags = ${common.build_flags}
 
@@ -75,6 +76,8 @@ board_build.f_cpu = 160000000L ; 160MHz
 ; eagle.flash.4m2m.ld = 1019 KB sketch, 2024 KB SPIFFS. 4KB EEPROM, 4KB RFCAL, 12KB WIFI stack, 1028 KB OTA & buffer
 ; board_build.ldscript = eagle.flash.4m2m.ld
 build_flags = ${common.build_flags} ${common.debug_flags}
+lib_ignore =
+    AsyncTCP
 
 [env:esp32-local]
 extra_scripts =

src/WebAPIService.cpp

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/WebAPIService.h

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/WebDevicesService.cpp

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/WebDevicesService.h

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/WebSettingsService.cpp

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/WebSettingsService.h

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/WebStatusService.cpp

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/WebStatusService.h

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/command.cpp

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/command.h

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/console.cpp

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/console.h

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/dallassensor.cpp

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/dallassensor.h

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/device_library.h

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/devices/boiler.cpp

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -764,7 +764,6 @@ void Boiler::check_active() {
         Mqtt::publish(F("tapwater_active"), Helpers::render_boolean(s, b));
         EMSESP::tap_water_active(b); // let EMS-ESP know, used in the Shower class
     }
-
 }
 
 // 0x33

src/devices/boiler.h

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/devices/connect.cpp

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/devices/connect.h

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/devices/controller.cpp

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/devices/controller.h

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/devices/gateway.cpp

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/devices/gateway.h

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/devices/generic.cpp

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/devices/generic.h

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/devices/heatpump.cpp

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/devices/heatpump.h

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/devices/mixer.cpp

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/devices/mixer.h

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/devices/solar.cpp

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,7 +35,7 @@ Solar::Solar(uint8_t device_type, uint8_t device_id, uint8_t product_id, const s
 
     if (flags == EMSdevice::EMS_DEVICE_FLAG_SM100) {
         if (device_id == 0x2A) {
-            register_telegram_type(0x07D6, F("SM100wwTemperatur"), false, [&](std::shared_ptr<const Telegram> t) { process_SM100wwTemperature(t); });
+            register_telegram_type(0x07D6, F("SM100wwTemperature"), false, [&](std::shared_ptr<const Telegram> t) { process_SM100wwTemperature(t); });
             register_telegram_type(0x07AA, F("SM100wwStatus"), false, [&](std::shared_ptr<const Telegram> t) { process_SM100wwStatus(t); });
             register_telegram_type(0x07AB, F("SM100wwCommand"), false, [&](std::shared_ptr<const Telegram> t) { process_SM100wwCommand(t); });
         } else {

src/devices/solar.h

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/devices/switch.cpp

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/devices/switch.h

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/devices/thermostat.cpp

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -126,7 +126,6 @@ Thermostat::Thermostat(uint8_t device_type, uint8_t device_id, uint8_t product_i
         register_telegram_type(0x23A, F("RC300OutdoorTemp"), true, [&](std::shared_ptr<const Telegram> t) { process_RC300OutdoorTemp(t); });
         register_telegram_type(0x267, F("RC300Floordry"), false, [&](std::shared_ptr<const Telegram> t) { process_RC300Floordry(t); });
         register_telegram_type(0x240, F("RC300Settings"), true, [&](std::shared_ptr<const Telegram> t) { process_RC300Settings(t); });
-        register_telegram_type(0xBF, F("RC300Error"), false, [&](std::shared_ptr<const Telegram> t) { process_RC300Error(t); });
 
         // JUNKERS/HT3
     } else if (model == EMSdevice::EMS_DEVICE_FLAG_JUNKERS) {
@@ -1306,30 +1305,15 @@ void Thermostat::process_RC300OutdoorTemp(std::shared_ptr<const Telegram> telegr
 
 // 0x240 RC300 parameter
 void Thermostat::process_RC300Settings(std::shared_ptr<const Telegram> telegram) {
-    changed_ |= telegram->read_value(ibaBuildingType_ , 9); // 1=light, 2=medium, 3=heavy
+    changed_ |= telegram->read_value(ibaBuildingType_, 9); // 1=light, 2=medium, 3=heavy
 }
 
 // 0x267 RC300 floordrying
 void Thermostat::process_RC300Floordry(std::shared_ptr<const Telegram> telegram) {
-    changed_ |= telegram->read_value(floordrystatus_ , 0);
+    changed_ |= telegram->read_value(floordrystatus_, 0);
-    changed_ |= telegram->read_value(floordrytemp_ , 1);
+    changed_ |= telegram->read_value(floordrytemp_, 1);
 }
 
-// 0xBF RC300 Errormessage
-void Thermostat::process_RC300Error(std::shared_ptr<const Telegram> telegram) {
-    if (errorCode_.empty()) {
-        errorCode_.resize(10, '\0');
-    }
-    char buf[4];
-    buf[0] = telegram->message_data[5];
-    buf[1] = telegram->message_data[6];
-    buf[2] = telegram->message_data[7];
-    buf[3] = 0;
-    changed_ |= telegram->read_value(errorNumber_, 8);
-
-    snprintf_P(&errorCode_[0], errorCode_.capacity() + 1, PSTR("%s(%d)"), buf, errorNumber_);
-
-}
 // type 0x41 - data from the RC30 thermostat(0x10) - 14 bytes long
 void Thermostat::process_RC30Monitor(std::shared_ptr<const Telegram> telegram) {
     std::shared_ptr<Thermostat::HeatingCircuit> hc = heating_circuit(telegram);

src/devices/thermostat.h

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -272,7 +272,6 @@ class Thermostat : public EMSdevice {
     void process_RC300WWtemp(std::shared_ptr<const Telegram> telegram);
     void process_RC300OutdoorTemp(std::shared_ptr<const Telegram> telegram);
     void process_RC300Settings(std::shared_ptr<const Telegram> telegram);
-    void process_RC300Error(std::shared_ptr<const Telegram> telegram);
     void process_RC300Floordry(std::shared_ptr<const Telegram> telegram);
     void process_JunkersMonitor(std::shared_ptr<const Telegram> telegram);
     void process_JunkersSet(std::shared_ptr<const Telegram> telegram);

src/emsdevice.cpp

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -139,7 +139,7 @@ uint8_t EMSdevice::device_name_2_device_type(const char * topic) {
 // return name of the device type, capitalized
 std::string EMSdevice::device_type_name() const {
     std::string s = device_type_2_device_name(device_type_);
-    s[0] = toupper(s[0]);
+    s[0]          = toupper(s[0]);
     return s;
 }
 

src/emsdevice.h

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/emsesp.cpp

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/emsesp.h

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/emsfactory.h

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -55,12 +55,12 @@ class EMSFactory {
     }
 
     // Construct derived class returning an unique ptr
-    static auto add(const uint8_t device_type, uint8_t device_id, uint8_t product_id, std::string &version, std::string &name, uint8_t flags, uint8_t brand)
+    static auto add(const uint8_t device_type, uint8_t device_id, uint8_t product_id, std::string & version, std::string & name, uint8_t flags, uint8_t brand)
         -> std::unique_ptr<EMSdevice> {
         return std::unique_ptr<EMSdevice>(EMSFactory::makeRaw(device_type, device_id, product_id, version, name, flags, brand));
     }
 
-    virtual auto construct(uint8_t device_type, uint8_t device_id, uint8_t product_id, std::string &version, std::string &name, uint8_t flags, uint8_t brand) const
+    virtual auto construct(uint8_t device_type, uint8_t device_id, uint8_t product_id, std::string & version, std::string & name, uint8_t flags, uint8_t brand) const
         -> EMSdevice * = 0;
 
   private:
@@ -72,7 +72,7 @@ class EMSFactory {
 
     // Construct derived class returning a raw pointer
     // find which EMS device it is and use that class
-    static auto makeRaw(const uint8_t device_type, uint8_t device_id, uint8_t product_id, std::string &version, std::string &name, uint8_t flags, uint8_t brand)
+    static auto makeRaw(const uint8_t device_type, uint8_t device_id, uint8_t product_id, std::string & version, std::string & name, uint8_t flags, uint8_t brand)
         -> EMSdevice * {
         auto it = EMSFactory::getRegister().find(device_type);
         if (it != EMSFactory::getRegister().end()) {
@@ -90,7 +90,7 @@ class ConcreteEMSFactory : EMSFactory {
         EMSFactory::registerFactory(device_type, this);
     }
 
-    auto construct(uint8_t device_type, uint8_t device_id, uint8_t product_id, std::string &version, std::string &name, uint8_t flags, uint8_t brand) const
+    auto construct(uint8_t device_type, uint8_t device_id, uint8_t product_id, std::string & version, std::string & name, uint8_t flags, uint8_t brand) const
         -> EMSdevice * {
         return new DerivedClass(device_type, device_id, product_id, version, name, flags, brand);
     }

src/helpers.cpp

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/helpers.h

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/locale_EN.h

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main.cpp

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/mqtt.cpp

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/mqtt.h

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/roomcontrol.cpp

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/roomcontrol.h

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/shower.cpp

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/shower.h

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/system.cpp

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/system.h

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/telegram.cpp

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/telegram.h

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/test/test.cpp

@@ -1,7 +1,7 @@
 
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/test/test.h

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/uart/emsuart_esp32.cpp

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/uart/emsuart_esp32.h

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/uart/emsuart_esp8266.cpp

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/uart/emsuart_esp8266.h

@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/proddy/EMS-ESP
- * Copyright 2019  Paul Derbyshire
+ * Copyright 2020  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/version.h

@@ -1 +1 @@
-#define EMSESP_APP_VERSION "2.1.0b13"
+#define EMSESP_APP_VERSION "2.1.1b0"