sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-09-02 19:32:19 +01:00
Code Issues Releases Wiki Activity

[bluetooth_proxy] Remove unused ClientState::SEARCHING state

Browse Source
This commit is contained in:
J. Nick Koston
2025-08-20 06:44:25 -05:00
parent 86f306ba9e
commit d8c85bfc44
4 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
View File

@@ -183,6 +183,12 @@ void BluetoothProxy::bluetooth_device_request(const api::BluetoothDeviceRequest
this->send_device_connection(msg.address, false); this->send_device_connection(msg.address, false);
return; return;
} }
if (!msg.has_address_type) {
ESP_LOGE(TAG, "[%d] [%s] Missing address type in connect request", connection->get_connection_index(),
connection->address_str().c_str());
this->send_device_connection(msg.address, false);
return;
}
if (connection->state() == espbt::ClientState::CONNECTED || if (connection->state() == espbt::ClientState::CONNECTED ||
connection->state() == espbt::ClientState::ESTABLISHED) { connection->state() == espbt::ClientState::ESTABLISHED) {
this->log_connection_request_ignored_(connection, connection->state()); this->log_connection_request_ignored_(connection, connection->state());
@@ -209,13 +215,9 @@ void BluetoothProxy::bluetooth_device_request(const api::BluetoothDeviceRequest
connection->set_connection_type(espbt::ConnectionType::V3_WITHOUT_CACHE); connection->set_connection_type(espbt::ConnectionType::V3_WITHOUT_CACHE);
this->log_connection_info_(connection, "v3 without cache"); this->log_connection_info_(connection, "v3 without cache");
} }
if (msg.has_address_type) { uint64_to_bd_addr(msg.address, connection->remote_bda_);
uint64_to_bd_addr(msg.address, connection->remote_bda_); connection->set_remote_addr_type(static_cast<esp_ble_addr_type_t>(msg.address_type));
connection->set_remote_addr_type(static_cast<esp_ble_addr_type_t>(msg.address_type)); connection->set_state(espbt::ClientState::DISCOVERED);
connection->set_state(espbt::ClientState::DISCOVERED);
} else {
connection->set_state(espbt::ClientState::SEARCHING);
}
this->send_connections_free(); this->send_connections_free();
break; break;
} }

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

@@ -92,7 +92,7 @@ bool BLEClientBase::parse_device(const espbt::ESPBTDevice &device) {
return false; return false;
if (this->address_ == 0 || device.address_uint64() != this->address_) if (this->address_ == 0 || device.address_uint64() != this->address_)
return false; return false;
if (this->state_ != espbt::ClientState::IDLE && this->state_ != espbt::ClientState::SEARCHING) if (this->state_ != espbt::ClientState::IDLE)
return false; return false;
this->log_event_("Found device"); this->log_event_("Found device");
@@ -190,8 +190,7 @@ void BLEClientBase::unconditional_disconnect() {
this->log_gattc_warning_("esp_ble_gattc_close", err); this->log_gattc_warning_("esp_ble_gattc_close", err);
} }
if (this->state_ == espbt::ClientState::SEARCHING || this->state_ == espbt::ClientState::READY_TO_CONNECT || if (this->state_ == espbt::ClientState::READY_TO_CONNECT || this->state_ == espbt::ClientState::DISCOVERED) {
this->state_ == espbt::ClientState::DISCOVERED) {
this->set_address(0); this->set_address(0);
this->set_state(espbt::ClientState::IDLE); this->set_state(espbt::ClientState::IDLE);
} else { } else {

2
esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
View File

@@ -49,8 +49,6 @@ const char *client_state_to_string(ClientState state) {
return "DISCONNECTING"; return "DISCONNECTING";
case ClientState::IDLE: case ClientState::IDLE:
return "IDLE"; return "IDLE";
case ClientState::SEARCHING:
return "SEARCHING";
case ClientState::DISCOVERED: case ClientState::DISCOVERED:
return "DISCOVERED"; return "DISCOVERED";
case ClientState::READY_TO_CONNECT: case ClientState::READY_TO_CONNECT:

9
esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
View File

@@ -141,12 +141,10 @@ class ESPBTDeviceListener {
struct ClientStateCounts { struct ClientStateCounts {
uint8_t connecting = 0; uint8_t connecting = 0;
uint8_t discovered = 0; uint8_t discovered = 0;
uint8_t searching = 0;
uint8_t disconnecting = 0; uint8_t disconnecting = 0;
bool operator==(const ClientStateCounts &other) const { bool operator==(const ClientStateCounts &other) const {
return connecting == other.connecting && discovered == other.discovered && searching == other.searching && return connecting == other.connecting && discovered == other.discovered && disconnecting == other.disconnecting;
disconnecting == other.disconnecting;
} }
bool operator!=(const ClientStateCounts &other) const { return !(*this == other); } bool operator!=(const ClientStateCounts &other) const { return !(*this == other); }
@@ -159,8 +157,6 @@ enum class ClientState : uint8_t {
DISCONNECTING, DISCONNECTING,
// Connection is idle, no device detected. // Connection is idle, no device detected.
IDLE, IDLE,
// Searching for device.
SEARCHING,
// Device advertisement found. // Device advertisement found.
DISCOVERED, DISCOVERED,
// Device is discovered and the scanner is stopped // Device is discovered and the scanner is stopped
@@ -321,9 +317,6 @@ class ESP32BLETracker : public Component,
case ClientState::DISCOVERED: case ClientState::DISCOVERED:
counts.discovered++; counts.discovered++;
break; break;
case ClientState::SEARCHING:
counts.searching++;
break;
case ClientState::CONNECTING: case ClientState::CONNECTING:
case ClientState::READY_TO_CONNECT: case ClientState::READY_TO_CONNECT:
counts.connecting++; counts.connecting++;