diff --git a/.gitmodules b/.gitmodules index 62e1914d..f7a9cdc0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,9 +13,6 @@ [submodule "components/moog/MoogLadders"] path = components/moog/MoogLadders url = https://github.com/ctag-fh-kiel/MoogLadders.git -[submodule "components/esp_littlefs"] - path = components/esp_littlefs - url = https://github.com/joltwallet/esp_littlefs.git [submodule "components/midi/midiXparser"] path = components/midi/midiXparser url = https://github.com/ctag-fh-kiel/midiXparser.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 119190dd..e0f58819 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,5 +71,6 @@ add_custom_target(copy-files ALL DEPENDS ${CMAKE_SOURCE_DIR}/spiffs_image COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/spiffs_image/data ${CMAKE_BINARY_DIR}/spiffs_image/dbup ) +include(managed_components/joltwallet__littlefs/project_include.cmake) littlefs_create_partition_image(storage ${CMAKE_BINARY_DIR}/spiffs_image FLASH_IN_PROJECT DEPENDS copy-files) diff --git a/components/drivers/CMakeLists.txt b/components/drivers/CMakeLists.txt index 5d576369..7bf8dadc 100644 --- a/components/drivers/CMakeLists.txt +++ b/components/drivers/CMakeLists.txt @@ -1,15 +1,15 @@ if(CONFIG_TBD_PLATFORM_MK2) idf_component_register(SRCS fs.cpp led_rgb.cpp codec.cpp mk2.cpp ssd1306.c ssd1306_i2c.c INCLUDE_DIRS "." - REQUIRES driver esp_littlefs) + REQUIRES driver ) elseif (CONFIG_TBD_PLATFORM_BBA) idf_component_register(SRCS fs.cpp led_rgb_bba.cpp codec_bba.cpp es8388.cpp midiuart.cpp ssd1306.c ssd1306_i2c.c INCLUDE_DIRS "." - REQUIRES driver esp_littlefs esp-dsp) + REQUIRES driver esp-dsp) else() idf_component_register(SRCS gpio.cpp adc.cpp fs.cpp led_rgb.cpp codec.cpp ssd1306.c ssd1306_i2c.c INCLUDE_DIRS "." - REQUIRES ulp driver esp_littlefs) + REQUIRES ulp driver ) set(ulp_app_name ulp_${COMPONENT_NAME}) diff --git a/components/drivers/idf_component.yml b/components/drivers/idf_component.yml index 343820a5..d3ca6498 100644 --- a/components/drivers/idf_component.yml +++ b/components/drivers/idf_component.yml @@ -1,3 +1,4 @@ ## IDF Component Manager Manifest File dependencies: + joltwallet/littlefs: "==1.10.2" espressif/led_strip: "^2.4.1" \ No newline at end of file diff --git a/components/esp_littlefs b/components/esp_littlefs deleted file mode 160000 index 357d0fd0..00000000 --- a/components/esp_littlefs +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 357d0fd0411fb3ca9f39a70b0127b971bc036da5 diff --git a/main/idf_component.yml b/main/idf_component.yml index a0442cee..47539133 100644 --- a/main/idf_component.yml +++ b/main/idf_component.yml @@ -1,5 +1,6 @@ ## IDF Component Manager Manifest File dependencies: + joltwallet/littlefs: "==1.10.2" espressif/mdns: "*" ## Required IDF version idf: