github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-09-11 23:37:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

[esp32_ble] Cancel a pending transition instead of ignoring the opposite request

Browse Source 
enable() while a disable was still pending was ignored, so a disable followed
by an enable before the next loop pass left BLE off. Cancel the pending
transition in both directions; nothing has been torn down or brought up yet.
The tracker only restarts its scan after a re-enable from IDLE, since a
cancelled disable never stopped it.
This commit is contained in:
J. Nick Koston
2026-09-10 08:06:53 -05:00
parent 64b4465df3
commit 216707f507
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/esp32_ble/ble.cpp
+10
View File
@@ -84,6 +84,11 @@ void ESP32BLE::setup() {
}
void ESP32BLE::enable() {
if (this->state_ == BLE_COMPONENT_STATE_DISABLE) {
// The teardown has not run yet; the stack is still up.
this->state_ = BLE_COMPONENT_STATE_ACTIVE;
return;
}
if (this->state_ != BLE_COMPONENT_STATE_DISABLED)
return;
@@ -91,6 +96,11 @@ void ESP32BLE::enable() {
}
void ESP32BLE::disable() {
if (this->state_ == BLE_COMPONENT_STATE_ENABLE) {
// The bring-up has not run yet; the stack is still down.
this->state_ = BLE_COMPONENT_STATE_DISABLED;
return;
}
if (this->state_ == BLE_COMPONENT_STATE_DISABLED)
return;
esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
+3 -2
View File
@@ -78,8 +78,9 @@ void ESP32BLETracker::loop() {
return;
} else if (this->ble_was_disabled_) {
this->ble_was_disabled_ = false;
// If the BLE stack was disabled, we need to start the scan again.
if (this->scan_continuous_) {
// Start the scan again after a disable. A cancelled disable never stopped
// it, so only start from IDLE.
if (this->scan_continuous_ && this->scanner_state_ == ScannerState::IDLE) {
this->start_scan();
}
}