github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-09-12 15:57:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

[esp32_ble] Share the pending transition cancel

Browse Source
This commit is contained in:
J. Nick Koston
2026-09-10 08:11:24 -05:00
parent 216707f507
commit 441a2c5ae9
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/esp32_ble/ble.cpp
+2 -8
View File
@@ -84,11 +84,8 @@ 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;
if (this->cancel_pending_(BLE_COMPONENT_STATE_DISABLE, BLE_COMPONENT_STATE_ACTIVE))
return;
}
if (this->state_ != BLE_COMPONENT_STATE_DISABLED)
return;
@@ -96,11 +93,8 @@ 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;
if (this->cancel_pending_(BLE_COMPONENT_STATE_ENABLE, BLE_COMPONENT_STATE_DISABLED))
return;
}
if (this->state_ == BLE_COMPONENT_STATE_DISABLED)
return;
esphome/components/esp32_ble/ble.h
+8
View File
@@ -176,6 +176,14 @@ class ESP32BLE final : public Component {
bool ble_setup_();
bool ble_dismantle_();
// A request that arrives while the opposite transition is still pending just
// cancels it: loop() has not run, so nothing was torn down or brought up.
bool cancel_pending_(BLEComponentState pending, BLEComponentState restored) {
if (this->state_ != pending)
return false;
this->state_ = restored;
return true;
}
// Drop what the old stack queued; the next stack reuses the same interface ids.
void drain_ble_events_() {
BLEEvent *ble_event;