reverted ESPIDF to SPIFFS

Paciente8159 · Oct 30, 2023 · 51d0754 · 51d0754
1 parent 216ee5a
commit 51d0754
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 79 deletions.
diff --git a/.gitignore b/.gitignore
@@ -82,5 +82,4 @@ windows/uCNCgui/obj/Debug/net6.0-windows/uCNCgui.GeneratedMSBuildEditorConfig.ed
 #ESPIDF
 managed_components
 sdkconfig.*
-dependencies.lock
 !sdkconfig.defaults
diff --git a/dependencies.lock b/dependencies.lock
@@ -1,23 +1,9 @@
 dependencies:
-  arduino:
-    component_hash: e15adfd50cfde0e89cab8ba0e2fc54cc0b31e9357acd27d4a3e833165889d126
-    source:
-      git: https://github.com/espressif/arduino-esp32.git
-      path: .
-      type: git
-    version: 3670e2bf2aca822f2e1225fdb0e0796e490005a8
-  esp_littlefs:
-    component_hash: b41b1c9d4a7237094d0d1d4518db4662e27c4c14450f49f79a665f4d6d0135a3
-    source:
-      git: https://github.com/joltwallet/esp_littlefs.git
-      path: .
-      type: git
-    version: b671069b1e9e279f357736e7b51402f46e39d1b5
   idf:
     component_hash: null
     source:
       type: idf
     version: 4.4.4
-manifest_hash: 9405d477551dd21ee290cffa71b99487cbfd561ba2fcba3520158d376ddb3778
+manifest_hash: 748d9ec66daab24a00486d8debd2679ce41df5cbbb709cf23e88f269990f02b2
 target: esp32
 version: 1.0.0
diff --git a/uCNC/idf_component.yml b/uCNC/idf_component.yml
diff --git a/uCNC/src/hal/boards/esp32/esp32.ini b/uCNC/src/hal/boards/esp32/esp32.ini
@@ -13,8 +13,7 @@ board_build.f_cpu = 240000000L
 board_build.partitions = min_spiffs.csv
 monitor_filters=esp32_exception_decoder
 upload_speed = 921600
-board_build.filesystem = littlefs
-lib_deps = SPI, Wire, Wifi, WebServer, HTTPUpdatedServer, BluetoothSerial, LittleFS
+lib_deps = SPI, Wire, Wifi, WebServer, HTTPUpdatedServer, BluetoothSerial
 
 ##################
 # Arduino builds #
@@ -23,15 +22,21 @@ lib_deps = SPI, Wire, Wifi, WebServer, HTTPUpdatedServer, BluetoothSerial, Littl
 [env:ESP32-Wemos-D1-R32]
 extends = common_esp32
 board = wemos_d1_uno32
-build_flags = ${common_esp32.build_flags} -DBOARD=BOARD_WEMOS_D1_R32
+build_flags = ${common_esp32.build_flags} -DBOARD=BOARD_WEMOS_D1_R32 -DMCU_FLASH_FS=1
+board_build.filesystem = littlefs
+lib_deps = ${common_esp32.lib_deps}, LittleFS
 
 [env:ESP32-MKS-DLC32]
 extends = common_esp32
-build_flags = ${common_esp32.build_flags} -DBOARD=BOARD_MKS_DLC32
+build_flags = ${common_esp32.build_flags} -DBOARD=BOARD_MKS_DLC32 -DMCU_FLASH_FS=1
+board_build.filesystem = littlefs
+lib_deps = ${common_esp32.lib_deps}, LittleFS
 
 [env:ESP32-MKS-TINYBEE]
 extends = common_esp32
-build_flags = ${common_esp32.build_flags} -DBOARD=BOARD_MKS_TINYBEE
+build_flags = ${common_esp32.build_flags} -DBOARD=BOARD_MKS_TINYBEE -DMCU_FLASH_FS=1
+board_build.filesystem = littlefs
+lib_deps = ${common_esp32.lib_deps}, LittleFS
 
 #################
 # ESPIDF builds #
@@ -42,13 +47,16 @@ extends = common_esp32
 framework = arduino, espidf
 board = wemos_d1_uno32
 build_flags = ${common_esp32.build_flags} -DBOARD=BOARD_WEMOS_D1_R32
+lib_deps = ${common_esp32.lib_deps}, SPIFFS
 
 [env:ESP32IDF-MKS-DLC32]
 extends = common_esp32
 framework = arduino, espidf
 build_flags = ${common_esp32.build_flags} -DBOARD=BOARD_MKS_DLC32
+lib_deps = ${common_esp32.lib_deps}, SPIFFS
 
 [env:ESP32IDF-MKS-TINYBEE]
 extends = common_esp32
 framework = arduino, espidf
 build_flags = ${common_esp32.build_flags} -DBOARD=BOARD_MKS_TINYBEE
+lib_deps = ${common_esp32.lib_deps}, SPIFFS
diff --git a/uCNC/src/hal/mcus/esp32/esp32_arduino.cpp b/uCNC/src/hal/mcus/esp32/esp32_arduino.cpp
@@ -381,7 +381,7 @@ extern "C"
 #define MCU_FLASH_FS_SPIFFS 2
 
 #ifndef MCU_FLASH_FS
-#define MCU_FLASH_FS MCU_FLASH_FS_LITTLE_FS
+#define MCU_FLASH_FS MCU_FLASH_FS_SPIFFS
 #endif
 
 #if (MCU_FLASH_FS == MCU_FLASH_FS_LITTLE_FS)