Skip to content

Fix nRF52 freeze + watchdog reset when saving config over BLE #11202

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

Merged
thebentern merged 6 commits into from
Jul 25, 2026
Merged

Fix nRF52 freeze + watchdog reset when saving config over BLE #11202

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
87e4aec
Fix nRF52 freeze + watchdog reset when saving config over BLE
thebentern Jul 24, 2026
bd28229
Merge branch 'develop' into fix/nrf52-ble-disconnect-deadlock
thebentern Jul 24, 2026
1825846
Address review: use Throttle helper, tighten comment
thebentern Jul 24, 2026
1071069
Merge remote-tracking branch 'origin/fix/nrf52-ble-disconnect-deadloc…
thebentern Jul 24, 2026
49f4a1a
Name the disconnect timeout constant
thebentern Jul 24, 2026
45cb2ca
Log unconfirmed BLE disconnect at WARN with elapsed time
thebentern Jul 25, 2026
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
15 changes: 11 additions & 4 deletions src/platform/nrf52/NRF52Bluetooth.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include "error.h"
#include "main.h"
#include "mesh/PhoneAPI.h"
#include "mesh/Throttle.h"
#include "mesh/mesh-pb-constants.h"
#include <bluefruit.h>
#include <utility/bonding.h>
Expand Down Expand Up @@ -466,17 +467,23 @@ bool NRF52Bluetooth::onUnwantedPairing(uint16_t conn_handle, uint8_t const passk
// Disconnect any BLE connections
void NRF52Bluetooth::disconnect()
{
static constexpr uint32_t DISCONNECT_TIMEOUT_MSEC = 1000;
uint8_t connection_num = Bluefruit.connected();
if (connection_num) {
// Close all connections. We're only expecting one.
for (uint8_t i = 0; i < connection_num; i++)
Bluefruit.disconnect(i);

// Wait for disconnection
while (Bluefruit.connected())
yield();
// Best-effort wait: on Bluefruit's BLE event task the DISCONNECTED event can't be processed
// until this callback returns, so an unbounded wait would deadlock until the watchdog fires.
uint32_t start = millis();
while (Bluefruit.connected() && Throttle::isWithinTimespanMs(start, DISCONNECT_TIMEOUT_MSEC))
delay(1);

LOG_INFO("Ended BLE connection");
if (Bluefruit.connected())
LOG_WARN("BLE disconnect unconfirmed after %ums, continuing shutdown", millis() - start);
else
LOG_INFO("Ended BLE connection");
}
}

Expand Down
Loading