diff --git a/platformio.ini b/platformio.ini index b9bead3..13e36a0 100644 --- a/platformio.ini +++ b/platformio.ini @@ -2,22 +2,24 @@ platform = espressif8266 board = esp12e framework = arduino +board_build.filesystem = littlefs board_build.ldscript = eagle.flash.4m2m.ld lib_deps = https://github.com/aZholtikov/ZHNetwork https://github.com/aZholtikov/ZHConfig + https://github.com/aZholtikov/Async-Web-Server https://github.com/bblanchon/ArduinoJson - https://github.com/me-no-dev/ESPAsyncWebServer [env:ESP-12E-OTA] platform = espressif8266 board = esp12e framework = arduino +board_build.filesystem = littlefs board_build.ldscript = eagle.flash.4m2m.ld upload_port = 192.168.4.1 upload_protocol = espota lib_deps = https://github.com/aZholtikov/ZHNetwork https://github.com/aZholtikov/ZHConfig - https://github.com/bblanchon/ArduinoJson - https://github.com/me-no-dev/ESPAsyncWebServer \ No newline at end of file + https://github.com/aZholtikov/Async-Web-Server + https://github.com/bblanchon/ArduinoJson \ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp index f31fbc9..7ca9a92 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,6 +1,7 @@ #include "ArduinoJson.h" #include "ArduinoOTA.h" -#include "ESPAsyncWebServer.h" +#include "ESPAsyncWebServer.h" // https://github.com/aZholtikov/Async-Web-Server +#include "LittleFS.h" #include "Ticker.h" #include "ZHNetwork.h" #include "ZHConfig.h" @@ -83,7 +84,7 @@ void setup() { analogWriteRange(255); - SPIFFS.begin(); + LittleFS.begin(); loadConfig(); @@ -198,6 +199,7 @@ void onConfirmReceiving(const uint8_t *target, const uint16_t id, const bool sta { espnow_message_t message = espnowMessage[i]; if (message.id == id) + { if (status) espnowMessage.erase(espnowMessage.begin() + i); else @@ -205,14 +207,15 @@ void onConfirmReceiving(const uint8_t *target, const uint16_t id, const bool sta message.id = myNet.sendUnicastMessage(message.message, gatewayMAC, true); espnowMessage.at(i) = message; } + } } } void loadConfig() { - if (!SPIFFS.exists("/config.json")) + if (!LittleFS.exists("/config.json")) saveConfig(); - File file = SPIFFS.open("/config.json", "r"); + File file = LittleFS.open("/config.json", "r"); String jsonFile = file.readString(); StaticJsonDocument<512> json; deserializeJson(json, jsonFile); @@ -252,7 +255,7 @@ void saveConfig() json["green"] = green; json["blue"] = blue; json["system"] = "empty"; - File file = SPIFFS.open("/config.json", "w"); + File file = LittleFS.open("/config.json", "w"); serializeJsonPretty(json, file); file.close(); } @@ -260,7 +263,7 @@ void saveConfig() void setupWebServer() { webServer.on("/", HTTP_GET, [](AsyncWebServerRequest *request) - { request->send(SPIFFS, "/index.htm"); }); + { request->send(LittleFS, "/index.htm"); }); webServer.on("/setting", HTTP_GET, [](AsyncWebServerRequest *request) { @@ -282,8 +285,8 @@ void setupWebServer() webServer.onNotFound([](AsyncWebServerRequest *request) { - if (SPIFFS.exists(request->url())) - request->send(SPIFFS, request->url()); + if (LittleFS.exists(request->url())) + request->send(LittleFS, request->url()); else { request->send(404, "text/plain", "File Not Found");