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 ble init and deinit flow. #37488

Merged
merged 1 commit into from
Feb 12, 2025
Merged

ESP32: Fix ble init and deinit flow. #37488

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion src/platform/ESP32/nimble/BLEManagerImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -925,7 +925,8 @@ CHIP_ERROR BLEManagerImpl::InitESPBleLayer(void)
SuccessOrExit(err);
#endif

nimble_port_init();
err = MapBLEError(nimble_port_init());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this breaks on esp-idf v4.4. nimble_port_init() returns void there.

SuccessOrExit(err);

/* Initialize the NimBLE host configuration. */
ble_hs_cfg.reset_cb = bleprph_on_reset;
Expand Down Expand Up @@ -973,7 +974,9 @@ CHIP_ERROR BLEManagerImpl::InitESPBleLayer(void)
void BLEManagerImpl::DeinitESPBleLayer()
{
VerifyOrReturn(DeinitBLE() == CHIP_NO_ERROR);
#ifdef CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING
BLEManagerImpl::ClaimBLEMemory(nullptr, nullptr);
#endif /* CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING */
}

void BLEManagerImpl::ClaimBLEMemory(System::Layer *, void *)
Expand Down
Loading