From d96280a5cc66a073e5c140f11726f7d894231fa3 Mon Sep 17 00:00:00 2001 From: YuanMingFu Date: Thu, 25 Jul 2024 12:18:12 +0800 Subject: [PATCH] idf: update version to v5.2.3 --- .github/workflows/docker-image.yml | 2 +- .gitlab-ci.yml | 6 ++-- README.md | 6 ++-- docs/en/developing.rst | 2 +- docs/en/security.rst | 2 +- .../sdkconfig.defaults.esp32c2 | 15 ++++++++-- examples/controller/sdkconfig.defaults | 7 ++--- examples/controller/sdkconfig.defaults.otbr | 4 +-- examples/door_lock/sdkconfig.defaults.esp32c2 | 19 ++++++++++-- .../generic_switch/sdkconfig.defaults.esp32c2 | 15 ++++++++-- examples/light/sdkconfig.defaults.esp32c2 | 15 ++++++++-- .../light_switch/sdkconfig.defaults.esp32c2 | 29 +++++++++++++++++-- examples/light_wifi_prov/sdkconfig.defaults | 7 +++++ .../sdkconfig.defaults.esp32c2 | 20 ++++++++----- .../refrigerator/sdkconfig.defaults.esp32c2 | 27 ++++++++++++----- .../sdkconfig.defaults.esp32c2 | 29 +++++++++++++++++-- .../thread_border_router/sdkconfig.defaults | 2 +- examples/zap_light/sdkconfig.defaults.esp32c2 | 29 +++++++++++++++++-- tools/docker/chip_idf/Dockerfile | 2 +- 19 files changed, 183 insertions(+), 55 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index eb2e87dcd..5a769883d 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -27,7 +27,7 @@ on: env: DOCKERHUB_REPO: ${{ github.repository }} - REQUIRED_IDF_VERSION: v5.2.1 + REQUIRED_IDF_VERSION: v5.2.3 jobs: build: diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e56285b3d..a1117e50d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,7 +22,7 @@ variables: MATTER_CACHE_DIR: /cache/matter_build # This variable represents the latest idf version supported for the target branch. # Note: Do change this variable in case of idf version change MR. - IDF_CHECKOUT_REF: "v5.2.1" + IDF_CHECKOUT_REF: "v5.2.3" # This variable represents the short hash of the connectedhomeip submodule. # Note: Do change this short hash on submodule update MRs. CHIP_SHORT_HASH: "17b1a38e90" @@ -65,7 +65,7 @@ variables: - apt-get install -y openssh-client - git clone ${ESP_THREAD_BR_REPO_URL} - cd ${BR_PATH}/examples/basic_thread_border_router - - git checkout v1.0 + - git checkout v1.1 - idf.py set-target esp32s3 - idf.py build @@ -170,7 +170,7 @@ build_image: # Change the idf version here in case of idf version change MR. - IDF_VERSION: - "v4.4.3" - - "v5.2.1" + - "v5.2.3" .build_examples_template: stage: build diff --git a/README.md b/README.md index 29561d38d..8fb88e09d 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,6 @@ Espressif's SDK for Matter is the official Matter development framework for ESP3 [Supported Device Types](SUPPORTED_DEVICE_TYPES.md) - ## Supported Matter specification versions | Matter Specification Version | Supported Branch | @@ -29,9 +28,8 @@ section in the ESP-Matter Programming Guide. ## Supported ESP-IDF and connectedhomeip versions -- This SDK currently works with commit [17b1a38e90](https://github.com/project-chip/connectedhomeip/tree/17b1a38e90`) of connectedhomeip. -- For Matter projects development with this SDK, it is recommended to utilize ESP-IDF [v5.2.1](https://github.com/espressif/esp-idf/tree/v5.2.1). - +- This SDK currently works with commit [17b1a38e90](https://github.com/project-chip/connectedhomeip/tree/17b1a38e90) of connectedhomeip. +- For Matter projects development with this SDK, it is recommended to utilize ESP-IDF [v5.2.3](https://github.com/espressif/esp-idf/tree/v5.2.3). ## Documentation diff --git a/docs/en/developing.rst b/docs/en/developing.rst index 4cb9c9610..a973e5077 100644 --- a/docs/en/developing.rst +++ b/docs/en/developing.rst @@ -62,7 +62,7 @@ Cloning esp-idf: :: git clone --recursive https://github.com/espressif/esp-idf.git - cd esp-idf; git checkout v5.2.1; git submodule update --init --recursive; + cd esp-idf; git checkout v5.2.3; git submodule update --init --recursive; ./install.sh cd .. diff --git a/docs/en/security.rst b/docs/en/security.rst index 31d3b9963..54ded72fb 100644 --- a/docs/en/security.rst +++ b/docs/en/security.rst @@ -1,7 +1,7 @@ 5. Security Considerations ========================== -{IDF_TARGET_RELEASE:default="v5.2.1"} +{IDF_TARGET_RELEASE:default="v5.2.3"} 5.1 Overview ------------ diff --git a/examples/all_device_types_app/sdkconfig.defaults.esp32c2 b/examples/all_device_types_app/sdkconfig.defaults.esp32c2 index 300a7e222..d4f6e409d 100644 --- a/examples/all_device_types_app/sdkconfig.defaults.esp32c2 +++ b/examples/all_device_types_app/sdkconfig.defaults.esp32c2 @@ -1,6 +1,12 @@ +# Compiler options +CONFIG_COMPILER_OPTIMIZATION_SIZE=y +CONFIG_COMPILER_SAVE_RESTORE_LIBCALLS=y +CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE=y + # Bluetooth CONFIG_BT_ENABLED=y CONFIG_BT_NIMBLE_ENABLED=y + ## NimBLE Options CONFIG_BT_NIMBLE_MAX_CONNECTIONS=1 CONFIG_BT_NIMBLE_MAX_BONDS=2 @@ -8,16 +14,19 @@ CONFIG_BT_NIMBLE_MAX_CCCDS=2 CONFIG_BT_NIMBLE_HOST_TASK_STACK_SIZE=3072 CONFIG_BT_NIMBLE_ROLE_CENTRAL=n CONFIG_BT_NIMBLE_ROLE_OBSERVER=n +CONFIG_BT_NIMBLE_SECURITY_ENABLE=n +CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT=n +CONFIG_BT_NIMBLE_WHITELIST_SIZE=1 +CONFIG_BT_NIMBLE_GATT_MAX_PROCS=1 CONFIG_BT_NIMBLE_MSYS_1_BLOCK_COUNT=10 CONFIG_BT_NIMBLE_MSYS_1_BLOCK_SIZE=100 CONFIG_BT_NIMBLE_MSYS_2_BLOCK_COUNT=4 +CONFIG_BT_NIMBLE_MSYS_2_BLOCK_SIZE=320 CONFIG_BT_NIMBLE_ACL_BUF_COUNT=5 CONFIG_BT_NIMBLE_HCI_EVT_HI_BUF_COUNT=5 CONFIG_BT_NIMBLE_HCI_EVT_LO_BUF_COUNT=3 -CONFIG_BT_NIMBLE_GATT_MAX_PROCS=1 CONFIG_BT_NIMBLE_ENABLE_CONN_REATTEMPT=n -CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT=n -CONFIG_BT_NIMBLE_WHITELIST_SIZE=1 + ## Controller Options CONFIG_BT_LE_CONTROLLER_TASK_STACK_SIZE=3072 CONFIG_BT_LE_LL_RESOLV_LIST_SIZE=1 diff --git a/examples/controller/sdkconfig.defaults b/examples/controller/sdkconfig.defaults index 23e9ec334..ba6461a1a 100644 --- a/examples/controller/sdkconfig.defaults +++ b/examples/controller/sdkconfig.defaults @@ -10,9 +10,6 @@ CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y CONFIG_BT_ENABLED=y CONFIG_BT_NIMBLE_ENABLED=y -#enable lwip ipv6 autoconfig -CONFIG_LWIP_IPV6_AUTOCONFIG=y - # Use a custom partition table CONFIG_PARTITION_TABLE_CUSTOM=y CONFIG_PARTITION_TABLE_FILENAME="partitions.csv" @@ -25,9 +22,11 @@ CONFIG_USE_TEST_SETUP_DISCRIMINATOR=0xF0 CONFIG_ENABLE_CHIP_SHELL=y CONFIG_ESP_MATTER_CONSOLE_TASK_STACK=4096 -#enable lwIP route hooks +# lwip CONFIG_LWIP_HOOK_IP6_ROUTE_DEFAULT=y CONFIG_LWIP_HOOK_ND6_GET_GW_DEFAULT=y +CONFIG_LWIP_IPV6_AUTOCONFIG=y +CONFIG_LWIP_IPV6_NUM_ADDRESSES=12 # Increase Stack size CONFIG_CHIP_TASK_STACK_SIZE=15360 diff --git a/examples/controller/sdkconfig.defaults.otbr b/examples/controller/sdkconfig.defaults.otbr index 7b7334803..a46459b8d 100644 --- a/examples/controller/sdkconfig.defaults.otbr +++ b/examples/controller/sdkconfig.defaults.otbr @@ -17,7 +17,7 @@ CONFIG_BT_NIMBLE_ENABLED=y #LwIP config for OpenThread CONFIG_LWIP_IPV6_AUTOCONFIG=y -CONFIG_LWIP_IPV6_NUM_ADDRESSES=8 +CONFIG_LWIP_IPV6_NUM_ADDRESSES=12 CONFIG_LWIP_MULTICAST_PING=y CONFIG_LWIP_IPV6_FORWARD=y CONFIG_LWIP_HOOK_IP6_ROUTE_DEFAULT=y @@ -86,7 +86,7 @@ CONFIG_SPIRAM=y CONFIG_SPIRAM_SPEED_80M=y CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=512 CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=8192 -CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=n +CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=y CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y # Enable HKDF for mbedtls diff --git a/examples/door_lock/sdkconfig.defaults.esp32c2 b/examples/door_lock/sdkconfig.defaults.esp32c2 index a09ac363a..d4f6e409d 100644 --- a/examples/door_lock/sdkconfig.defaults.esp32c2 +++ b/examples/door_lock/sdkconfig.defaults.esp32c2 @@ -1,6 +1,12 @@ +# Compiler options +CONFIG_COMPILER_OPTIMIZATION_SIZE=y +CONFIG_COMPILER_SAVE_RESTORE_LIBCALLS=y +CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE=y + # Bluetooth CONFIG_BT_ENABLED=y CONFIG_BT_NIMBLE_ENABLED=y + ## NimBLE Options CONFIG_BT_NIMBLE_MAX_CONNECTIONS=1 CONFIG_BT_NIMBLE_MAX_BONDS=2 @@ -8,16 +14,19 @@ CONFIG_BT_NIMBLE_MAX_CCCDS=2 CONFIG_BT_NIMBLE_HOST_TASK_STACK_SIZE=3072 CONFIG_BT_NIMBLE_ROLE_CENTRAL=n CONFIG_BT_NIMBLE_ROLE_OBSERVER=n +CONFIG_BT_NIMBLE_SECURITY_ENABLE=n +CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT=n +CONFIG_BT_NIMBLE_WHITELIST_SIZE=1 +CONFIG_BT_NIMBLE_GATT_MAX_PROCS=1 CONFIG_BT_NIMBLE_MSYS_1_BLOCK_COUNT=10 CONFIG_BT_NIMBLE_MSYS_1_BLOCK_SIZE=100 CONFIG_BT_NIMBLE_MSYS_2_BLOCK_COUNT=4 +CONFIG_BT_NIMBLE_MSYS_2_BLOCK_SIZE=320 CONFIG_BT_NIMBLE_ACL_BUF_COUNT=5 CONFIG_BT_NIMBLE_HCI_EVT_HI_BUF_COUNT=5 CONFIG_BT_NIMBLE_HCI_EVT_LO_BUF_COUNT=3 -CONFIG_BT_NIMBLE_GATT_MAX_PROCS=1 CONFIG_BT_NIMBLE_ENABLE_CONN_REATTEMPT=n -CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT=n -CONFIG_BT_NIMBLE_WHITELIST_SIZE=1 + ## Controller Options CONFIG_BT_LE_CONTROLLER_TASK_STACK_SIZE=3072 CONFIG_BT_LE_LL_RESOLV_LIST_SIZE=1 @@ -39,6 +48,10 @@ CONFIG_ESP_EVENT_POST_FROM_ISR=n # Chip revision CONFIG_ESP32C2_REV2_DEVELOPMENT=y +# Main XTAL Config +CONFIG_XTAL_FREQ_26=y +CONFIG_XTAL_FREQ_40=n + # ESP Ringbuf CONFIG_RINGBUF_PLACE_FUNCTIONS_INTO_FLASH=y CONFIG_RINGBUF_PLACE_ISR_FUNCTIONS_INTO_FLASH=y diff --git a/examples/generic_switch/sdkconfig.defaults.esp32c2 b/examples/generic_switch/sdkconfig.defaults.esp32c2 index 02461b8fd..ac7d4c0c8 100644 --- a/examples/generic_switch/sdkconfig.defaults.esp32c2 +++ b/examples/generic_switch/sdkconfig.defaults.esp32c2 @@ -1,6 +1,12 @@ +# Compiler options +CONFIG_COMPILER_OPTIMIZATION_SIZE=y +CONFIG_COMPILER_SAVE_RESTORE_LIBCALLS=y +CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE=y + # Bluetooth CONFIG_BT_ENABLED=y CONFIG_BT_NIMBLE_ENABLED=y + ## NimBLE Options CONFIG_BT_NIMBLE_MAX_CONNECTIONS=1 CONFIG_BT_NIMBLE_MAX_BONDS=2 @@ -8,16 +14,19 @@ CONFIG_BT_NIMBLE_MAX_CCCDS=2 CONFIG_BT_NIMBLE_HOST_TASK_STACK_SIZE=3072 CONFIG_BT_NIMBLE_ROLE_CENTRAL=n CONFIG_BT_NIMBLE_ROLE_OBSERVER=n +CONFIG_BT_NIMBLE_SECURITY_ENABLE=n +CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT=n +CONFIG_BT_NIMBLE_WHITELIST_SIZE=1 +CONFIG_BT_NIMBLE_GATT_MAX_PROCS=1 CONFIG_BT_NIMBLE_MSYS_1_BLOCK_COUNT=10 CONFIG_BT_NIMBLE_MSYS_1_BLOCK_SIZE=100 CONFIG_BT_NIMBLE_MSYS_2_BLOCK_COUNT=4 +CONFIG_BT_NIMBLE_MSYS_2_BLOCK_SIZE=320 CONFIG_BT_NIMBLE_ACL_BUF_COUNT=5 CONFIG_BT_NIMBLE_HCI_EVT_HI_BUF_COUNT=5 CONFIG_BT_NIMBLE_HCI_EVT_LO_BUF_COUNT=3 -CONFIG_BT_NIMBLE_GATT_MAX_PROCS=1 CONFIG_BT_NIMBLE_ENABLE_CONN_REATTEMPT=n -CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT=n -CONFIG_BT_NIMBLE_WHITELIST_SIZE=1 + ## Controller Options CONFIG_BT_LE_CONTROLLER_TASK_STACK_SIZE=3072 CONFIG_BT_LE_LL_RESOLV_LIST_SIZE=1 diff --git a/examples/light/sdkconfig.defaults.esp32c2 b/examples/light/sdkconfig.defaults.esp32c2 index 300a7e222..d4f6e409d 100644 --- a/examples/light/sdkconfig.defaults.esp32c2 +++ b/examples/light/sdkconfig.defaults.esp32c2 @@ -1,6 +1,12 @@ +# Compiler options +CONFIG_COMPILER_OPTIMIZATION_SIZE=y +CONFIG_COMPILER_SAVE_RESTORE_LIBCALLS=y +CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE=y + # Bluetooth CONFIG_BT_ENABLED=y CONFIG_BT_NIMBLE_ENABLED=y + ## NimBLE Options CONFIG_BT_NIMBLE_MAX_CONNECTIONS=1 CONFIG_BT_NIMBLE_MAX_BONDS=2 @@ -8,16 +14,19 @@ CONFIG_BT_NIMBLE_MAX_CCCDS=2 CONFIG_BT_NIMBLE_HOST_TASK_STACK_SIZE=3072 CONFIG_BT_NIMBLE_ROLE_CENTRAL=n CONFIG_BT_NIMBLE_ROLE_OBSERVER=n +CONFIG_BT_NIMBLE_SECURITY_ENABLE=n +CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT=n +CONFIG_BT_NIMBLE_WHITELIST_SIZE=1 +CONFIG_BT_NIMBLE_GATT_MAX_PROCS=1 CONFIG_BT_NIMBLE_MSYS_1_BLOCK_COUNT=10 CONFIG_BT_NIMBLE_MSYS_1_BLOCK_SIZE=100 CONFIG_BT_NIMBLE_MSYS_2_BLOCK_COUNT=4 +CONFIG_BT_NIMBLE_MSYS_2_BLOCK_SIZE=320 CONFIG_BT_NIMBLE_ACL_BUF_COUNT=5 CONFIG_BT_NIMBLE_HCI_EVT_HI_BUF_COUNT=5 CONFIG_BT_NIMBLE_HCI_EVT_LO_BUF_COUNT=3 -CONFIG_BT_NIMBLE_GATT_MAX_PROCS=1 CONFIG_BT_NIMBLE_ENABLE_CONN_REATTEMPT=n -CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT=n -CONFIG_BT_NIMBLE_WHITELIST_SIZE=1 + ## Controller Options CONFIG_BT_LE_CONTROLLER_TASK_STACK_SIZE=3072 CONFIG_BT_LE_LL_RESOLV_LIST_SIZE=1 diff --git a/examples/light_switch/sdkconfig.defaults.esp32c2 b/examples/light_switch/sdkconfig.defaults.esp32c2 index 02461b8fd..d4f6e409d 100644 --- a/examples/light_switch/sdkconfig.defaults.esp32c2 +++ b/examples/light_switch/sdkconfig.defaults.esp32c2 @@ -1,6 +1,12 @@ +# Compiler options +CONFIG_COMPILER_OPTIMIZATION_SIZE=y +CONFIG_COMPILER_SAVE_RESTORE_LIBCALLS=y +CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE=y + # Bluetooth CONFIG_BT_ENABLED=y CONFIG_BT_NIMBLE_ENABLED=y + ## NimBLE Options CONFIG_BT_NIMBLE_MAX_CONNECTIONS=1 CONFIG_BT_NIMBLE_MAX_BONDS=2 @@ -8,16 +14,19 @@ CONFIG_BT_NIMBLE_MAX_CCCDS=2 CONFIG_BT_NIMBLE_HOST_TASK_STACK_SIZE=3072 CONFIG_BT_NIMBLE_ROLE_CENTRAL=n CONFIG_BT_NIMBLE_ROLE_OBSERVER=n +CONFIG_BT_NIMBLE_SECURITY_ENABLE=n +CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT=n +CONFIG_BT_NIMBLE_WHITELIST_SIZE=1 +CONFIG_BT_NIMBLE_GATT_MAX_PROCS=1 CONFIG_BT_NIMBLE_MSYS_1_BLOCK_COUNT=10 CONFIG_BT_NIMBLE_MSYS_1_BLOCK_SIZE=100 CONFIG_BT_NIMBLE_MSYS_2_BLOCK_COUNT=4 +CONFIG_BT_NIMBLE_MSYS_2_BLOCK_SIZE=320 CONFIG_BT_NIMBLE_ACL_BUF_COUNT=5 CONFIG_BT_NIMBLE_HCI_EVT_HI_BUF_COUNT=5 CONFIG_BT_NIMBLE_HCI_EVT_LO_BUF_COUNT=3 -CONFIG_BT_NIMBLE_GATT_MAX_PROCS=1 CONFIG_BT_NIMBLE_ENABLE_CONN_REATTEMPT=n -CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT=n -CONFIG_BT_NIMBLE_WHITELIST_SIZE=1 + ## Controller Options CONFIG_BT_LE_CONTROLLER_TASK_STACK_SIZE=3072 CONFIG_BT_LE_LL_RESOLV_LIST_SIZE=1 @@ -165,3 +174,17 @@ CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE=256 # ESP Matter CONFIG_ESP_MATTER_MAX_DEVICE_TYPE_COUNT=4 CONFIG_ESP_MATTER_MAX_DYNAMIC_ENDPOINT_COUNT=4 + +# ESP32-C2-DevKitM-1 Settings +# Buttons +CONFIG_BSP_BUTTONS_NUM=1 +CONFIG_BSP_BUTTON_1_TYPE_GPIO=y +CONFIG_BSP_BUTTON_1_GPIO=0 +CONFIG_BSP_BUTTON_1_LEVEL=0 +# LEDs +CONFIG_BSP_LEDS_NUM=1 +CONFIG_BSP_LED_TYPE_RGB_CLASSIC=y +CONFIG_BSP_LED_RGB_RED_GPIO=0 +CONFIG_BSP_LED_RGB_GREEN_GPIO=1 +CONFIG_BSP_LED_RGB_BLUE_GPIO=8 + diff --git a/examples/light_wifi_prov/sdkconfig.defaults b/examples/light_wifi_prov/sdkconfig.defaults index 707dc404b..2399cea06 100644 --- a/examples/light_wifi_prov/sdkconfig.defaults +++ b/examples/light_wifi_prov/sdkconfig.defaults @@ -6,9 +6,15 @@ CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y CONFIG_ESPTOOLPY_MONITOR_BAUD=115200 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y +# Compiler options +CONFIG_COMPILER_OPTIMIZATION_SIZE=y + #enable BT CONFIG_BT_ENABLED=y CONFIG_BT_NIMBLE_ENABLED=y +CONFIG_BT_NIMBLE_ROLE_CENTRAL=n +CONFIG_BT_NIMBLE_ROLE_OBSERVER=n +CONFIG_BT_NIMBLE_LOG_LEVEL_WARNING=y # Enable Extended advertisement of NIMBLE CONFIG_BT_NIMBLE_EXT_ADV=y @@ -55,6 +61,7 @@ CONFIG_MBEDTLS_DYNAMIC_FREE_PEER_CERT=y CONFIG_MBEDTLS_DYNAMIC_FREE_CONFIG_DATA=y CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_CMN=y CONFIG_MBEDTLS_SSL_KEEP_PEER_CERTIFICATE=n +CONFIG_MBEDTLS_ERROR_STRINGS=n # Fix for Timer Overflows CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=3120 diff --git a/examples/managed_component_light/sdkconfig.defaults.esp32c2 b/examples/managed_component_light/sdkconfig.defaults.esp32c2 index 39dcd09bf..d4f6e409d 100644 --- a/examples/managed_component_light/sdkconfig.defaults.esp32c2 +++ b/examples/managed_component_light/sdkconfig.defaults.esp32c2 @@ -1,6 +1,12 @@ +# Compiler options +CONFIG_COMPILER_OPTIMIZATION_SIZE=y +CONFIG_COMPILER_SAVE_RESTORE_LIBCALLS=y +CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE=y + # Bluetooth CONFIG_BT_ENABLED=y CONFIG_BT_NIMBLE_ENABLED=y + ## NimBLE Options CONFIG_BT_NIMBLE_MAX_CONNECTIONS=1 CONFIG_BT_NIMBLE_MAX_BONDS=2 @@ -8,16 +14,19 @@ CONFIG_BT_NIMBLE_MAX_CCCDS=2 CONFIG_BT_NIMBLE_HOST_TASK_STACK_SIZE=3072 CONFIG_BT_NIMBLE_ROLE_CENTRAL=n CONFIG_BT_NIMBLE_ROLE_OBSERVER=n +CONFIG_BT_NIMBLE_SECURITY_ENABLE=n +CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT=n +CONFIG_BT_NIMBLE_WHITELIST_SIZE=1 +CONFIG_BT_NIMBLE_GATT_MAX_PROCS=1 CONFIG_BT_NIMBLE_MSYS_1_BLOCK_COUNT=10 CONFIG_BT_NIMBLE_MSYS_1_BLOCK_SIZE=100 CONFIG_BT_NIMBLE_MSYS_2_BLOCK_COUNT=4 +CONFIG_BT_NIMBLE_MSYS_2_BLOCK_SIZE=320 CONFIG_BT_NIMBLE_ACL_BUF_COUNT=5 CONFIG_BT_NIMBLE_HCI_EVT_HI_BUF_COUNT=5 CONFIG_BT_NIMBLE_HCI_EVT_LO_BUF_COUNT=3 -CONFIG_BT_NIMBLE_GATT_MAX_PROCS=1 CONFIG_BT_NIMBLE_ENABLE_CONN_REATTEMPT=n -CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT=n -CONFIG_BT_NIMBLE_WHITELIST_SIZE=1 + ## Controller Options CONFIG_BT_LE_CONTROLLER_TASK_STACK_SIZE=3072 CONFIG_BT_LE_LL_RESOLV_LIST_SIZE=1 @@ -166,11 +175,6 @@ CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE=256 CONFIG_ESP_MATTER_MAX_DEVICE_TYPE_COUNT=4 CONFIG_ESP_MATTER_MAX_DYNAMIC_ENDPOINT_COUNT=4 -# CMake Utilities -CONFIG_CU_RELINKER_ENABLE=y -CONFIG_CU_RELINKER_ENABLE_CUSTOMIZED_CONFIGURATION_FILES=y -CONFIG_CU_RELINKER_CUSTOMIZED_CONFIGURATION_FILES_PATH="../common/relinker/esp32c2" - # ESP32-C2-DevKitM-1 Settings # Buttons CONFIG_BSP_BUTTONS_NUM=1 diff --git a/examples/refrigerator/sdkconfig.defaults.esp32c2 b/examples/refrigerator/sdkconfig.defaults.esp32c2 index 537983375..d4f6e409d 100644 --- a/examples/refrigerator/sdkconfig.defaults.esp32c2 +++ b/examples/refrigerator/sdkconfig.defaults.esp32c2 @@ -1,6 +1,12 @@ +# Compiler options +CONFIG_COMPILER_OPTIMIZATION_SIZE=y +CONFIG_COMPILER_SAVE_RESTORE_LIBCALLS=y +CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE=y + # Bluetooth CONFIG_BT_ENABLED=y CONFIG_BT_NIMBLE_ENABLED=y + ## NimBLE Options CONFIG_BT_NIMBLE_MAX_CONNECTIONS=1 CONFIG_BT_NIMBLE_MAX_BONDS=2 @@ -8,16 +14,19 @@ CONFIG_BT_NIMBLE_MAX_CCCDS=2 CONFIG_BT_NIMBLE_HOST_TASK_STACK_SIZE=3072 CONFIG_BT_NIMBLE_ROLE_CENTRAL=n CONFIG_BT_NIMBLE_ROLE_OBSERVER=n +CONFIG_BT_NIMBLE_SECURITY_ENABLE=n +CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT=n +CONFIG_BT_NIMBLE_WHITELIST_SIZE=1 +CONFIG_BT_NIMBLE_GATT_MAX_PROCS=1 CONFIG_BT_NIMBLE_MSYS_1_BLOCK_COUNT=10 CONFIG_BT_NIMBLE_MSYS_1_BLOCK_SIZE=100 CONFIG_BT_NIMBLE_MSYS_2_BLOCK_COUNT=4 +CONFIG_BT_NIMBLE_MSYS_2_BLOCK_SIZE=320 CONFIG_BT_NIMBLE_ACL_BUF_COUNT=5 CONFIG_BT_NIMBLE_HCI_EVT_HI_BUF_COUNT=5 CONFIG_BT_NIMBLE_HCI_EVT_LO_BUF_COUNT=3 -CONFIG_BT_NIMBLE_GATT_MAX_PROCS=1 CONFIG_BT_NIMBLE_ENABLE_CONN_REATTEMPT=n -CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT=n -CONFIG_BT_NIMBLE_WHITELIST_SIZE=1 + ## Controller Options CONFIG_BT_LE_CONTROLLER_TASK_STACK_SIZE=3072 CONFIG_BT_LE_LL_RESOLV_LIST_SIZE=1 @@ -166,14 +175,16 @@ CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE=256 CONFIG_ESP_MATTER_MAX_DEVICE_TYPE_COUNT=4 CONFIG_ESP_MATTER_MAX_DYNAMIC_ENDPOINT_COUNT=4 -# CMake Utilities -CONFIG_CU_RELINKER_ENABLE=y -CONFIG_CU_RELINKER_ENABLE_CUSTOMIZED_CONFIGURATION_FILES=y -CONFIG_CU_RELINKER_CUSTOMIZED_CONFIGURATION_FILES_PATH="../common/relinker/esp32c2" - # ESP32-C2-DevKitM-1 Settings # Buttons CONFIG_BSP_BUTTONS_NUM=1 CONFIG_BSP_BUTTON_1_TYPE_GPIO=y CONFIG_BSP_BUTTON_1_GPIO=0 CONFIG_BSP_BUTTON_1_LEVEL=0 +# LEDs +CONFIG_BSP_LEDS_NUM=1 +CONFIG_BSP_LED_TYPE_RGB_CLASSIC=y +CONFIG_BSP_LED_RGB_RED_GPIO=0 +CONFIG_BSP_LED_RGB_GREEN_GPIO=1 +CONFIG_BSP_LED_RGB_BLUE_GPIO=8 + diff --git a/examples/room_air_conditioner/sdkconfig.defaults.esp32c2 b/examples/room_air_conditioner/sdkconfig.defaults.esp32c2 index 02461b8fd..d4f6e409d 100644 --- a/examples/room_air_conditioner/sdkconfig.defaults.esp32c2 +++ b/examples/room_air_conditioner/sdkconfig.defaults.esp32c2 @@ -1,6 +1,12 @@ +# Compiler options +CONFIG_COMPILER_OPTIMIZATION_SIZE=y +CONFIG_COMPILER_SAVE_RESTORE_LIBCALLS=y +CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE=y + # Bluetooth CONFIG_BT_ENABLED=y CONFIG_BT_NIMBLE_ENABLED=y + ## NimBLE Options CONFIG_BT_NIMBLE_MAX_CONNECTIONS=1 CONFIG_BT_NIMBLE_MAX_BONDS=2 @@ -8,16 +14,19 @@ CONFIG_BT_NIMBLE_MAX_CCCDS=2 CONFIG_BT_NIMBLE_HOST_TASK_STACK_SIZE=3072 CONFIG_BT_NIMBLE_ROLE_CENTRAL=n CONFIG_BT_NIMBLE_ROLE_OBSERVER=n +CONFIG_BT_NIMBLE_SECURITY_ENABLE=n +CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT=n +CONFIG_BT_NIMBLE_WHITELIST_SIZE=1 +CONFIG_BT_NIMBLE_GATT_MAX_PROCS=1 CONFIG_BT_NIMBLE_MSYS_1_BLOCK_COUNT=10 CONFIG_BT_NIMBLE_MSYS_1_BLOCK_SIZE=100 CONFIG_BT_NIMBLE_MSYS_2_BLOCK_COUNT=4 +CONFIG_BT_NIMBLE_MSYS_2_BLOCK_SIZE=320 CONFIG_BT_NIMBLE_ACL_BUF_COUNT=5 CONFIG_BT_NIMBLE_HCI_EVT_HI_BUF_COUNT=5 CONFIG_BT_NIMBLE_HCI_EVT_LO_BUF_COUNT=3 -CONFIG_BT_NIMBLE_GATT_MAX_PROCS=1 CONFIG_BT_NIMBLE_ENABLE_CONN_REATTEMPT=n -CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT=n -CONFIG_BT_NIMBLE_WHITELIST_SIZE=1 + ## Controller Options CONFIG_BT_LE_CONTROLLER_TASK_STACK_SIZE=3072 CONFIG_BT_LE_LL_RESOLV_LIST_SIZE=1 @@ -165,3 +174,17 @@ CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE=256 # ESP Matter CONFIG_ESP_MATTER_MAX_DEVICE_TYPE_COUNT=4 CONFIG_ESP_MATTER_MAX_DYNAMIC_ENDPOINT_COUNT=4 + +# ESP32-C2-DevKitM-1 Settings +# Buttons +CONFIG_BSP_BUTTONS_NUM=1 +CONFIG_BSP_BUTTON_1_TYPE_GPIO=y +CONFIG_BSP_BUTTON_1_GPIO=0 +CONFIG_BSP_BUTTON_1_LEVEL=0 +# LEDs +CONFIG_BSP_LEDS_NUM=1 +CONFIG_BSP_LED_TYPE_RGB_CLASSIC=y +CONFIG_BSP_LED_RGB_RED_GPIO=0 +CONFIG_BSP_LED_RGB_GREEN_GPIO=1 +CONFIG_BSP_LED_RGB_BLUE_GPIO=8 + diff --git a/examples/thread_border_router/sdkconfig.defaults b/examples/thread_border_router/sdkconfig.defaults index a026d3008..26f1902b2 100644 --- a/examples/thread_border_router/sdkconfig.defaults +++ b/examples/thread_border_router/sdkconfig.defaults @@ -30,7 +30,7 @@ CONFIG_ESP_WIFI_SOFTAP_SUPPORT=n # LWIP CONFIG_LWIP_IPV6_FORWARD=y CONFIG_LWIP_IPV6_AUTOCONFIG=y -CONFIG_LWIP_IPV6_NUM_ADDRESSES=8 +CONFIG_LWIP_IPV6_NUM_ADDRESSES=12 CONFIG_LWIP_MULTICAST_PING=y CONFIG_LWIP_NETIF_STATUS_CALLBACK=y CONFIG_LWIP_HOOK_IP6_ROUTE_DEFAULT=y diff --git a/examples/zap_light/sdkconfig.defaults.esp32c2 b/examples/zap_light/sdkconfig.defaults.esp32c2 index 02461b8fd..d4f6e409d 100644 --- a/examples/zap_light/sdkconfig.defaults.esp32c2 +++ b/examples/zap_light/sdkconfig.defaults.esp32c2 @@ -1,6 +1,12 @@ +# Compiler options +CONFIG_COMPILER_OPTIMIZATION_SIZE=y +CONFIG_COMPILER_SAVE_RESTORE_LIBCALLS=y +CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE=y + # Bluetooth CONFIG_BT_ENABLED=y CONFIG_BT_NIMBLE_ENABLED=y + ## NimBLE Options CONFIG_BT_NIMBLE_MAX_CONNECTIONS=1 CONFIG_BT_NIMBLE_MAX_BONDS=2 @@ -8,16 +14,19 @@ CONFIG_BT_NIMBLE_MAX_CCCDS=2 CONFIG_BT_NIMBLE_HOST_TASK_STACK_SIZE=3072 CONFIG_BT_NIMBLE_ROLE_CENTRAL=n CONFIG_BT_NIMBLE_ROLE_OBSERVER=n +CONFIG_BT_NIMBLE_SECURITY_ENABLE=n +CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT=n +CONFIG_BT_NIMBLE_WHITELIST_SIZE=1 +CONFIG_BT_NIMBLE_GATT_MAX_PROCS=1 CONFIG_BT_NIMBLE_MSYS_1_BLOCK_COUNT=10 CONFIG_BT_NIMBLE_MSYS_1_BLOCK_SIZE=100 CONFIG_BT_NIMBLE_MSYS_2_BLOCK_COUNT=4 +CONFIG_BT_NIMBLE_MSYS_2_BLOCK_SIZE=320 CONFIG_BT_NIMBLE_ACL_BUF_COUNT=5 CONFIG_BT_NIMBLE_HCI_EVT_HI_BUF_COUNT=5 CONFIG_BT_NIMBLE_HCI_EVT_LO_BUF_COUNT=3 -CONFIG_BT_NIMBLE_GATT_MAX_PROCS=1 CONFIG_BT_NIMBLE_ENABLE_CONN_REATTEMPT=n -CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT=n -CONFIG_BT_NIMBLE_WHITELIST_SIZE=1 + ## Controller Options CONFIG_BT_LE_CONTROLLER_TASK_STACK_SIZE=3072 CONFIG_BT_LE_LL_RESOLV_LIST_SIZE=1 @@ -165,3 +174,17 @@ CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE=256 # ESP Matter CONFIG_ESP_MATTER_MAX_DEVICE_TYPE_COUNT=4 CONFIG_ESP_MATTER_MAX_DYNAMIC_ENDPOINT_COUNT=4 + +# ESP32-C2-DevKitM-1 Settings +# Buttons +CONFIG_BSP_BUTTONS_NUM=1 +CONFIG_BSP_BUTTON_1_TYPE_GPIO=y +CONFIG_BSP_BUTTON_1_GPIO=0 +CONFIG_BSP_BUTTON_1_LEVEL=0 +# LEDs +CONFIG_BSP_LEDS_NUM=1 +CONFIG_BSP_LED_TYPE_RGB_CLASSIC=y +CONFIG_BSP_LED_RGB_RED_GPIO=0 +CONFIG_BSP_LED_RGB_GREEN_GPIO=1 +CONFIG_BSP_LED_RGB_BLUE_GPIO=8 + diff --git a/tools/docker/chip_idf/Dockerfile b/tools/docker/chip_idf/Dockerfile index f845df456..ec00bc40c 100644 --- a/tools/docker/chip_idf/Dockerfile +++ b/tools/docker/chip_idf/Dockerfile @@ -4,7 +4,7 @@ FROM ghcr.io/project-chip/chip-build:${VERSION} as build # Use IDF_CHECKOUT_REF to specify a tag, a branch or a specific commit ID. ARG IDF_CLONE_URL=https://github.com/espressif/esp-idf.git -ARG IDF_CHECKOUT_REF=v5.2.1 +ARG IDF_CHECKOUT_REF=v5.2.3 RUN set -x \ && mkdir -p /tmp/esp-idf \