sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-09-06 05:12:21 +01:00
Code Issues Releases Wiki Activity

Merge branch 'btp_uuids_dynamic_services_sq' into integration

Browse Source
This commit is contained in:
J. Nick Koston
2025-07-31 11:27:01 -10:00
parent 3c88d8388e dd7441e104
commit a808d00b88
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -297,14 +297,13 @@ void BluetoothConnection::send_service_for_discovery_() {
int size_diff = (int) service_size - (int) estimated_size; int size_diff = (int) service_size - (int) estimated_size;
ESP_LOGV(TAG, "[%d] [%s] Service %d actual: %d, estimated: %d, diff: %+d", this->connection_index_, ESP_LOGV(TAG, "[%d] [%s] Service %d actual: %d, estimated: %d, diff: %+d", this->connection_index_,
this->address_str().c_str(), this->send_service_, service_size, estimated_size, size_diff); this->address_str().c_str(), this->send_service_, service_size, estimated_size, size_diff);
ESP_LOGV(TAG, "[%d] [%s] Total size now: %d", this->connection_index_, this->address_str().c_str(), current_size);
// Successfully added this service, increment counter // Successfully added this service, increment counter
this->send_service_++; this->send_service_++;
} }
// Send the message with dynamically batched services // Send the message with dynamically batched services
ESP_LOGD(TAG, "[%d] [%s] Sending batch with %d services, total size %d", this->connection_index_, ESP_LOGV(TAG, "[%d] [%s] Sending batch with %d services, total size %d", this->connection_index_,
this->address_str().c_str(), resp.services.size(), current_size); this->address_str().c_str(), resp.services.size(), current_size);
api_conn->send_message(resp, api::BluetoothGATTGetServicesResponse::MESSAGE_TYPE); api_conn->send_message(resp, api::BluetoothGATTGetServicesResponse::MESSAGE_TYPE);
} }

12
script/api_protobuf/api_protobuf.py
View File

@@ -1122,6 +1122,18 @@ class FixedArrayRepeatedType(TypeInfo):
] ]
return f"if ({non_zero_checks}) {{\n" + "\n".join(encode_lines) + "\n}" return f"if ({non_zero_checks}) {{\n" + "\n".join(encode_lines) + "\n}"
# If skip_zero is enabled, wrap encoding in a zero check
if self.skip_zero:
# Build the condition to check if at least one element is non-zero
non_zero_checks = " || ".join(
[f"this->{self.field_name}[{i}] != 0" for i in range(self.array_size)]
)
encode_lines = [
f" {encode_element(f'this->{self.field_name}[{i}]')}"
for i in range(self.array_size)
]
return f"if ({non_zero_checks}) {{\n" + "\n".join(encode_lines) + "\n}"
# Unroll small arrays for efficiency # Unroll small arrays for efficiency
if self.array_size == 1: if self.array_size == 1:
return encode_element(f"this->{self.field_name}[0]") return encode_element(f"this->{self.field_name}[0]")