andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-07 16:29:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

disable all interrupts when writing to SPIFFS

Browse Source
This commit is contained in:
Paul
2019-09-19 22:55:33 +02:00
parent e246f2a35c
commit 11274f31e9
2 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/MyESP.cpp
View File

@@ -213,9 +213,19 @@ void MyESP::_wifiCallback(justwifi_messages_t code, char * parameter) {
ArduinoOTA.begin(); // moved to support esp32 ArduinoOTA.begin(); // moved to support esp32
myDebug_P(PSTR("[OTA] listening to %s.local:%u"), ArduinoOTA.getHostname().c_str(), OTA_PORT); myDebug_P(PSTR("[OTA] listening to %s.local:%u"), ArduinoOTA.getHostname().c_str(), OTA_PORT);
myDebug_P(PSTR("[SYSTEM] Last reset info: %s"), (char *)ESP.getResetInfo().c_str()); // unconditionally show the last reset reason // show reason for the restart if any
unsigned char reason = _getCustomResetReason();
if (reason > 0) {
char buffer[32];
strcpy_P(buffer, custom_reset_string[reason - 1]);
myDebug_P(PSTR("[SYSTEM] Last reset reason: %s (count %d)"), buffer, _getSystemStabilityCounter());
} else {
myDebug_P(PSTR("[SYSTEM] Last reset reason: %s (count %d)"), (char *)ESP.getResetReason().c_str(), _getSystemStabilityCounter());
myDebug_P(PSTR("[SYSTEM] Last reset info: %s"), (char *)ESP.getResetInfo().c_str());
}
_mqtt_setup(); // MQTT Setup // MQTT Setup
_mqtt_setup();
// if we don't want Serial anymore, turn it off // if we don't want Serial anymore, turn it off
if (!_general_serial) { if (!_general_serial) {
@@ -1747,8 +1757,8 @@ bool MyESP::fs_saveCustomConfig(JsonObject root) {
ok = true; ok = true;
} }
if (_ota_pre_callback_f) { if (_ota_post_callback_f) {
(_ota_pre_callback_f)(); (_ota_post_callback_f)();
} }
return ok; return ok;
@@ -1782,8 +1792,8 @@ bool MyESP::fs_saveConfig(JsonObject root) {
// serializeJsonPretty(root, Serial); // for debugging // serializeJsonPretty(root, Serial); // for debugging
if (_ota_pre_callback_f) { if (_ota_post_callback_f) {
(_ota_pre_callback_f)(); (_ota_post_callback_f)();
} }
return ok; return ok;
@@ -1850,6 +1860,10 @@ bool MyESP::_fs_createCustomConfig() {
// init the SPIFF file system and load the config // init the SPIFF file system and load the config
// if it doesn't exist try and create it // if it doesn't exist try and create it
void MyESP::_fs_setup() { void MyESP::_fs_setup() {
if (_ota_pre_callback_f) {
(_ota_pre_callback_f)(); // call custom function
}
if (!SPIFFS.begin()) { if (!SPIFFS.begin()) {
myDebug_P(PSTR("[FS] Formatting filesystem...")); myDebug_P(PSTR("[FS] Formatting filesystem..."));
if (SPIFFS.format()) { if (SPIFFS.format()) {
@@ -1890,6 +1904,10 @@ void MyESP::_fs_setup() {
SPIFFS.remove(MYESP_EVENTLOG_FILE); SPIFFS.remove(MYESP_EVENTLOG_FILE);
_writeEvent("WARN", "system", "Event Log", "Log was reset due to corruption somewhere"); _writeEvent("WARN", "system", "Event Log", "Log was reset due to corruption somewhere");
} }
if (_ota_post_callback_f) {
(_ota_post_callback_f)(); // call custom function
}
} }
// returns load average as a % // returns load average as a %
@@ -2358,10 +2376,16 @@ void MyESP::_procMsg(AsyncWebSocketClient * client, size_t sz) {
uint8_t page = doc["page"]; uint8_t page = doc["page"];
_sendEventLog(page); _sendEventLog(page);
} else if (strcmp(command, "clearevent") == 0) { } else if (strcmp(command, "clearevent") == 0) {
if (_ota_pre_callback_f) {
(_ota_pre_callback_f)(); // call custom function
}
if (SPIFFS.remove(MYESP_EVENTLOG_FILE)) { if (SPIFFS.remove(MYESP_EVENTLOG_FILE)) {
_writeEvent("WARN", "system", "Event log cleared", ""); _writeEvent("WARN", "system", "Event log cleared", "");
} else { } else {
myDebug_P(PSTR("[WEB] Couldn't clear log file")); myDebug_P(PSTR("[WEB] Could not clear event log"));
}
if (_ota_post_callback_f) {
(_ota_post_callback_f)(); // call custom function
} }
} else if (strcmp(command, "scan") == 0) { } else if (strcmp(command, "scan") == 0) {
WiFi.scanNetworksAsync(std::bind(&MyESP::_printScanResult, this, std::placeholders::_1), true); WiFi.scanNetworksAsync(std::bind(&MyESP::_printScanResult, this, std::placeholders::_1), true);

2
src/MyESP.h
View File

@@ -9,7 +9,7 @@
#ifndef MyESP_h #ifndef MyESP_h
#define MyESP_h #define MyESP_h
#define MYESP_VERSION "1.2.2" #define MYESP_VERSION "1.2.3"
#include <ArduinoJson.h> #include <ArduinoJson.h>
#include <ArduinoOTA.h> #include <ArduinoOTA.h>