From d048b2d57a8aaa6b3977541db7295ac5620ed9c0 Mon Sep 17 00:00:00 2001 From: Brendan <2bndy5@gmail.com> Date: Tue, 9 Apr 2024 12:06:59 -0700 Subject: [PATCH] switch to using idf_component.yml for RF24 (local path) dependency --- examples_esp/getting_started/CMakeLists.txt | 3 --- examples_esp/getting_started/Kconfig | 1 - examples_esp/getting_started/dependencies.lock | 8 +++++++- examples_esp/getting_started/src/idf_component.yml | 5 +++++ 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/examples_esp/getting_started/CMakeLists.txt b/examples_esp/getting_started/CMakeLists.txt index 07b0ba75..ec145d24 100644 --- a/examples_esp/getting_started/CMakeLists.txt +++ b/examples_esp/getting_started/CMakeLists.txt @@ -1,6 +1,3 @@ cmake_minimum_required(VERSION 3.16.0) include($ENV{IDF_PATH}/tools/cmake/project.cmake) -# include parent folder (repo root) as a component library -list(APPEND EXTRA_COMPONENT_DIRS ../../) -# in user projects (external to RF24 repo), they should use `idf_component_register()` instead project(getting_started) diff --git a/examples_esp/getting_started/Kconfig b/examples_esp/getting_started/Kconfig index 6a738399..017f7466 100644 --- a/examples_esp/getting_started/Kconfig +++ b/examples_esp/getting_started/Kconfig @@ -7,4 +7,3 @@ config RF24_CSN_PIN int "The GPIO pin number used for the radio's CSN pin" help If undefined, then the main app's code defaults to using pin 8. - \ No newline at end of file diff --git a/examples_esp/getting_started/dependencies.lock b/examples_esp/getting_started/dependencies.lock index b3130528..1b79d8b5 100644 --- a/examples_esp/getting_started/dependencies.lock +++ b/examples_esp/getting_started/dependencies.lock @@ -16,6 +16,12 @@ dependencies: source: type: idf version: 5.2.1 -manifest_hash: 65bdfdf3ce9ef7f7d3d9c4c075a17d649adf01fa2984a9b54e4b8b493274a309 + nRF24/RF24: + component_hash: null + source: + path: C:\dev\RF24 + type: local + version: '*' +manifest_hash: 1ce988382cdd4e2de357dd7ddd71b47091cb0109a1223eca45c2e086bfadc03e target: esp32s2 version: 1.0.0 diff --git a/examples_esp/getting_started/src/idf_component.yml b/examples_esp/getting_started/src/idf_component.yml index ff67b5da..289d194a 100644 --- a/examples_esp/getting_started/src/idf_component.yml +++ b/examples_esp/getting_started/src/idf_component.yml @@ -2,3 +2,8 @@ dependencies: espressif/esp_tinyusb: "^1" idf: "^5.0" + nRF24/RF24: + # for external projects (not included in the RF24 repo), instead use + # nRF24/RF24: "^1.5" + # for this project, we use the current repo changes (for testing purposes) + path: ../../../