Update esp8266 framework to most recent version (2.5.3, core 2.7.1)

ESP8266WirelessPrintAsync/ESP8266WirelessPrintAsync.ino

@@ -231,7 +231,7 @@ inline String getUploadedFilename() {
 }
 
 void handlePrint() {
-  static FileWrapper gcodeFile;
+  static File gcodeFile;
   static float prevM73Completion, prevM532Completion;
 
   if (isPrinting) {
@@ -293,7 +293,7 @@ void handlePrint() {
 }
 
 void handleUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final) {
-  static FileWrapper file;
+  static File file;
 
   if (!index) {
     lcd("Receiving...");
@@ -487,15 +487,15 @@ bool detectPrinter() {
 }
 
 void initUploadedFilename() {
-  FileWrapper dir = storageFS.open("/");
+  File dir = storageFS.open("/");
   if (dir) {
-    FileWrapper file = dir.openNextFile();
+    File file = dir.openNextFile();
     while (file && file.isDirectory()) {
       file.close();
       file = dir.openNextFile();
     }
     if (file) {
-      uploadedFullname = "/" + file.name();
+      uploadedFullname = "/" + String(file.name()) ;
       uploadedFileSize = file.size();
       file.close();
     }
@@ -624,7 +624,7 @@ void setup() {
   server.on("/download", HTTP_GET, [](AsyncWebServerRequest * request) {
     AsyncWebServerResponse *response = request->beginResponse("application/x-gcode", uploadedFileSize, [](uint8_t *buffer, size_t maxLen, size_t index) -> size_t {
       static size_t downloadBytesLeft;
-      static FileWrapper downloadFile;
+      static File downloadFile;
 
       if (!index) {
         downloadFile = storageFS.open(uploadedFullname);

ESP8266WirelessPrintAsync/StorageFS.cpp

@@ -1,40 +1,36 @@
 #include "StorageFS.h"
 
-#if defined(ESP8266)
-  SdFat SD;
-#endif
 StorageFS storageFS;
 
 bool StorageFS::hasSD, 
      StorageFS::hasSPIFFS;
 unsigned int StorageFS::maxPathLength;
 
 
-FileWrapper StorageFS::open(const String path, const char *openMode) {
-  FileWrapper file;
+File StorageFS::open(const String path, const char *openMode) {
+  File file;
 
   if (openMode == NULL || openMode[0] == '\0')
     return file;
 
   if (hasSD) {
     #if defined(ESP8266)
-      file.sdFile = SD.open(path.c_str(), openMode[0] == 'w' ? (O_WRITE | O_CREAT | O_TRUNC) : FILE_READ);
-      if (file && file.sdFile.isDirectory())
-        file.sdFile.rewindDirectory();
+      file = SD.open(path.c_str(), openMode);
+      if (file && file.isDirectory())
+        file.rewindDirectory();
     #elif defined(ESP32)
-      file.sdFile = SD.open(path, openMode);
+      file = SD.open(path, openMode);
     #endif
   }
   else if (hasSPIFFS) {
     #if defined(ESP8266)
       if (path.endsWith("/")) {
-        file.fsDir = SPIFFS.openDir(path);
-        file.fsDirType = FileWrapper::DirSource;
+        file = SPIFFS.open(path, "r");
       }
       else
-        file.fsFile = SPIFFS.open(path, openMode);
+        file = SPIFFS.open(path, openMode);
     #elif defined(ESP32)
-      file.fsFile = SPIFFS.open(path, openMode);
+      file = SPIFFS.open(path, openMode);
     #endif
   }
 

ESP8266WirelessPrintAsync/StorageFS.h

@@ -1,9 +1,16 @@
 #pragma once
 
-#include "FileWrapper.h"
 
 #if defined(ESP8266)
-  extern SdFat SD;
+  #include <SDFS.h>
+  #include <Arduino.h>
+  #define SD SDFS
+#endif
+
+#if defined(ESP32)
+  #include <SD.h>
+  #include <SPIFFS.h>
+  #include <SPI.h>
 #endif
 
 class StorageFS {
@@ -13,12 +20,14 @@ class StorageFS {
     static unsigned int maxPathLength;
 
   public:
-    inline static void begin(const bool fastSD) {
+    inline static void begin(const bool fastSD, int sdpin=SS) {
       #if defined(ESP8266)
-        hasSD = SD.begin(SS, fastSD ? SD_SCK_MHZ(50) : SPI_HALF_SPEED); // https://github.com/esp8266/Arduino/issues/1853
+        SDFSConfig cfg(sdpin, fastSD ? SD_SCK_MHZ(50) : SPI_HALF_SPEED );
+        SDFS.setConfig(cfg);
+        hasSD = SDFS.begin(); // https://github.com/esp8266/Arduino/issues/1853
       #elif defined(ESP32)
         SPI.begin(14, 2, 15, 13); // TTGO-T1 V1.3 internal microSD slot
-        hasSD = SD.begin(SS, SPI, fastSD ? 50000000 : 4000000);
+        hasSD = SD.begin(sdpin, SPI, fastSD ? 50000000 : 4000000);
       #endif
       if (hasSD)
         maxPathLength = 255;
@@ -56,7 +65,7 @@ class StorageFS {
       return maxPathLength;
     }
 
-    static FileWrapper open(const String path, const char *openMode = "r");
+    static File open(const String path, const char *openMode = "r");
     static void remove(const String filename);
 };
 

platformio.ini

@@ -16,7 +16,6 @@ src_dir = ESP8266WirelessPrintAsync
 [common]
 framework = arduino
 lib_deps =
-    https://github.com/greiman/SdFat#3b79f38
     https://github.com/me-no-dev/ESPAsyncWebServer#95dedf7
     https://github.com/me-no-dev/ESPAsyncTCP#7e9ed22
     https://github.com/me-no-dev/AsyncTCP#90715ae6
@@ -31,7 +30,7 @@ lib_deps =
 [base:esp8266]
 ; corresponds to https://github.com/platformio/platform-espressif8266/releases/tag/v2.0.0
 ; see https://github.com/esp8266/Arduino/releases/tag/2.5.0
-platform = espressif8266@2.0.0
+platform = espressif8266@2.5.3
 framework = ${common.framework}
 lib_deps = ${common.lib_deps}