diff --git a/CHANGELOG.md b/CHANGELOG.md index db10a3c73..3351cd6e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ 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). -## [1.8.1dev] 2019-07-01 +## [1.8.1dev] 2019-07-08 ### Added @@ -14,18 +14,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - reset firmware option. If the reset button on the ESP is pressed during boot up sequence (the LED is flashing very fast) all settings are erased and goes into AP mode. - Added tx_mode back with options 0,1 and 2 until we've fixed option 2 that works for everyone and doesn't reset ESP - More solar module data captured, thanks to @Vuego123 +- -DNO_SERIAL option added to determine if the Serial port should be enabled on fresh installs ### Fixed - Detecting unset values in the SPIFFS and setting default values - Bosch Easy Connect wrongly classified as a thermostat - Correctly handle telegrams who's size are exactly 32 bytes (e.g. 0x19 MonitorSlow) +- Telnet also available when in AP mode ### Changed - Improved handling of Solar Modules (thanks @Vuego123) - `publish_wait` renamed to `publish_time`, a value of 0 means disabling all MQTT sending - How signed shorts are handled such as the current and setpoint temps on RC300s +- Stopped automatic refresh of web page, which causes crashes/memory loss after a short time ## [1.8.0] 2019-06-15 diff --git a/lib/MyESP/MyESP.cpp b/lib/MyESP/MyESP.cpp index 16c1a6879..9fd14b039 100644 --- a/lib/MyESP/MyESP.cpp +++ b/lib/MyESP/MyESP.cpp @@ -1972,7 +1972,7 @@ void MyESP::_webRootPage() { char s[1000] = {0}; strlcpy(s, webCommonPage_start, sizeof(s)); - strlcat(s, webCommonPage_start_refresh, sizeof(s)); + // strlcat(s, webCommonPage_start_refresh, sizeof(s)); strlcat(s, webCommonPage_start_body, sizeof(s)); strlcat(s, "

", sizeof(s)); @@ -2217,7 +2217,7 @@ void MyESP::loop() { ArduinoOTA.handle(); // OTA if (_ota_doing_update) { - return; // quit if in the middle of an update + return; // quit if in the middle of an OTA update } _calculateLoad(); @@ -2225,12 +2225,7 @@ void MyESP::loop() { _heartbeatCheck(); _bootupSequence(); webServer.handleClient(); // web server client requests - - // if we're in AP mode, use the web server, otherwise switch to telnet - if (!isAPmode()) { - _telnetHandle(); - } - + _telnetHandle(); _mqttConnect(); // MQTT yield(); // ...and breath diff --git a/lib/MyESP/MyESP.h b/lib/MyESP/MyESP.h index d2c8cdf3f..f04551d2a 100644 --- a/lib/MyESP/MyESP.h +++ b/lib/MyESP/MyESP.h @@ -9,7 +9,7 @@ #ifndef MyEMS_h #define MyEMS_h -#define MYESP_VERSION "1.1.21" +#define MYESP_VERSION "1.1.22" #include #include @@ -207,9 +207,6 @@ const char webCommonPage_start[] = "" ""; - -const char webCommonPage_start_refresh[] = ""; - const char webCommonPage_start_body[] = ""; const char webCommonPage_end[] = ""; diff --git a/src/version.h b/src/version.h index a5bd2e845..cec3620a1 100644 --- a/src/version.h +++ b/src/version.h @@ -6,5 +6,5 @@ #pragma once #define APP_NAME "EMS-ESP" -#define APP_VERSION "1.8.1b14" +#define APP_VERSION "1.8.1b15" #define APP_HOSTNAME "ems-esp"