github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-06-24 12:53:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-ble-disconnecting-timeout-loop-disabled' into integration

Browse Source
This commit is contained in:
J. Nick Koston
2026-05-22 22:38:10 -05:00
parent 9a76c3d8c2 4badb90d00
commit 49fe864d12
4 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
esphome/components/bluetooth_proxy/bluetooth_connection.cpp
View File

@@ -144,14 +144,15 @@ void BluetoothConnection::loop() {
}
}
void BluetoothConnection::on_disconnect_timeout_() {
// The base class forced IDLE because CLOSE_EVT never arrived. Run the same slot
// cleanup the CLOSE_EVT path would have done so the proxy slot is freed, the API
// client is notified, and send_service_ is reset for the next connection.
void BluetoothConnection::on_disconnect_complete_(esp_err_t reason) {
// Called from both the CLOSE_EVT handler and the DISCONNECTING safety timeout in the
// base class. Free the proxy slot, notify the API client, and reset send_service_.
// address_ may already be 0 if reset_connection_ ran earlier on this teardown.
if (this->address_ == 0) {
return;
}
this->reset_connection_(ESP_GATT_CONN_TIMEOUT);
ESP_LOGD(TAG, "[%d] [%s] Close, reason=0x%02x, freeing slot", this->connection_index_, this->address_str_, reason);
this->reset_connection_(reason);
}
void BluetoothConnection::reset_connection_(esp_err_t reason) {
@@ -385,14 +386,6 @@ bool BluetoothConnection::gattc_event_handler(esp_gattc_cb_event_t event, esp_ga
this->proxy_->send_device_connection(this->address_, false, 0, param->disconnect.reason);
break;
}
case ESP_GATTC_CLOSE_EVT: {
ESP_LOGD(TAG, "[%d] [%s] Close, reason=0x%02x, freeing slot", this->connection_index_, this->address_str_,
param->close.reason);
// Now the GATT connection is fully closed and controller resources are freed
// Safe to mark the connection slot as available
this->reset_connection_(param->close.reason);
break;
}
case ESP_GATTC_OPEN_EVT: {
if (param->open.status != ESP_GATT_OK && param->open.status != ESP_GATT_ALREADY_OPEN) {
this->reset_connection_(param->open.status);

2
esphome/components/bluetooth_proxy/bluetooth_connection.h
View File

@@ -33,7 +33,7 @@ class BluetoothConnection final : public esp32_ble_client::BLEClientBase {
protected:
friend class BluetoothProxy;
void on_disconnect_timeout_() override;
void on_disconnect_complete_(esp_err_t reason) override;
bool supports_efficient_uuids_() const;
void send_service_for_discovery_();

5
esphome/components/esp32_ble_client/ble_client_base.cpp
View File

@@ -72,9 +72,7 @@ void BLEClientBase::loop() {
// never delivered CLOSE_EVT/DISCONNECT_EVT, services would leak without this call.
this->release_services();
this->set_idle_();
// Notify subclasses so they can release any extra per-connection state (e.g. bluetooth_proxy
// slot accounting) that would normally be cleared by the CLOSE_EVT handler.
this->on_disconnect_timeout_();
this->on_disconnect_complete_(ESP_GATT_CONN_TIMEOUT);
}
}
@@ -421,6 +419,7 @@ bool BLEClientBase::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
this->log_gattc_lifecycle_event_("CLOSE");
this->release_services();
this->set_idle_();
this->on_disconnect_complete_(param->close.reason);
break;
}
case ESP_GATTC_SEARCH_RES_EVT: {

8
esphome/components/esp32_ble_client/ble_client_base.h
View File

@@ -140,10 +140,12 @@ class BLEClientBase : public espbt::ESPBTClient, public Component {
void log_gattc_warning_(const char *operation, esp_err_t err);
void log_connection_params_(const char *param_type);
void handle_connection_result_(esp_err_t ret);
/// Hook called from the DISCONNECTING safety timeout after the base class forces IDLE.
/// Hook called once a connection has been fully torn down (after release_services() and
/// set_idle_()), from both the CLOSE_EVT handler and the DISCONNECTING safety timeout.
/// Subclasses with extra per-connection accounting (e.g. bluetooth_proxy slot state)
/// override this to perform the same cleanup the normal CLOSE_EVT path would do.
virtual void on_disconnect_timeout_() {}
/// override this to release that state. `reason` is the controller reason code, or
/// ESP_GATT_CONN_TIMEOUT for the safety-timeout path.
virtual void on_disconnect_complete_(esp_err_t reason) {}
/// Transition to IDLE and reset conn_id — call when the connection is fully dead.
void set_idle_() {
this->set_state(espbt::ClientState::IDLE);