Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ESP32] Fix the parentheses and ifdefs during ble deinit #28628

Merged
merged 2 commits into from
Aug 11, 2023
+30 −25
Merged

[ESP32] Fix the parentheses and ifdefs during ble deinit #28628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
458aff4
[ESP32] Fix the parentheses and ifdefs during ble deinit
shubhamdp Aug 10, 2023
817cd03
Fix the compilation for bluedroid host
shubhamdp Aug 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 29 additions & 24 deletions examples/platform/esp32/common/CommonDeviceCallbacks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,43 +62,48 @@ void CommonDeviceCallbacks::DeviceEventCallback(const ChipDeviceEvent * event, i

case DeviceEventType::kCHIPoBLEConnectionClosed:
ESP_LOGI(TAG, "CHIPoBLE disconnected");
#if CONFIG_BT_ENABLED
#if CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING

#if CONFIG_BT_ENABLED && CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING
if (chip::Server::GetInstance().GetFabricTable().FabricCount() > 0)
{
esp_err_t err = ESP_OK;

#if CONFIG_BT_NIMBLE_ENABLED
if (ble_hs_is_enabled())
if (!ble_hs_is_enabled())
{
ESP_LOGI(TAG, "BLE already deinited");
break;
}
if (nimble_port_stop() != 0)
{
int ret = nimble_port_stop();
if (ret == 0)
{
nimble_port_deinit();
ESP_LOGE(TAG, "nimble_port_stop() failed");
break;
}
vTaskDelay(100);
nimble_port_deinit();

#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 0)
err = esp_nimble_hci_and_controller_deinit();
#endif // ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 0)
#endif // CONFIG_BT_NIMBLE_ENABLED
err = esp_nimble_hci_and_controller_deinit();
#endif
#endif /* CONFIG_BT_NIMBLE_ENABLED */

#if CONFIG_IDF_TARGET_ESP32
err += esp_bt_mem_release(ESP_BT_MODE_BTDM);
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
err += esp_bt_mem_release(ESP_BT_MODE_BLE);
err |= esp_bt_mem_release(ESP_BT_MODE_BLE);
#endif
if (err == ESP_OK)
{
ESP_LOGI(TAG, "BLE deinit successful and memory reclaimed");
}
}
else
{
ESP_LOGW(TAG, "nimble_port_stop() failed");
}

if (err != ESP_OK)
{
ESP_LOGE(TAG, "BLE deinit failed");
}
else
{
ESP_LOGI(TAG, "BLE deinit successful and memory reclaimed");
}
else { ESP_LOGI(TAG, "BLE already deinited"); }
}
#endif // CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING
#endif // CONFIG_BT_ENABLED
#endif /* CONFIG_BT_ENABLED && CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING */

break;

case DeviceEventType::kDnssdInitialized:
Expand Down
2 changes: 1 addition & 1 deletion src/platform/ESP32/bluedroid/BLEManagerImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ CHIP_ERROR BLEManagerImpl::_Init()
#endif
SuccessOrExit(err);

memset(mCons, 0, sizeof(mCons));
memset(reinterpret_cast<void *>(mCons), 0, sizeof(mCons));
mServiceMode = ConnectivityManager::kCHIPoBLEServiceMode_Enabled;
mAppIf = ESP_GATT_IF_NONE;
mServiceAttrHandle = 0;
Expand Down