github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-10-01 08:50:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'neutral-ble-client' into radon-eye-single-node

Browse Source
This commit is contained in:
J. Nick Koston
2026-08-12 18:42:07 -05:00
parent 93d352df83 65c1b06f7f
commit 6f9b5993b9
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/ble_client/ble_client.cpp
+18 -5
View File
@@ -228,13 +228,26 @@ bool BLEClient::handle_gatt_search_cmpl_(esp_gatt_status_t status) {
uint16_t service_total = 0;
bool counted = status == ESP_GATT_OK && bluetooth_connection::BluedroidServiceTable::count_services(
this->gattc_if_, this->conn_id_, &service_total);
if (!counted || service_total == 0) {
// A failed search poisons the whole discovery, legacy nodes included.
ESP_LOGW(TAG, "[%s] Discovery failed (status=%d, services=%u)", this->address_str(), status, service_total);
this->gatt_backoff_.register_failure(this->address_str());
this->disconnect();
return false;
}
// Stack-owned; nodes copy their handles during on_connected().
bluetooth_connection::BluedroidServiceTable table;
if (!counted || service_total == 0 ||
!table.build(this->gattc_if_, this->conn_id_, service_total, this->connection_index_)) {
// Distinguishes a failed search/count from a genuinely service-less peer.
ESP_LOGW(TAG, "[%s] Service table unavailable (status=%d, services=%u); treating as failed discovery",
this->address_str(), status, service_total);
if (!table.build(this->gattc_if_, this->conn_id_, service_total, this->connection_index_)) {
if (this->nodes_.size() > this->gatt_nodes_.size()) {
// Only the table build failed; legacy nodes read the base's services_
// and keep the link. Gatt nodes catch the next connection (promoted so
// the release condition still fires).
ESP_LOGW(TAG, "[%s] Service table build failed; gatt nodes skip this connection", this->address_str());
for (auto *node : this->gatt_nodes_)
node->node_state = espbt::ClientState::ESTABLISHED;
return true;
}
ESP_LOGW(TAG, "[%s] Service table build failed; treating as failed discovery", this->address_str());
this->gatt_backoff_.register_failure(this->address_str());
this->disconnect();
return false;