diff --git a/littlefsbuilder.py b/littlefsbuilder.py deleted file mode 100644 index ee25f4fa..00000000 --- a/littlefsbuilder.py +++ /dev/null @@ -1,2 +0,0 @@ -Import("env") -env.Replace( MKSPIFFSTOOL=env.get("PROJECT_DIR") + '/vendor/mklittlefs' ) \ No newline at end of file diff --git a/platformio.ini b/platformio.ini index a4b5e474..1c85559c 100644 --- a/platformio.ini +++ b/platformio.ini @@ -15,22 +15,21 @@ default_envs = esp32 framework = arduino [env:esp32] -platform = espressif32 +platform = https://github.com/Jason2866/platform-espressif32/releases/download/v2.0.3-rc1/platform-espressif32-2.0.3-rc1.zip build_flags = ${env.build_flags} -D=${PIOENV} lib_deps = - https://github.com/lorol/LITTLEFS.git https://github.com/me-no-dev/ESPAsyncWebServer.git bblanchon/ArduinoJson @ ^6.19.4 board = esp32dev board_build.partitions = partitions_custom.csv -monitor_filters = esp32_exception_decoder +board_build.filesystem = littlefs +monitor_filters = time, colorize, log2file, esp32_exception_decoder monitor_speed = 115200 -extra_scripts = ./littlefsbuilder.py - -upload_port = COM4 \ No newline at end of file +upload_protocol = esptool +upload_port = COM3 \ No newline at end of file diff --git a/src/Configuration.cpp b/src/Configuration.cpp index 506e93b0..cbcdae45 100644 --- a/src/Configuration.cpp +++ b/src/Configuration.cpp @@ -1,6 +1,6 @@ #include "Configuration.h" #include "defaults.h" -#include +#include CONFIG_T config; @@ -24,7 +24,7 @@ void ConfigurationClass::init() bool ConfigurationClass::write() { - File f = LITTLEFS.open(CONFIG_FILENAME, "w"); + File f = LittleFS.open(CONFIG_FILENAME, "w"); if (!f) { return false; } @@ -39,7 +39,7 @@ bool ConfigurationClass::write() bool ConfigurationClass::read() { - File f = LITTLEFS.open(CONFIG_FILENAME, "r"); + File f = LittleFS.open(CONFIG_FILENAME, "r"); if (!f) { return false; } diff --git a/src/WebApi.cpp b/src/WebApi.cpp index 8f598516..5972d85b 100644 --- a/src/WebApi.cpp +++ b/src/WebApi.cpp @@ -6,7 +6,7 @@ #include "WiFiSettings.h" #include "defaults.h" #include "helper.h" -#include +#include #include WebApiClass::WebApiClass() @@ -35,7 +35,7 @@ void WebApiClass::init() _server.on("/api/ntp/config", HTTP_GET, std::bind(&WebApiClass::onNtpAdminGet, this, _1)); _server.on("/api/ntp/config", HTTP_POST, std::bind(&WebApiClass::onNtpAdminPost, this, _1)); - _server.serveStatic("/", LITTLEFS, "/", "max-age=86400").setDefaultFile("index.html"); + _server.serveStatic("/", LittleFS, "/", "max-age=86400").setDefaultFile("index.html"); _server.onNotFound(std::bind(&WebApiClass::onNotFound, this, _1)); _server.begin(); } @@ -97,8 +97,8 @@ void WebApiClass::onSystemStatus(AsyncWebServerRequest* request) root[F("heap_used")] = ESP.getHeapSize() - ESP.getFreeHeap(); root[F("sketch_total")] = ESP.getSketchSize() + ESP.getFreeSketchSpace(); root[F("sketch_used")] = ESP.getSketchSize(); - root[F("littlefs_total")] = LITTLEFS.totalBytes(); - root[F("littlefs_used")] = LITTLEFS.usedBytes(); + root[F("littlefs_total")] = LittleFS.totalBytes(); + root[F("littlefs_used")] = LittleFS.usedBytes(); root[F("chiprevision")] = ESP.getChipRevision(); root[F("chipmodel")] = ESP.getChipModel(); diff --git a/src/main.cpp b/src/main.cpp index 9d0bd79b..6ab62aa8 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -4,7 +4,7 @@ #include "WiFiSettings.h" #include "defaults.h" #include -#include +#include void setup() { @@ -17,7 +17,7 @@ void setup() // Initialize file system Serial.print(F("Initialize FS... ")); - if (!LITTLEFS.begin()) { + if (!LittleFS.begin()) { Serial.println(F("failed")); } else { Serial.println(F("done")); diff --git a/vendor/mklittlefs.exe b/vendor/mklittlefs.exe deleted file mode 100644 index aa52570b..00000000 Binary files a/vendor/mklittlefs.exe and /dev/null differ