From 110a20a9ae3816a399d4abcb480be954073df7a3 Mon Sep 17 00:00:00 2001 From: MichaelDvP Date: Fri, 30 Oct 2020 14:34:45 +0100 Subject: [PATCH 01/12] simple line editor --- lib/uuid-console/src/shell.cpp | 30 +++++++++++++++++++++++++++-- lib/uuid-console/src/uuid/console.h | 3 ++- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/lib/uuid-console/src/shell.cpp b/lib/uuid-console/src/shell.cpp index af90adee7..3ea50d9a9 100644 --- a/lib/uuid-console/src/shell.cpp +++ b/lib/uuid-console/src/shell.cpp @@ -226,8 +226,34 @@ void Shell::loop_normal() { line_buffer_ = oldline_; display_prompt(); } - // cursor back, forw or down: Delete line - if (((c == 'B') || (c == 'C') || (c == 'D')) && (previous_ == '[')) { + // cursor back, delete cursor chars and move on char to rest + if ((c == 'D') && (previous_ == '[')) { + line_buffer_.pop_back(); + line_buffer_.pop_back(); + if (line_buffer_.length() > 0) { + uint8_t ch = line_buffer_.back(); + line_rest_.push_back(ch); + line_buffer_.pop_back(); + } + erase_current_line(); + prompt_displayed_ = false; + display_prompt(); + } + // cursor forward, delete cursor chars and add one from rest. + if ((c == 'C') && (previous_ == '[')) { + line_buffer_.pop_back(); + line_buffer_.pop_back(); + if (line_rest_.length() > 0) { + uint8_t ch = line_rest_.back(); + line_buffer_.push_back(ch); + line_rest_.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(); diff --git a/lib/uuid-console/src/uuid/console.h b/lib/uuid-console/src/uuid/console.h index 9062dc09b..73e5f09fc 100644 --- a/lib/uuid-console/src/uuid/console.h +++ b/lib/uuid-console/src/uuid/console.h @@ -905,7 +905,8 @@ class Shell : public std::enable_shared_from_this, 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.*/ + std::string line_rest_; /*!< rest of Command line buffer if goinig back with cursor.*/ Mode mode_ = Mode::NORMAL; /*!< Current execution mode. @since 0.1.0 */ std::unique_ptr 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 */ From 17cefd6e4031396305a92ffd4ecc40775c449f05 Mon Sep 17 00:00:00 2001 From: MichaelDvP Date: Fri, 30 Oct 2020 16:06:06 +0100 Subject: [PATCH 02/12] remove thermostat errormessage 0xBF --- src/devices/thermostat.cpp | 16 ---------------- src/devices/thermostat.h | 1 - 2 files changed, 17 deletions(-) diff --git a/src/devices/thermostat.cpp b/src/devices/thermostat.cpp index 36eea00f7..9a00036c4 100644 --- a/src/devices/thermostat.cpp +++ b/src/devices/thermostat.cpp @@ -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 t) { process_RC300OutdoorTemp(t); }); register_telegram_type(0x267, F("RC300Floordry"), false, [&](std::shared_ptr t) { process_RC300Floordry(t); }); register_telegram_type(0x240, F("RC300Settings"), true, [&](std::shared_ptr t) { process_RC300Settings(t); }); - register_telegram_type(0xBF, F("RC300Error"), false, [&](std::shared_ptr t) { process_RC300Error(t); }); // JUNKERS/HT3 } else if (model == EMSdevice::EMS_DEVICE_FLAG_JUNKERS) { @@ -1315,21 +1314,6 @@ void Thermostat::process_RC300Floordry(std::shared_ptr telegram) changed_ |= telegram->read_value(floordrytemp_ , 1); } -// 0xBF RC300 Errormessage -void Thermostat::process_RC300Error(std::shared_ptr 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 telegram) { std::shared_ptr hc = heating_circuit(telegram); diff --git a/src/devices/thermostat.h b/src/devices/thermostat.h index 6fc4cd497..2d7f34421 100644 --- a/src/devices/thermostat.h +++ b/src/devices/thermostat.h @@ -272,7 +272,6 @@ class Thermostat : public EMSdevice { void process_RC300WWtemp(std::shared_ptr telegram); void process_RC300OutdoorTemp(std::shared_ptr telegram); void process_RC300Settings(std::shared_ptr telegram); - void process_RC300Error(std::shared_ptr telegram); void process_RC300Floordry(std::shared_ptr telegram); void process_JunkersMonitor(std::shared_ptr telegram); void process_JunkersSet(std::shared_ptr telegram); From 284d2b27aa7ab4184cd84493a495c57b88e83a05 Mon Sep 17 00:00:00 2001 From: MichaelDvP <59284019+MichaelDvP@users.noreply.github.com> Date: Fri, 30 Oct 2020 16:16:23 +0100 Subject: [PATCH 03/12] add cursor left/right, remove 0xBF errormessage --- CHANGELOG_LATEST.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG_LATEST.md b/CHANGELOG_LATEST.md index b9d6e0070..27164dd36 100644 --- a/CHANGELOG_LATEST.md +++ b/CHANGELOG_LATEST.md @@ -20,8 +20,8 @@ - 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 +- Console up key to repeat last command, left/right for simple editing +- added RC300 floordrying, building, damped temperature ### Fixed - fix wwontime readback From 7596a7b908a4c58b4e48c712f834d0183b4a63df Mon Sep 17 00:00:00 2001 From: proddy Date: Fri, 30 Oct 2020 19:30:41 +0100 Subject: [PATCH 04/12] rename version to v --- .github/workflows/build_firmware.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_firmware.yml b/.github/workflows/build_firmware.yml index 0cb3ec4f5..4444e531b 100644 --- a/.github/workflows/build_firmware.yml +++ b/.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: | From 8cd7e06c237d3819841509aee9d5d9a16aa48441 Mon Sep 17 00:00:00 2001 From: proddy Date: Sat, 31 Oct 2020 08:36:13 +0100 Subject: [PATCH 05/12] added littlefs to esp8266 target --- platformio.ini | 3 +++ 1 file changed, 3 insertions(+) diff --git a/platformio.ini b/platformio.ini index 15b79caf0..a5d8af090 100644 --- a/platformio.ini +++ b/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 = From 611f1962d3cf1bdc22ea0eb1987938b764e01085 Mon Sep 17 00:00:00 2001 From: proddy Date: Sat, 31 Oct 2020 08:36:25 +0100 Subject: [PATCH 06/12] typo --- src/devices/solar.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/devices/solar.cpp b/src/devices/solar.cpp index ac342a6cb..7999b24ab 100644 --- a/src/devices/solar.cpp +++ b/src/devices/solar.cpp @@ -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 t) { process_SM100wwTemperature(t); }); + register_telegram_type(0x07D6, F("SM100wwTemperature"), false, [&](std::shared_ptr t) { process_SM100wwTemperature(t); }); register_telegram_type(0x07AA, F("SM100wwStatus"), false, [&](std::shared_ptr t) { process_SM100wwStatus(t); }); register_telegram_type(0x07AB, F("SM100wwCommand"), false, [&](std::shared_ptr t) { process_SM100wwCommand(t); }); } else { From 5f2d55ea096ff9030c431db510261cb3eb76c6b8 Mon Sep 17 00:00:00 2001 From: proddy Date: Sat, 31 Oct 2020 08:36:38 +0100 Subject: [PATCH 07/12] auto formatting --- src/devices/boiler.cpp | 1 - src/devices/thermostat.cpp | 6 +++--- src/emsdevice.cpp | 2 +- src/emsfactory.h | 8 ++++---- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/devices/boiler.cpp b/src/devices/boiler.cpp index 18988e26c..097deb72d 100644 --- a/src/devices/boiler.cpp +++ b/src/devices/boiler.cpp @@ -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 diff --git a/src/devices/thermostat.cpp b/src/devices/thermostat.cpp index 9a00036c4..995bb5bff 100644 --- a/src/devices/thermostat.cpp +++ b/src/devices/thermostat.cpp @@ -1305,13 +1305,13 @@ void Thermostat::process_RC300OutdoorTemp(std::shared_ptr telegr // 0x240 RC300 parameter void Thermostat::process_RC300Settings(std::shared_ptr 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 telegram) { - changed_ |= telegram->read_value(floordrystatus_ , 0); - changed_ |= telegram->read_value(floordrytemp_ , 1); + changed_ |= telegram->read_value(floordrystatus_, 0); + changed_ |= telegram->read_value(floordrytemp_, 1); } // type 0x41 - data from the RC30 thermostat(0x10) - 14 bytes long diff --git a/src/emsdevice.cpp b/src/emsdevice.cpp index 8c5db0653..cf6852be4 100644 --- a/src/emsdevice.cpp +++ b/src/emsdevice.cpp @@ -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; } diff --git a/src/emsfactory.h b/src/emsfactory.h index ecc2b2556..2ef4addbb 100644 --- a/src/emsfactory.h +++ b/src/emsfactory.h @@ -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 { return std::unique_ptr(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); } From 3161bf34c042c166f3505ccb5b9c3369caeeb6ea Mon Sep 17 00:00:00 2001 From: proddy Date: Sat, 31 Oct 2020 08:42:59 +0100 Subject: [PATCH 08/12] change (c) header --- lib_standalone/emsuart_standalone.cpp | 2 +- lib_standalone/emsuart_standalone.h | 2 +- src/WebAPIService.cpp | 2 +- src/WebAPIService.h | 2 +- src/WebDevicesService.cpp | 2 +- src/WebDevicesService.h | 2 +- src/WebSettingsService.cpp | 2 +- src/WebSettingsService.h | 2 +- src/WebStatusService.cpp | 2 +- src/WebStatusService.h | 2 +- src/command.cpp | 2 +- src/command.h | 2 +- src/console.cpp | 2 +- src/console.h | 2 +- src/dallassensor.cpp | 2 +- src/dallassensor.h | 2 +- src/device_library.h | 2 +- src/devices/boiler.cpp | 2 +- src/devices/boiler.h | 2 +- src/devices/connect.cpp | 2 +- src/devices/connect.h | 2 +- src/devices/controller.cpp | 2 +- src/devices/controller.h | 2 +- src/devices/gateway.cpp | 2 +- src/devices/gateway.h | 2 +- src/devices/generic.cpp | 2 +- src/devices/generic.h | 2 +- src/devices/heatpump.cpp | 2 +- src/devices/heatpump.h | 2 +- src/devices/mixer.cpp | 2 +- src/devices/mixer.h | 2 +- src/devices/solar.cpp | 2 +- src/devices/solar.h | 2 +- src/devices/switch.cpp | 2 +- src/devices/switch.h | 2 +- src/devices/thermostat.cpp | 2 +- src/devices/thermostat.h | 2 +- src/emsdevice.cpp | 2 +- src/emsdevice.h | 2 +- src/emsesp.cpp | 2 +- src/emsesp.h | 2 +- src/emsfactory.h | 2 +- src/helpers.cpp | 2 +- src/helpers.h | 2 +- src/locale_EN.h | 2 +- src/main.cpp | 2 +- src/mqtt.cpp | 2 +- src/mqtt.h | 2 +- src/roomcontrol.cpp | 2 +- src/roomcontrol.h | 2 +- src/shower.cpp | 2 +- src/shower.h | 2 +- src/system.cpp | 2 +- src/system.h | 2 +- src/telegram.cpp | 2 +- src/telegram.h | 2 +- src/test/test.cpp | 2 +- src/test/test.h | 2 +- src/uart/emsuart_esp32.cpp | 2 +- src/uart/emsuart_esp32.h | 2 +- src/uart/emsuart_esp8266.cpp | 2 +- src/uart/emsuart_esp8266.h | 2 +- 62 files changed, 62 insertions(+), 62 deletions(-) diff --git a/lib_standalone/emsuart_standalone.cpp b/lib_standalone/emsuart_standalone.cpp index c30bc0db9..10c89f441 100644 --- a/lib_standalone/emsuart_standalone.cpp +++ b/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 diff --git a/lib_standalone/emsuart_standalone.h b/lib_standalone/emsuart_standalone.h index 1a4bc5503..424ad1d81 100644 --- a/lib_standalone/emsuart_standalone.h +++ b/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 diff --git a/src/WebAPIService.cpp b/src/WebAPIService.cpp index d512f3d77..dd5ef85c7 100644 --- a/src/WebAPIService.cpp +++ b/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 diff --git a/src/WebAPIService.h b/src/WebAPIService.h index a62a0224f..42aa5683d 100644 --- a/src/WebAPIService.h +++ b/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 diff --git a/src/WebDevicesService.cpp b/src/WebDevicesService.cpp index f182c918e..1a4fb2594 100644 --- a/src/WebDevicesService.cpp +++ b/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 diff --git a/src/WebDevicesService.h b/src/WebDevicesService.h index 3607b4f81..fd0a42316 100644 --- a/src/WebDevicesService.h +++ b/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 diff --git a/src/WebSettingsService.cpp b/src/WebSettingsService.cpp index dbb845f1f..31b643c15 100644 --- a/src/WebSettingsService.cpp +++ b/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 diff --git a/src/WebSettingsService.h b/src/WebSettingsService.h index 46e1a724b..881278d85 100644 --- a/src/WebSettingsService.h +++ b/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 diff --git a/src/WebStatusService.cpp b/src/WebStatusService.cpp index efeccb3da..dcafa34f2 100644 --- a/src/WebStatusService.cpp +++ b/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 diff --git a/src/WebStatusService.h b/src/WebStatusService.h index 1f2b32269..f16253542 100644 --- a/src/WebStatusService.h +++ b/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 diff --git a/src/command.cpp b/src/command.cpp index d5abec3d4..d2a203f23 100644 --- a/src/command.cpp +++ b/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 diff --git a/src/command.h b/src/command.h index 12e24d5c4..2910ca2be 100644 --- a/src/command.h +++ b/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 diff --git a/src/console.cpp b/src/console.cpp index 466fa7853..95e03ce72 100644 --- a/src/console.cpp +++ b/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 diff --git a/src/console.h b/src/console.h index 71d22af55..681b9f0bd 100644 --- a/src/console.h +++ b/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 diff --git a/src/dallassensor.cpp b/src/dallassensor.cpp index ac9267504..b1a0bf53c 100644 --- a/src/dallassensor.cpp +++ b/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 diff --git a/src/dallassensor.h b/src/dallassensor.h index 48a9143cb..bcc4e8e0d 100644 --- a/src/dallassensor.h +++ b/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 diff --git a/src/device_library.h b/src/device_library.h index badf46047..eca924972 100644 --- a/src/device_library.h +++ b/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 diff --git a/src/devices/boiler.cpp b/src/devices/boiler.cpp index 097deb72d..af8037124 100644 --- a/src/devices/boiler.cpp +++ b/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 diff --git a/src/devices/boiler.h b/src/devices/boiler.h index 0992bb5b7..3fe2f0fc1 100644 --- a/src/devices/boiler.h +++ b/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 diff --git a/src/devices/connect.cpp b/src/devices/connect.cpp index fb0962e41..99f8510f9 100644 --- a/src/devices/connect.cpp +++ b/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 diff --git a/src/devices/connect.h b/src/devices/connect.h index 545582247..aeffe084e 100644 --- a/src/devices/connect.h +++ b/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 diff --git a/src/devices/controller.cpp b/src/devices/controller.cpp index a339badb6..6adb7c050 100644 --- a/src/devices/controller.cpp +++ b/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 diff --git a/src/devices/controller.h b/src/devices/controller.h index beecb270d..1432414cf 100644 --- a/src/devices/controller.h +++ b/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 diff --git a/src/devices/gateway.cpp b/src/devices/gateway.cpp index d8fae51f5..0ee3f4417 100644 --- a/src/devices/gateway.cpp +++ b/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 diff --git a/src/devices/gateway.h b/src/devices/gateway.h index a8201b16d..46d54ddb4 100644 --- a/src/devices/gateway.h +++ b/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 diff --git a/src/devices/generic.cpp b/src/devices/generic.cpp index a7796c8eb..7f29d3e78 100644 --- a/src/devices/generic.cpp +++ b/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 diff --git a/src/devices/generic.h b/src/devices/generic.h index 4058b7439..18be62e66 100644 --- a/src/devices/generic.h +++ b/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 diff --git a/src/devices/heatpump.cpp b/src/devices/heatpump.cpp index b22c0a220..ef4adf175 100644 --- a/src/devices/heatpump.cpp +++ b/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 diff --git a/src/devices/heatpump.h b/src/devices/heatpump.h index bf7ae13e2..a1b641cc6 100644 --- a/src/devices/heatpump.h +++ b/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 diff --git a/src/devices/mixer.cpp b/src/devices/mixer.cpp index 647111c88..1ff6900cb 100644 --- a/src/devices/mixer.cpp +++ b/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 diff --git a/src/devices/mixer.h b/src/devices/mixer.h index 757da33c5..bdf3b98b3 100644 --- a/src/devices/mixer.h +++ b/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 diff --git a/src/devices/solar.cpp b/src/devices/solar.cpp index 7999b24ab..0dd816302 100644 --- a/src/devices/solar.cpp +++ b/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 diff --git a/src/devices/solar.h b/src/devices/solar.h index fa3e48f7d..526bf885b 100644 --- a/src/devices/solar.h +++ b/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 diff --git a/src/devices/switch.cpp b/src/devices/switch.cpp index 35885142f..f39d617d7 100644 --- a/src/devices/switch.cpp +++ b/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 diff --git a/src/devices/switch.h b/src/devices/switch.h index 31a4676a5..e9fb33800 100644 --- a/src/devices/switch.h +++ b/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 diff --git a/src/devices/thermostat.cpp b/src/devices/thermostat.cpp index 995bb5bff..804a82090 100644 --- a/src/devices/thermostat.cpp +++ b/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 diff --git a/src/devices/thermostat.h b/src/devices/thermostat.h index 2d7f34421..486e49daa 100644 --- a/src/devices/thermostat.h +++ b/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 diff --git a/src/emsdevice.cpp b/src/emsdevice.cpp index cf6852be4..091f4c8a6 100644 --- a/src/emsdevice.cpp +++ b/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 diff --git a/src/emsdevice.h b/src/emsdevice.h index 056a22378..3ea0d9008 100644 --- a/src/emsdevice.h +++ b/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 diff --git a/src/emsesp.cpp b/src/emsesp.cpp index 8c9ea3adb..f439ce1a1 100644 --- a/src/emsesp.cpp +++ b/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 diff --git a/src/emsesp.h b/src/emsesp.h index c8450044f..0fd6d976a 100644 --- a/src/emsesp.h +++ b/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 diff --git a/src/emsfactory.h b/src/emsfactory.h index 2ef4addbb..987d080c2 100644 --- a/src/emsfactory.h +++ b/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 diff --git a/src/helpers.cpp b/src/helpers.cpp index 24b12517e..2dfe27324 100644 --- a/src/helpers.cpp +++ b/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 diff --git a/src/helpers.h b/src/helpers.h index 553737bf3..80e4ec171 100644 --- a/src/helpers.h +++ b/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 diff --git a/src/locale_EN.h b/src/locale_EN.h index 61eafe6e7..d9bfa5d74 100644 --- a/src/locale_EN.h +++ b/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 diff --git a/src/main.cpp b/src/main.cpp index 8e0208cbb..193a62de6 100644 --- a/src/main.cpp +++ b/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 diff --git a/src/mqtt.cpp b/src/mqtt.cpp index 252620780..2bd54347e 100644 --- a/src/mqtt.cpp +++ b/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 diff --git a/src/mqtt.h b/src/mqtt.h index 8a93b82f4..6111c073a 100644 --- a/src/mqtt.h +++ b/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 diff --git a/src/roomcontrol.cpp b/src/roomcontrol.cpp index 5db25621c..a476d2872 100644 --- a/src/roomcontrol.cpp +++ b/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 diff --git a/src/roomcontrol.h b/src/roomcontrol.h index d828ca0b0..b332f9164 100644 --- a/src/roomcontrol.h +++ b/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 diff --git a/src/shower.cpp b/src/shower.cpp index 17f8bf8ff..be67e0067 100644 --- a/src/shower.cpp +++ b/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 diff --git a/src/shower.h b/src/shower.h index ff4b55e71..2498e4bc6 100644 --- a/src/shower.h +++ b/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 diff --git a/src/system.cpp b/src/system.cpp index d4de3ed66..dff320365 100644 --- a/src/system.cpp +++ b/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 diff --git a/src/system.h b/src/system.h index cc4dfb8f3..78f73f01a 100644 --- a/src/system.h +++ b/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 diff --git a/src/telegram.cpp b/src/telegram.cpp index 27de14f8f..1da3f2170 100644 --- a/src/telegram.cpp +++ b/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 diff --git a/src/telegram.h b/src/telegram.h index 205585f85..57c36a548 100644 --- a/src/telegram.h +++ b/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 diff --git a/src/test/test.cpp b/src/test/test.cpp index e6be5dca1..31ceed99d 100644 --- a/src/test/test.cpp +++ b/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 diff --git a/src/test/test.h b/src/test/test.h index 7d94eac9d..470cdd62e 100644 --- a/src/test/test.h +++ b/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 diff --git a/src/uart/emsuart_esp32.cpp b/src/uart/emsuart_esp32.cpp index f12906405..19f1945a6 100644 --- a/src/uart/emsuart_esp32.cpp +++ b/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 diff --git a/src/uart/emsuart_esp32.h b/src/uart/emsuart_esp32.h index fad76233d..eac3a2902 100644 --- a/src/uart/emsuart_esp32.h +++ b/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 diff --git a/src/uart/emsuart_esp8266.cpp b/src/uart/emsuart_esp8266.cpp index 6dd63e365..67a40b872 100644 --- a/src/uart/emsuart_esp8266.cpp +++ b/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 diff --git a/src/uart/emsuart_esp8266.h b/src/uart/emsuart_esp8266.h index 0094f69df..5dd7d8c7f 100644 --- a/src/uart/emsuart_esp8266.h +++ b/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 From 0a12b47eb25576458a2010f2cd3de9dc2db055e7 Mon Sep 17 00:00:00 2001 From: proddy Date: Sat, 31 Oct 2020 08:47:18 +0100 Subject: [PATCH 09/12] test CI build --- CHANGELOG_LATEST.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG_LATEST.md b/CHANGELOG_LATEST.md index 27164dd36..aaa46ae5a 100644 --- a/CHANGELOG_LATEST.md +++ b/CHANGELOG_LATEST.md @@ -20,7 +20,7 @@ - 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, left/right for simple editing +- Console up key to repeat last command - added RC300 floordrying, building, damped temperature ### Fixed From 6c309a2a8f58c17f24c28d84cd3649233c46ca39 Mon Sep 17 00:00:00 2001 From: MichaelDvP Date: Sat, 31 Oct 2020 10:19:12 +0100 Subject: [PATCH 10/12] cursor left/right: no extra chars and no function #587 --- lib/uuid-console/src/shell.cpp | 18 ++++++------------ lib/uuid-console/src/uuid/console.h | 1 - 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/lib/uuid-console/src/shell.cpp b/lib/uuid-console/src/shell.cpp index 3ea50d9a9..ddc03d82a 100644 --- a/lib/uuid-console/src/shell.cpp +++ b/lib/uuid-console/src/shell.cpp @@ -226,28 +226,22 @@ void Shell::loop_normal() { line_buffer_ = oldline_; display_prompt(); } - // cursor back, delete cursor chars and move on char to rest + // cursor back, delete cursor chars if ((c == 'D') && (previous_ == '[')) { line_buffer_.pop_back(); line_buffer_.pop_back(); - if (line_buffer_.length() > 0) { - uint8_t ch = line_buffer_.back(); - line_rest_.push_back(ch); - 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, delete cursor chars and add one from rest. + // cursor forward, only delete cursor chars if ((c == 'C') && (previous_ == '[')) { line_buffer_.pop_back(); line_buffer_.pop_back(); - if (line_rest_.length() > 0) { - uint8_t ch = line_rest_.back(); - line_buffer_.push_back(ch); - line_rest_.pop_back(); - } erase_current_line(); prompt_displayed_ = false; display_prompt(); diff --git a/lib/uuid-console/src/uuid/console.h b/lib/uuid-console/src/uuid/console.h index 73e5f09fc..5b65acb5f 100644 --- a/lib/uuid-console/src/uuid/console.h +++ b/lib/uuid-console/src/uuid/console.h @@ -906,7 +906,6 @@ class Shell : public std::enable_shared_from_this, public uuid::log::Hand 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 line_rest_; /*!< rest of Command line buffer if goinig back with cursor.*/ Mode mode_ = Mode::NORMAL; /*!< Current execution mode. @since 0.1.0 */ std::unique_ptr 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 */ From a6439f83702b9e2cb970e16e10a26a73071adc97 Mon Sep 17 00:00:00 2001 From: proddy Date: Sat, 31 Oct 2020 17:37:22 +0100 Subject: [PATCH 11/12] 2.1.1b --- CHANGELOG.md | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ src/version.h | 2 +- 2 files changed, 52 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 260ead5eb..10628b887 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/src/version.h b/src/version.h index b892a39cc..96602d1d1 100644 --- a/src/version.h +++ b/src/version.h @@ -1 +1 @@ -#define EMSESP_APP_VERSION "2.1.0b13" +#define EMSESP_APP_VERSION "2.1.1b0" From 4019ada7eca791f698389b109fb9ea7134eb215e Mon Sep 17 00:00:00 2001 From: proddy Date: Sat, 31 Oct 2020 17:38:19 +0100 Subject: [PATCH 12/12] 2.1.1b0 --- CHANGELOG_LATEST.md | 42 +----------------------------------------- 1 file changed, 1 insertion(+), 41 deletions(-) diff --git a/CHANGELOG_LATEST.md b/CHANGELOG_LATEST.md index aaa46ae5a..14fab2652 100644 --- a/CHANGELOG_LATEST.md +++ b/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, 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. +