Bugfixes for ESP32-Arduino2

biologist79 · Sep 8, 2022 · fae1d0b · fae1d0b
1 parent 972c0ec
commit fae1d0b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/Web.cpp b/src/Web.cpp
@@ -937,15 +937,23 @@ bool explorerDeleteDirectory(File dir) {
         if (file.isDirectory()) {
             explorerDeleteDirectory(file);
         } else {
-            gFSystem.remove(file.name());
+            #if ESP_ARDUINO_VERSION_MAJOR >= 2
+                gFSystem.remove(file.path());
+            #else
+                gFSystem.remove(file.name());
+            #endif
         }
 
         file = dir.openNextFile();
 
         esp_task_wdt_reset();
     }
 
-    return gFSystem.rmdir(dir.name());
+    #if ESP_ARDUINO_VERSION_MAJOR >= 2
+        return gFSystem.rmdir(dir.path());
+    #else
+        return gFSystem.rmdir(dir.name());
+    #endif
 }
 
 // Handles delete-requests for cachefiles.

diff --git a/src/revision.h b/src/revision.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_H__
     #define __REVISION_H__
-    constexpr const char softwareRevision[] PROGMEM = "Software-revision: 20220908-1";
+    constexpr const char softwareRevision[] PROGMEM = "Software-revision: 20220908-2";
 #endif