Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-14 02:58:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

dry

Browse source
This commit is contained in:
J. Nick Koston 2024-04-21 11:22:28 +02:00
parent dd346263f3
commit 17db30fa4f
No known key found for this signature in database
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
esphome/components/bluetooth_proxy/bluetooth_connection.cpp
View file

@ -22,18 +22,14 @@ bool BluetoothConnection::gattc_event_handler(esp_gattc_cb_event_t event, esp_ga
case ESP_GATTC_DISCONNECT_EVT: { case ESP_GATTC_DISCONNECT_EVT: {
if (param->disconnect.conn_id != this->conn_id_) if (param->disconnect.conn_id != this->conn_id_)
break; break;
this->proxy_->send_device_connection(this->address_, false, 0, param->disconnect.reason); this->handle_connection_close_(param->disconnect.reason);
this->set_address(0);
this->proxy_->send_connections_free();
break; break;
} }
case ESP_GATTC_OPEN_EVT: { case ESP_GATTC_OPEN_EVT: {
if (param->open.conn_id != this->conn_id_) if (param->open.conn_id != this->conn_id_)
break; break;
if (param->open.status != ESP_GATT_OK && param->open.status != ESP_GATT_ALREADY_OPEN) { if (param->open.status != ESP_GATT_OK && param->open.status != ESP_GATT_ALREADY_OPEN) {
this->proxy_->send_device_connection(this->address_, false, 0, param->open.status); this->handle_connection_close_(param->open.status);
this->set_address(0);
this->proxy_->send_connections_free();
} else if (this->connection_type_ == espbt::ConnectionType::V3_WITH_CACHE) { } else if (this->connection_type_ == espbt::ConnectionType::V3_WITH_CACHE) {
this->proxy_->send_device_connection(this->address_, true, this->mtu_); this->proxy_->send_device_connection(this->address_, true, this->mtu_);
this->proxy_->send_connections_free(); this->proxy_->send_connections_free();
@ -153,6 +149,12 @@ bool BluetoothConnection::gattc_event_handler(esp_gattc_cb_event_t event, esp_ga
return true; return true;
} }
void BluetoothConnection::handle_connection_close_(esp_err_t error) {
this->proxy_->send_device_connection(this->address_, false, 0, error);
this->set_address(0);
this->proxy_->send_connections_free();
}
void BluetoothConnection::gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param) { void BluetoothConnection::gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param) {
BLEClientBase::gap_event_handler(event, param); BLEClientBase::gap_event_handler(event, param);

1
esphome/components/bluetooth_proxy/bluetooth_connection.h
View file

@ -26,6 +26,7 @@ class BluetoothConnection : public esp32_ble_client::BLEClientBase {
protected: protected:
friend class BluetoothProxy; friend class BluetoothProxy;
bool seen_mtu_or_services_{false}; bool seen_mtu_or_services_{false};
void handle_connection_close_(esp_err_t error);
int16_t send_service_{-2}; int16_t send_service_{-2};
BluetoothProxy *proxy_; BluetoothProxy *proxy_;