diff --git a/CHANGELOG.md b/CHANGELOG.md index c6f789fec..0d3d5ad0b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,15 +30,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Merged with @susisstrolch's TxMode2 branch for improved support for sending EMS packages, and removed tx_mode command - Renamed heartbeat to mqtt_heartbeat - Renamed MQTT topic "wwactivated" to "boiler_cmd_wwactivated" - -## [1.9.0b1_web] 2019-08-02 - -### Breaking changes for first time use - - -### Added - -- New web code +- Completely new web code with more features - New MyESP code optimizations - Magic Fairy dust diff --git a/src/MyESP.cpp b/src/MyESP.cpp index dd1bc70f2..a62645d60 100644 --- a/src/MyESP.cpp +++ b/src/MyESP.cpp @@ -2215,7 +2215,7 @@ void MyESP::_sendEventLog(uint8_t page) { char buffer[MYESP_JSON_MAXSIZE]; size_t len = serializeJson(root, buffer); - //Serial.printf("\nEVENTLOG: page %d\n", page); // turn on for debugging XXX + //Serial.printf("\nEVENTLOG: page %d\n", page); // turn on for debugging //serializeJson(root, Serial); // turn on for debugging _ws->textAll(buffer, len); @@ -2282,10 +2282,21 @@ void MyESP::_procMsg(AsyncWebSocketClient * client, size_t sz) { // Check whatever the command is and act accordingly if (strcmp(command, "configfile") == 0) { - fs_saveConfig(root); - _shouldRestart = true; + if (_ota_pre_callback_f) { + (_ota_pre_callback_f)(); + } + _shouldRestart = fs_saveConfig(root); + if (_ota_post_callback_f) { + (_ota_post_callback_f)(); + } } else if (strcmp(command, "custom_configfile") == 0) { - fs_saveCustomConfig(root); + if (_ota_pre_callback_f) { + (_ota_pre_callback_f)(); + } + (void)fs_saveCustomConfig(root); + if (_ota_post_callback_f) { + (_ota_post_callback_f)(); + } } else if (strcmp(command, "status") == 0) { _sendStatus(); } else if (strcmp(command, "custom_status") == 0) { diff --git a/src/MyESP.h b/src/MyESP.h index 913ee033e..4cbaae2ac 100644 --- a/src/MyESP.h +++ b/src/MyESP.h @@ -190,8 +190,8 @@ struct RtcmemData { static_assert(sizeof(RtcmemData) <= (RTCMEM_BLOCKS * 4u), "RTCMEM struct is too big"); -#define MYESP_SYSTEM_CHECK_TIME 60000 // The system is considered stable after these many millis (1 minute) -#define MYESP_SYSTEM_CHECK_MAX 10 // After this many crashes on boot +#define MYESP_SYSTEM_CHECK_TIME 60000 // The system is considered stable after these many millis (1 minute) +#define MYESP_SYSTEM_CHECK_MAX 10 // After this many crashes on boot #define MYESP_HEARTBEAT_INTERVAL 120000 // in milliseconds, how often the MQTT heartbeat is sent (2 mins) typedef struct { diff --git a/src/custom.htm b/src/custom.htm index f1f68e630..a12ba9ee9 100644 --- a/src/custom.htm +++ b/src/custom.htm @@ -225,6 +225,7 @@