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

Merge branch 'bugfix/fix-build-error-for-bluedroid' into 'main'

Browse Source 
bluedroid: fix build error for bluedroid

See merge request app-frameworks/esp-matter!215
This commit is contained in:
Shu Chen
2022-10-31 18:08:51 +08:00
parent 6c3186fb9a 7ea8f1e20b
commit 3401f14266
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_matter/esp_matter_core.cpp
+5 -1
View File
@@ -17,11 +17,13 @@
#include <esp_matter_core.h>
#include <nvs.h>
#include <esp_bt.h>
#if CONFIG_BT_NIMBLE_ENABLED
#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 0)
#include <esp_nimble_hci.h>
#endif
#include <host/ble_hs.h>
#include <nimble/nimble_port.h>
#endif /* CONFIG_BT_NIMBLE_ENABLED */
#include <app/clusters/network-commissioning/network-commissioning.h>
#include <app/clusters/general-diagnostics-server/general-diagnostics-server.h>
@@ -761,6 +763,8 @@ static void device_callback_internal(const ChipDeviceEvent * event, intptr_t arg
#if CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING
case chip::DeviceLayer::DeviceEventType::kCommissioningComplete:
{
esp_err_t err = ESP_OK;
#if CONFIG_BT_NIMBLE_ENABLED
if (!ble_hs_is_enabled()) {
ESP_LOGI(TAG, "BLE already deinited");
return;
@@ -772,10 +776,10 @@ static void device_callback_internal(const ChipDeviceEvent * event, intptr_t arg
}
nimble_port_deinit();
esp_err_t err = ESP_OK;
#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 0)
err = esp_nimble_hci_and_controller_deinit();
#endif
#endif /* CONFIG_BT_NIMBLE_ENABLED */
err |= esp_bt_mem_release(ESP_BT_MODE_BLE);
if (err != ESP_OK) {
ESP_LOGE(TAG, "BLE deinit failed");