restore default littleFS

.gitmodules

@@ -2,9 +2,6 @@
 	path = FW/leo_muziekdoos_esp32/lib/ESP8266Audio
 	url = http://git.oldemans.nl/libs/ESP8266Audio.git
 	branch = master
-[submodule "FW/leo_muziekdoos_esp32/lib/littleFS_esp32"]
-	path = FW/leo_muziekdoos_esp32/lib/littleFS_esp32
-	url = http://git.oldemans.nl/libs/LittleFS_esp32
 [submodule "FW/leo_muziekdoos_esp32/lib/JCButton"]
 	path = FW/leo_muziekdoos_esp32/lib/JCButton
 	url = http://git.oldemans.nl/libs/JCButton.git
@@ -12,6 +9,7 @@
 [submodule "FW/leo_muziekdoos_esp32/lib/NDEF"]
 	path = FW/leo_muziekdoos_esp32/lib/NDEF
 	url = http://git.oldemans.nl/libs/rfid.NDEF.git
+	branch = master
 [submodule "FW/leo_muziekdoos_esp32/lib/PN532"]
 	path = FW/leo_muziekdoos_esp32/lib/PN532
 	url = http://git.oldemans.nl/libs/rfid.PN532.git
@@ -23,15 +21,11 @@
 	path = FW/leo_muziekdoos_esp32/lib/BatterySense
 	url = http://git.oldemans.nl/libs/BatterySense.git
 	branch = master
-[submodule "CAD"]
-	path = CAD
-	url = http://git.oldemans.nl/projects_leo/muziekdooos_hardware.git
-	branch = master
 [submodule "FW/leo_muziekdoos_esp32/lib/ADC_ADS1x15"]
 	path = FW/leo_muziekdoos_esp32/lib/ADC_ADS1x15
 	url = http://git.oldemans.nl/libs/ADC_ADS1X15.git
 	branch = master
-[submodule "CAD"]
+[submodule "CAD-SCH"]
-	path = CAD
+	path = CADSCH
 	url = http://git.oldemans.nl/projects_leo/muziekdooos_hardware.git
 	branch = master

FW/leo_muziekdoos_esp32/platformio.ini

@@ -22,12 +22,14 @@ lib_deps =
 	fastled/FastLED@^3.5.0
 	#robtillaart/AS5600 @ ^0.3.4
 	robtillaart/AS5600 @ ^0.3.6
+	LITTLEFS
 build_src_filter = ${env.build_src_filter}
 lib_ldf_mode = deep+
 build_flags = 
 	-DHARDWARE=2
 	-DCORE_DEBUG_LEVEL=3
 	-DNDEF_DEBUG=1
+	-fexceptions
 extra_scripts = ./littlefsbuilder.py
 board_build.filesystem = littlefs
 

FW/leo_muziekdoos_esp32/src/config.cpp

@@ -1,7 +1,7 @@
 #include "config.h"
 #include <vector>
 #include "FS.h"
-#include "LITTLEFS.h"
+#include <LittleFS.h>
 #include "ArduinoJson.h"
 
 const char *tagConfigfile = "/settings.json";
@@ -86,7 +86,7 @@ float getFloatParam(String param, int def)
 void loadConfig(const char *fname)
 {
   log_i("config: load");
-  File file = LITTLEFS.open(fname);
+  File file = LittleFS.open(fname);
 
   DeserializationError error = deserializeJson(settingsDoc, file);
   if (error)

FW/leo_muziekdoos_esp32/src/ota.h

@@ -7,7 +7,7 @@
 
 #include "ArduinoOTA.h"
 #include "JC_Button.h"
-#include "LITTLEFS.h"
+#include "LittleFS.h"
 
 #define WIFICONNECTINTERVAL 1000
 

FW/leo_muziekdoos_esp32/src/storage.cpp

@@ -10,7 +10,7 @@
       #define ESP_V2
     #endif
   #else
-    #include <LITTLEFS.h>
+    #include <LittleFS.h>
   #endif
 
 #ifndef CONFIG_LITTLEFS_FOR_IDF_3_2
@@ -92,12 +92,12 @@ void readFile(fs::FS &fs, const char *path)
 
 void initStorage()
 {
-  if (!LITTLEFS.begin(FORMAT_LITTLEFS_IF_FAILED))
+  if (!LittleFS.begin(FORMAT_LITTLEFS_IF_FAILED))
   {
-    log_e("LITTLEFS Mount Failed");
+    log_e("LittleFS Mount Failed");
     return;
   }
-  listDir(LITTLEFS, "/", 0);
+  listDir(LittleFS, "/", 0);
 }
 
 void handleStorage()