mirror/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-03-02 10:48:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

[bluetooth_proxy] Send native 16/32-bit UUIDs instead of always converting to 128-bit

Browse Source
This commit is contained in:
J. Nick Koston
2025-07-30 21:24:40 -10:00
parent 71557c9f58
commit 37911e84f2
8 changed files with 143 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,6 +24,13 @@ static void fill_128bit_uuid_array(std::array<uint64_t, 2> &out, esp_bt_uuid_t u
((uint64_t) uuid.uuid.uuid128[1] << 8) | ((uint64_t) uuid.uuid.uuid128[0]);
}
static bool supports_efficient_uuids(api::APIConnection *api_conn) {
if (!api_conn)
return false;
return api_conn->get_client_api_version_major() > 1 ||
(api_conn->get_client_api_version_major() == 1 && api_conn->get_client_api_version_minor() >= 12);
}
void BluetoothConnection::dump_config() {
ESP_LOGCONFIG(TAG, "BLE Connection:");
BLEClientBase::dump_config();
@@ -74,6 +81,9 @@ void BluetoothConnection::send_service_for_discovery_() {
return;
}
// Check if client supports efficient UUIDs
bool use_efficient_uuids = supports_efficient_uuids(api_conn);
// Prepare response for up to 3 services
api::BluetoothGATTGetServicesResponse resp;
resp.address = this->address_;
@@ -100,7 +110,16 @@ void BluetoothConnection::send_service_for_discovery_() {
this->send_service_++;
resp.services.emplace_back();
auto &service_resp = resp.services.back();
fill_128bit_uuid_array(service_resp.uuid, service_result.uuid);
if (!use_efficient_uuids || service_result.uuid.len == ESP_UUID_LEN_128) {
// Use 128-bit format for old clients or when UUID is already 128-bit
fill_128bit_uuid_array(service_resp.uuid, service_result.uuid);
} else if (service_result.uuid.len == ESP_UUID_LEN_16) {
service_resp.uuid16 = service_result.uuid.uuid.uuid16;
} else if (service_result.uuid.len == ESP_UUID_LEN_32) {
service_resp.uuid32 = service_result.uuid.uuid.uuid32;
}
service_resp.handle = service_result.start_handle;
// Get the number of characteristics directly with one call
@@ -145,7 +164,16 @@ void BluetoothConnection::send_service_for_discovery_() {
service_resp.characteristics.emplace_back();
auto &characteristic_resp = service_resp.characteristics.back();
fill_128bit_uuid_array(characteristic_resp.uuid, char_result.uuid);
if (!use_efficient_uuids || char_result.uuid.len == ESP_UUID_LEN_128) {
// Use 128-bit format for old clients or when UUID is already 128-bit
fill_128bit_uuid_array(characteristic_resp.uuid, char_result.uuid);
} else if (char_result.uuid.len == ESP_UUID_LEN_16) {
characteristic_resp.uuid16 = char_result.uuid.uuid.uuid16;
} else if (char_result.uuid.len == ESP_UUID_LEN_32) {
characteristic_resp.uuid32 = char_result.uuid.uuid.uuid32;
}
characteristic_resp.handle = char_result.char_handle;
characteristic_resp.properties = char_result.properties;
char_offset++;
@@ -189,7 +217,16 @@ void BluetoothConnection::send_service_for_discovery_() {
characteristic_resp.descriptors.emplace_back();
auto &descriptor_resp = characteristic_resp.descriptors.back();
fill_128bit_uuid_array(descriptor_resp.uuid, desc_result.uuid);
if (!use_efficient_uuids || desc_result.uuid.len == ESP_UUID_LEN_128) {
// Use 128-bit format for old clients or when UUID is already 128-bit
fill_128bit_uuid_array(descriptor_resp.uuid, desc_result.uuid);
} else if (desc_result.uuid.len == ESP_UUID_LEN_16) {
descriptor_resp.uuid16 = desc_result.uuid.uuid.uuid16;
} else if (desc_result.uuid.len == ESP_UUID_LEN_32) {
descriptor_resp.uuid32 = desc_result.uuid.uuid.uuid32;
}
descriptor_resp.handle = desc_result.handle;
desc_offset++;
}