andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-06 15:59:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

telnet works in AP mode, no more automatic web refresh

Browse Source
This commit is contained in:
Paul Derbyshire
2019-07-08 11:23:00 +02:00
parent 61e8f093de
commit 32b61f67cf
4 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@@ -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/), 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). 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 ### 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. - 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 - 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 - 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 ### Fixed
- Detecting unset values in the SPIFFS and setting default values - Detecting unset values in the SPIFFS and setting default values
- Bosch Easy Connect wrongly classified as a thermostat - Bosch Easy Connect wrongly classified as a thermostat
- Correctly handle telegrams who's size are exactly 32 bytes (e.g. 0x19 MonitorSlow) - Correctly handle telegrams who's size are exactly 32 bytes (e.g. 0x19 MonitorSlow)
- Telnet also available when in AP mode
### Changed ### Changed
- Improved handling of Solar Modules (thanks @Vuego123) - Improved handling of Solar Modules (thanks @Vuego123)
- `publish_wait` renamed to `publish_time`, a value of 0 means disabling all MQTT sending - `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 - 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 ## [1.8.0] 2019-06-15

9
lib/MyESP/MyESP.cpp
View File

@@ -1972,7 +1972,7 @@ void MyESP::_webRootPage() {
char s[1000] = {0}; char s[1000] = {0};
strlcpy(s, webCommonPage_start, sizeof(s)); 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, webCommonPage_start_body, sizeof(s));
strlcat(s, "<h1>", sizeof(s)); strlcat(s, "<h1>", sizeof(s));
@@ -2217,7 +2217,7 @@ void MyESP::loop() {
ArduinoOTA.handle(); // OTA ArduinoOTA.handle(); // OTA
if (_ota_doing_update) { if (_ota_doing_update) {
return; // quit if in the middle of an update return; // quit if in the middle of an OTA update
} }
_calculateLoad(); _calculateLoad();
@@ -2225,12 +2225,7 @@ void MyESP::loop() {
_heartbeatCheck(); _heartbeatCheck();
_bootupSequence(); _bootupSequence();
webServer.handleClient(); // web server client requests 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 _mqttConnect(); // MQTT
yield(); // ...and breath yield(); // ...and breath

5
lib/MyESP/MyESP.h
View File

@@ -9,7 +9,7 @@
#ifndef MyEMS_h #ifndef MyEMS_h
#define MyEMS_h #define MyEMS_h
#define MYESP_VERSION "1.1.21" #define MYESP_VERSION "1.1.22"
#include <ArduinoJson.h> #include <ArduinoJson.h>
#include <ArduinoOTA.h> #include <ArduinoOTA.h>
@@ -207,9 +207,6 @@ const char webCommonPage_start[] = "<html>"
"<style>input {font-size: 1.2em; width: 100%; max-width: 350px; display: block; margin: 5px auto; }" "<style>input {font-size: 1.2em; width: 100%; max-width: 350px; display: block; margin: 5px auto; }"
"body {background-color: #FFA500;font: normal 18px Verdana, Arial, sans-serif;} </style>"; "body {background-color: #FFA500;font: normal 18px Verdana, Arial, sans-serif;} </style>";
const char webCommonPage_start_refresh[] = "<meta http-equiv='refresh' content='30'>";
const char webCommonPage_start_body[] = "</head><body>"; const char webCommonPage_start_body[] = "</head><body>";
const char webCommonPage_end[] = "</body></html>"; const char webCommonPage_end[] = "</body></html>";

2
src/version.h
View File

@@ -6,5 +6,5 @@
#pragma once #pragma once
#define APP_NAME "EMS-ESP" #define APP_NAME "EMS-ESP"
#define APP_VERSION "1.8.1b14" #define APP_VERSION "1.8.1b15"
#define APP_HOSTNAME "ems-esp" #define APP_HOSTNAME "ems-esp"