Skip to content

Commit

Permalink
fix(idf): Switch to require through the component yaml
Browse files Browse the repository at this point in the history
  • Loading branch information
me-no-dev committed Jun 3, 2024
1 parent 4728611 commit 56606d9
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 7 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ endforeach()
set(includedirs variants/${CONFIG_ARDUINO_VARIANT}/ cores/esp32/ ${ARDUINO_LIBRARIES_INCLUDEDIRS})
set(srcs ${CORE_SRCS} ${ARDUINO_LIBRARIES_SRCS})
set(priv_includes cores/esp32/libb64)
set(requires spi_flash esp_partition mbedtls wifi_provisioning wpa_supplicant esp_adc esp_eth http_parser espressif__mdns)
set(requires spi_flash esp_partition mbedtls wifi_provisioning wpa_supplicant esp_adc esp_eth http_parser)
set(priv_requires fatfs nvs_flash app_update spiffs bootloader_support bt esp_hid usb ${ARDUINO_LIBRARIES_REQUIRES})

idf_component_register(INCLUDE_DIRS ${includedirs} PRIV_INCLUDE_DIRS ${priv_includes} SRCS ${srcs} REQUIRES ${requires} PRIV_REQUIRES ${priv_requires})
Expand Down
16 changes: 10 additions & 6 deletions idf_component.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ files:
dependencies:
idf: ">=5.1,<5.2"
# mdns 1.2.1 is necessary to build H2 with no WiFi
mdns: "^1.2.3"
espressif/esp_modem: "^1.1.0"
chmorgan/esp-libhelix-mp3:
version: "1.0.3"
espressif/mdns:
version: "^1.2.3"
require: public
espressif/esp_modem:
version: "^1.1.0"
espressif/esp-zboss-lib:
version: "^1.0.1"
rules:
Expand All @@ -57,7 +57,7 @@ dependencies:
version: "^1.0.1"
rules:
- if: "target != esp32c2"
esp-dsp:
espressif/esp-dsp:
version: "^1.3.4"
rules:
- if: "target != esp32c2"
Expand All @@ -77,10 +77,14 @@ dependencies:
version: "^0.1.0~1"
rules:
- if: "target != esp32c2"
joltwallet/littlefs: "^1.10.2"
espressif/esp-sr:
version: "^1.4.2"
rules:
- if: "target in [esp32s3]"
joltwallet/littlefs:
version: "^1.10.2"
chmorgan/esp-libhelix-mp3:
version: "1.0.3"
require: public
examples:
- path: ./idf_component_examples/Hello_world

0 comments on commit 56606d9

Please sign in to comment.