jeans/esphome
jeans/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-08-02 16:37:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

preen

Browse Source
This commit is contained in:
J. Nick Koston 2025-07-11 06:45:49 -10:00
parent bde3d025dc
commit be7550f5da
No known key found for this signature in database
1 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
esphome/components/api/proto.cpp
View File

@ -451,25 +451,30 @@ void ProtoMessage::encode(ProtoWriteBuffer buffer) const {
const uint8_t *base = reinterpret_cast<const uint8_t *>(this); const uint8_t *base = reinterpret_cast<const uint8_t *>(this);
// Encode regular fields // Encode regular fields
const FieldMeta *fields = get_field_metadata();
uint8_t field_count = get_field_count(); uint8_t field_count = get_field_count();
if (field_count) {
const FieldMeta *fields = get_field_metadata();
for (uint8_t i = 0; i < field_count; i++) { for (uint8_t i = 0; i < field_count; i++) {
const void *field_addr = base + fields[i].get_offset(); const void *field_addr = base + fields[i].get_offset();
if (fields[i].get_type() == ProtoFieldType::TYPE_MESSAGE) { if (fields[i].get_type() == ProtoFieldType::TYPE_MESSAGE) {
uint8_t handler_id = fields[i].get_message_type_id(); uint8_t handler_id = fields[i].get_message_type_id();
if (handler_id < MESSAGE_HANDLER_COUNT && MESSAGE_HANDLERS[handler_id].encode != nullptr) { if (handler_id < MESSAGE_HANDLER_COUNT && MESSAGE_HANDLERS[handler_id].encode != nullptr) {
MESSAGE_HANDLERS[handler_id].encode(buffer, field_addr, fields[i].field_num); MESSAGE_HANDLERS[handler_id].encode(buffer, field_addr, fields[i].field_num);
}
} else {
encode_field(buffer, fields[i].get_type(), fields[i].field_num, field_addr, false);
} }
} else {
encode_field(buffer, fields[i].get_type(), fields[i].field_num, field_addr, false);
} }
} }
// Encode repeated fields - reuse the same encode_field function! // Encode repeated fields - reuse the same encode_field function!
const RepeatedFieldMeta *repeated_fields = get_repeated_field_metadata();
uint8_t repeated_count = get_repeated_field_count(); uint8_t repeated_count = get_repeated_field_count();
if (repeated_count == 0) {
return; // No repeated fields to process
}
const RepeatedFieldMeta *repeated_fields = get_repeated_field_metadata();
for (uint8_t i = 0; i < repeated_count; i++) { for (uint8_t i = 0; i < repeated_count; i++) {
const void *field_addr = base + repeated_fields[i].get_offset(); const void *field_addr = base + repeated_fields[i].get_offset();
@ -501,25 +506,29 @@ void ProtoMessage::calculate_size(uint32_t &total_size) const {
const uint8_t *base = reinterpret_cast<const uint8_t *>(this); const uint8_t *base = reinterpret_cast<const uint8_t *>(this);
// Calculate size for regular fields // Calculate size for regular fields
const FieldMeta *fields = get_field_metadata();
uint8_t field_count = get_field_count(); uint8_t field_count = get_field_count();
if (field_count) {
const FieldMeta *fields = get_field_metadata();
for (uint8_t i = 0; i < field_count; i++) {
const void *field_addr = base + fields[i].get_offset();
for (uint8_t i = 0; i < field_count; i++) { if (fields[i].get_type() == ProtoFieldType::TYPE_MESSAGE) {
const void *field_addr = base + fields[i].get_offset(); uint8_t handler_id = fields[i].get_message_type_id();
if (handler_id < MESSAGE_HANDLER_COUNT && MESSAGE_HANDLERS[handler_id].size != nullptr) {
if (fields[i].get_type() == ProtoFieldType::TYPE_MESSAGE) { MESSAGE_HANDLERS[handler_id].size(total_size, field_addr, fields[i].get_precalced_size(), false);
uint8_t handler_id = fields[i].get_message_type_id(); }
if (handler_id < MESSAGE_HANDLER_COUNT && MESSAGE_HANDLERS[handler_id].size != nullptr) { } else {
MESSAGE_HANDLERS[handler_id].size(total_size, field_addr, fields[i].get_precalced_size(), false); calculate_field_size(total_size, fields[i].get_type(), fields[i].get_precalced_size(), field_addr, false);
} }
} else {
calculate_field_size(total_size, fields[i].get_type(), fields[i].get_precalced_size(), field_addr, false);
} }
} }
// Calculate size for repeated fields - reuse the same calculate_field_size function! // Calculate size for repeated fields - reuse the same calculate_field_size function!
const RepeatedFieldMeta *repeated_fields = get_repeated_field_metadata();
uint8_t repeated_count = get_repeated_field_count(); uint8_t repeated_count = get_repeated_field_count();
if (repeated_count == 0) {
return; // No repeated fields to process
}
const RepeatedFieldMeta *repeated_fields = get_repeated_field_metadata();
for (uint8_t i = 0; i < repeated_count; i++) { for (uint8_t i = 0; i < repeated_count; i++) {
const void *field_addr = base + repeated_fields[i].get_offset(); const void *field_addr = base + repeated_fields[i].get_offset();