espressif/esp-matter
1
0
Fork 0
mirror of https://github.com/espressif/esp-matter.git synced 2026-04-27 19:13:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

examples: Fix the sequence of sdkconfig loading

Browse Source
This commit is contained in:
Shubham Patil
2024-08-22 19:30:36 +05:30
parent 652b0e7829
commit 4bc99f6db8
2 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/common/cmake_common/components_include.cmake
+16 -9
View File
@@ -2,16 +2,22 @@ cmake_minimum_required(VERSION 3.5)
message(IDF_VERSION ": $ENV{IDF_VERSION}; idf version number: ${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}.${IDF_VERSION_PATCH}")
get_filename_component(SDKCONFIG_COMMON_DIR "${CMAKE_CURRENT_SOURCE_DIR}/sdkconfig.defaults" ABSOLUTE)
set(SDKCONFIG_FILES "${SDKCONFIG_COMMON_DIR}")
# checking if sdkconfig.defaults.target_device exists
get_filename_component(SDKCONFIG_TARGET "${SDKCONFIG_COMMON_DIR}.${IDF_TARGET}" ABSOLUTE)
if(EXISTS ${SDKCONFIG_TARGET})
list(APPEND SDKCONFIG_FILES "${SDKCONFIG_TARGET}")
endif()
# Sequence of loading default sdkconfig files are based on
# https://docs.espressif.com/projects/esp-idf/en/stable/esp32/api-guides/build-system.html#custom-sdkconfig-defaults
#
# First default file should be sdkconfig.defaults,
# if that is present then sdkconfig.defaults.target will be auto loaded
set(SDKCONFIG_FILES "sdkconfig.defaults")
# Append the configurations externally provided using `SDKCONFIG_DEFAULTS` variable
list(APPEND SDKCONFIG_FILES ${SDKCONFIG_DEFAULTS})
# Then append any C2 specific files
# checking if IDF_TARGET is esp32c2
if(IDF_TARGET STREQUAL "esp32c2")
get_filename_component(SDKCONFIG_TARGET "${SDKCONFIG_COMMON_DIR}.${IDF_TARGET}" ABSOLUTE)
# checking if sdkconfig.defaults.esp32c2.idf_ver exists
get_filename_component(SDKCONFIG_ESP32C2_IDF_MINVER "${SDKCONFIG_TARGET}.v${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}" ABSOLUTE)
get_filename_component(SDKCONFIG_ESP32C2_IDF_PATVER "${SDKCONFIG_TARGET}.v${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}.${IDF_VERSION_PATCH}" ABSOLUTE)
@@ -29,6 +35,7 @@ if(EXISTS ${SDKCONFIG_SHELL_IDF_VER} AND ${IDF_VERSION_MAJOR}.${IDF_VERSION_MINO
list(APPEND SDKCONFIG_FILES "${SDKCONFIG_SHELL_IDF_VER}")
endif()
# setting the final sdkconfig path
message(SDKCONFIG_PATH ": ${SDKCONFIG_FILES}")
list(APPEND SDKCONFIG_DEFAULTS ${SDKCONFIG_FILES})
# setting the final sdkconfig files list to SDKCONFIG_DEFAULTS
set(SDKCONFIG_DEFAULTS ${SDKCONFIG_FILES})
message("Sequence of SDKCONFIG files: ${SDKCONFIG_DEFAULTS}")
examples/light/sdkconfig.defaults.c6_thread
+12
View File
@@ -58,3 +58,15 @@ CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL_FOR_THREAD=5000
CONFIG_MRP_LOCAL_IDLE_RETRY_INTERVAL_FOR_THREAD=5000
CONFIG_MRP_RETRY_INTERVAL_SENDER_BOOST_FOR_THREAD=5000
CONFIG_MRP_MAX_RETRANS=3
# ESP32-C6-DevKitM-1 Settings
# Buttons
CONFIG_BSP_BUTTONS_NUM=1
CONFIG_BSP_BUTTON_1_TYPE_GPIO=y
CONFIG_BSP_BUTTON_1_GPIO=9
CONFIG_BSP_BUTTON_1_LEVEL=0
# LEDs
CONFIG_BSP_LEDS_NUM=1
CONFIG_BSP_LED_TYPE_RGB=y
CONFIG_BSP_LED_RGB_GPIO=8
CONFIG_BSP_LED_RGB_BACKEND_RMT=y