From 822c9dc93e868254059598ddeb58713135f0a4a1 Mon Sep 17 00:00:00 2001 From: jacqueline Date: Tue, 13 Aug 2024 13:01:48 +1000 Subject: [PATCH] Fix build errors from stricter visibility requirements --- dependencies.lock | 2 +- lib/console/CMakeLists.txt | 2 +- lib/fatfs/CMakeLists.txt | 4 ++-- src/drivers/CMakeLists.txt | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dependencies.lock b/dependencies.lock index 7f4a0fe4..7888ec4a 100644 --- a/dependencies.lock +++ b/dependencies.lock @@ -3,7 +3,7 @@ dependencies: component_hash: null source: type: idf - version: 5.2.1 + version: 5.3.0 manifest_hash: ef2ae3a0fda058a8cda5b69636300c99782b077919557a63f8f572a6a9e0707b target: esp32 version: 1.0.0 diff --git a/lib/console/CMakeLists.txt b/lib/console/CMakeLists.txt index 5904ac5a..093380e1 100644 --- a/lib/console/CMakeLists.txt +++ b/lib/console/CMakeLists.txt @@ -28,4 +28,4 @@ idf_component_register(SRCS "commands.c" ${argtable_srcs} INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} REQUIRES vfs - PRIV_REQUIRES driver) + PRIV_REQUIRES driver esp_vfs_console) diff --git a/lib/fatfs/CMakeLists.txt b/lib/fatfs/CMakeLists.txt index b6a288e0..f641ca86 100644 --- a/lib/fatfs/CMakeLists.txt +++ b/lib/fatfs/CMakeLists.txt @@ -22,9 +22,9 @@ else() list(APPEND include_dirs "vfs") - list(APPEND requires "sdmmc") + list(APPEND requires "sdmmc" "esp_driver_sdmmc" "esp_driver_sdspi") - list(APPEND priv_requires "vfs") + list(APPEND priv_requires "vfs" "esp_driver_gpio") endif() idf_component_register(SRCS ${srcs} diff --git a/src/drivers/CMakeLists.txt b/src/drivers/CMakeLists.txt index 33d25894..fea5780f 100644 --- a/src/drivers/CMakeLists.txt +++ b/src/drivers/CMakeLists.txt @@ -8,5 +8,5 @@ idf_component_register( "samd.cpp" "wm8523.cpp" "nvs.cpp" "haptics.cpp" "spiffs.cpp" "pcm_buffer.cpp" INCLUDE_DIRS "include" REQUIRES "esp_adc" "fatfs" "result" "lvgl" "nvs_flash" "spiffs" "bt" - "tasks" "tinyfsm" "util" "libcppbor") + "tasks" "tinyfsm" "util" "libcppbor" "driver") target_compile_options(${COMPONENT_LIB} PRIVATE ${EXTRA_WARNINGS})