[ESP32] Support for ESP32C2 and changes to not initialized BLE for al…

…ready provisioned nodes (#22967) * [ESP32]: Remove device name from the ble log as we do not add that in the advertising packet * Remove the sdkconfig.old * [ESP32]: Platform, doc, example change to support ESP32C2 * [ESP32]: Do not initialize BLE if wifi/thread is already provisioned. If ble is only used for commissioning then there is no use to initialize the ble. Also, renamed the config option for the purpose to make it more aligned. * Restyled by clang-format Co-authored-by: Restyled.io <[email protected]>
project-chip · Oct 11, 2023 · 1206211 · 1206211
1 parent 26e84c1
commit 1206211
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 1,560 deletions.
diff --git a/config/esp32/components/chip/CMakeLists.txt b/config/esp32/components/chip/CMakeLists.txt
@@ -33,7 +33,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/ota-image.cmake)
 
 set(CHIP_REQURIE_COMPONENTS freertos lwip bt mbedtls fatfs app_update console openthread nvs_flash)
 
-if(NOT "${IDF_TARGET}" STREQUAL "esp32h2")
+if((NOT "${IDF_TARGET}" STREQUAL "esp32h2") AND (NOT "${IDF_TARGET}" STREQUAL "esp32c2"))
     list(APPEND CHIP_REQURIE_COMPONENTS mdns)
 endif()
 
@@ -289,6 +289,11 @@ if(CONFIG_BT_ENABLED)
         if(CONFIG_IDF_TARGET_ESP32H2_BETA_VERSION_2)
             list(APPEND chip_libraries ${bt_dir}/controller/lib_esp32h2/esp32h2-bt-lib/beta2/libble_app.a)
         endif()
+    elseif("${CONFIG_IDF_TARGET}" STREQUAL "esp32c2")
+        idf_component_get_property(bt_lib bt COMPONENT_LIB)
+        idf_component_get_property(bt_dir bt COMPONENT_DIR)
+        list(APPEND chip_libraries $<TARGET_FILE:${bt_lib}>)
+        list(APPEND chip_libraries ${bt_dir}/controller/lib_esp32c2/esp32c2-bt-lib/libble_app.a)
     else()
         idf_component_get_property(bt_lib bt COMPONENT_LIB)
         list(APPEND chip_libraries $<TARGET_FILE:${bt_lib}> -lbtdm_app)
@@ -305,7 +310,7 @@ if(CONFIG_OPENTHREAD_ENABLED)
     list(APPEND chip_libraries $<TARGET_FILE:${openthread_lib}>)
 endif()
 
-if(NOT CONFIG_USE_MINIMAL_MDNS AND NOT CONFIG_IDF_TARGET_ESP32H2)
+if((NOT CONFIG_USE_MINIMAL_MDNS) AND (NOT CONFIG_IDF_TARGET_ESP32H2) AND (NOT CONFIG_IDF_TARGET_ESP32C2))
     idf_component_get_property(mdns_lib mdns COMPONENT_LIB)
     list(APPEND chip_libraries $<TARGET_FILE:${mdns_lib}>)
 endif()

diff --git a/config/esp32/components/chip/Kconfig b/config/esp32/components/chip/Kconfig
@@ -497,11 +497,14 @@ menu "CHIP Device Layer"
 
                 When set, WoBLE advertisements will stop while a WoBLE connection is active.
 
-        config DEINIT_BLE_ON_COMMISSIONING_COMPLETE
-	    bool "Disable and DeInit BLE on commissioning complete"
+        config USE_BLE_ONLY_FOR_COMMISSIONING
+	    bool "Use BLE only for commissioning"
 	    default y
 	    help 
-                Disable and deinit BLE and reclaim all its memory, once the commissioning is successful and Commissioning complete event is received in the application.	
+            Disable this flag if BLE is used for any other purpose than commissioning.
+            When enabled, it deinitialized the BLE on successful commissioning, and on
+            bootup do not initialize the BLE if device is already provisioned with Wi-Fi/Thread credentials.
+
     endmenu
 
     menu "CHIP Thread Options"