[ESP32] Add esp32c6 to release bt memory after commissioned (#31476)

* add esp32c6 ble released after commissioned * Restyled by clang-format --------- Co-authored-by: Restyled.io <[email protected]>
project-chip · May 14, 2024 · 3983383 · 3983383
1 parent 9858fe5
commit 3983383
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/examples/all-clusters-app/esp32/sdkconfig.defaults.esp32c6 b/examples/all-clusters-app/esp32/sdkconfig.defaults.esp32c6
@@ -19,13 +19,13 @@ CONFIG_BT_ENABLED=y
 CONFIG_BT_NIMBLE_ENABLED=y
 CONFIG_BT_NIMBLE_EXT_ADV=n
 CONFIG_BT_NIMBLE_HCI_EVT_BUF_SIZE=70
-CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING=n
+CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING=y
 
 # Disable OpenThread
 CONFIG_OPENTHREAD_ENABLED=n
 
 # Disable lwip ipv6 autoconfig
-CONFIG_LWIP_IPV6_AUTOCONFIG=n
+CONFIG_LWIP_IPV6_AUTOCONFIG=y
 
 # Use a custom partition table
 CONFIG_PARTITION_TABLE_CUSTOM=y

diff --git a/examples/energy-management-app/esp32/sdkconfig.defaults.esp32c6 b/examples/energy-management-app/esp32/sdkconfig.defaults.esp32c6
@@ -19,13 +19,13 @@ CONFIG_BT_ENABLED=y
 CONFIG_BT_NIMBLE_ENABLED=y
 CONFIG_BT_NIMBLE_EXT_ADV=n
 CONFIG_BT_NIMBLE_HCI_EVT_BUF_SIZE=70
-CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING=n
+CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING=y
 
 # Disable OpenThread
 CONFIG_OPENTHREAD_ENABLED=n
 
 # Disable lwip ipv6 autoconfig
-CONFIG_LWIP_IPV6_AUTOCONFIG=n
+CONFIG_LWIP_IPV6_AUTOCONFIG=y
 
 # Use a custom partition table
 CONFIG_PARTITION_TABLE_CUSTOM=y

diff --git a/examples/lighting-app/esp32/sdkconfig.defaults.esp32c6 b/examples/lighting-app/esp32/sdkconfig.defaults.esp32c6
@@ -19,13 +19,13 @@ CONFIG_BT_ENABLED=y
 CONFIG_BT_NIMBLE_ENABLED=y
 CONFIG_BT_NIMBLE_EXT_ADV=n
 CONFIG_BT_NIMBLE_HCI_EVT_BUF_SIZE=70
-CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING=n
+CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING=y
 
 # Disable OpenThread
 CONFIG_OPENTHREAD_ENABLED=n
 
 # Disable lwip ipv6 autoconfig
-CONFIG_LWIP_IPV6_AUTOCONFIG=n
+CONFIG_LWIP_IPV6_AUTOCONFIG=y
 
 # Use a custom partition table
 CONFIG_PARTITION_TABLE_CUSTOM=y

diff --git a/examples/lock-app/esp32/sdkconfig.defaults.esp32c6 b/examples/lock-app/esp32/sdkconfig.defaults.esp32c6
@@ -18,13 +18,13 @@ CONFIG_BT_ENABLED=y
 CONFIG_BT_NIMBLE_ENABLED=y
 CONFIG_BT_NIMBLE_EXT_ADV=n
 CONFIG_BT_NIMBLE_HCI_EVT_BUF_SIZE=70
-CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING=n
+CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING=y
 
 # Disable OpenThread
 CONFIG_OPENTHREAD_ENABLED=n
 
 # Disable lwip ipv6 autoconfig
-CONFIG_LWIP_IPV6_AUTOCONFIG=n
+CONFIG_LWIP_IPV6_AUTOCONFIG=y
 
 # Use a custom partition table
 CONFIG_PARTITION_TABLE_CUSTOM=y

diff --git a/examples/platform/esp32/common/Esp32AppServer.cpp b/examples/platform/esp32/common/Esp32AppServer.cpp
@@ -141,7 +141,8 @@ void Esp32AppServer::DeInitBLEIfCommissioned(void)
 
 #if CONFIG_IDF_TARGET_ESP32
         err |= esp_bt_mem_release(ESP_BT_MODE_BTDM);
-#elif CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32H2
+#elif CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32H2 ||          \
+    CONFIG_IDF_TARGET_ESP32C6
         err |= esp_bt_mem_release(ESP_BT_MODE_BLE);
 #endif