jeans/esphome
jeans/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-08-05 09:57:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
J. Nick Koston 2025-07-10 06:05:40 -10:00
parent 22ac43e7eb
commit 27b0c99580
No known key found for this signature in database
2 changed files with 11 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -611,39 +611,11 @@ void ProtoMessage::calculate_size(uint32_t &total_size) const {
} }
bool ProtoMessage::decode_varint(uint32_t field_id, ProtoVarInt value) { bool ProtoMessage::decode_varint(uint32_t field_id, ProtoVarInt value) {
const FieldMeta *fields = get_field_metadata();
if (!fields)
return false;
return decode_varint_metadata(field_id, value, fields, get_field_count());
}
bool ProtoMessage::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
const FieldMeta *fields = get_field_metadata();
if (!fields)
return false;
return decode_length_metadata(field_id, value, fields, get_field_count());
}
bool ProtoMessage::decode_32bit(uint32_t field_id, Proto32Bit value) {
const FieldMeta *fields = get_field_metadata();
if (!fields)
return false;
return decode_32bit_metadata(field_id, value, fields, get_field_count());
}
bool ProtoMessage::decode_64bit(uint32_t field_id, Proto64Bit value) {
const FieldMeta *fields = get_field_metadata();
if (!fields)
return false;
return decode_64bit_metadata(field_id, value, fields, get_field_count());
}
// Metadata-driven decode implementations
bool ProtoMessage::decode_varint_metadata(uint32_t field_id, ProtoVarInt value, const FieldMeta *fields,
size_t field_count) {
uint8_t *base = reinterpret_cast<uint8_t *>(this); uint8_t *base = reinterpret_cast<uint8_t *>(this);
// Check regular fields // Check regular fields
const FieldMeta *fields = get_field_metadata();
size_t field_count = get_field_count();
for (size_t i = 0; i < field_count; i++) { for (size_t i = 0; i < field_count; i++) {
if (fields[i].field_num == field_id && fields[i].wire_type == 0) { // varint if (fields[i].field_num == field_id && fields[i].wire_type == 0) { // varint
void *field_addr = base + fields[i].offset; void *field_addr = base + fields[i].offset;
@ -666,11 +638,12 @@ bool ProtoMessage::decode_varint_metadata(uint32_t field_id, ProtoVarInt value,
return false; return false;
} }
bool ProtoMessage::decode_length_metadata(uint32_t field_id, ProtoLengthDelimited value, const FieldMeta *fields, bool ProtoMessage::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
size_t field_count) {
uint8_t *base = reinterpret_cast<uint8_t *>(this); uint8_t *base = reinterpret_cast<uint8_t *>(this);
// Check regular fields // Check regular fields
const FieldMeta *fields = get_field_metadata();
size_t field_count = get_field_count();
for (size_t i = 0; i < field_count; i++) { for (size_t i = 0; i < field_count; i++) {
if (fields[i].field_num == field_id && fields[i].wire_type == 2) { // length-delimited if (fields[i].field_num == field_id && fields[i].wire_type == 2) { // length-delimited
void *field_addr = base + fields[i].offset; void *field_addr = base + fields[i].offset;
@ -693,11 +666,12 @@ bool ProtoMessage::decode_length_metadata(uint32_t field_id, ProtoLengthDelimite
return false; return false;
} }
bool ProtoMessage::decode_32bit_metadata(uint32_t field_id, Proto32Bit value, const FieldMeta *fields, bool ProtoMessage::decode_32bit(uint32_t field_id, Proto32Bit value) {
size_t field_count) {
uint8_t *base = reinterpret_cast<uint8_t *>(this); uint8_t *base = reinterpret_cast<uint8_t *>(this);
// Check regular fields // Check regular fields
const FieldMeta *fields = get_field_metadata();
size_t field_count = get_field_count();
for (size_t i = 0; i < field_count; i++) { for (size_t i = 0; i < field_count; i++) {
if (fields[i].field_num == field_id && fields[i].wire_type == 5) { // 32-bit if (fields[i].field_num == field_id && fields[i].wire_type == 5) { // 32-bit
void *field_addr = base + fields[i].offset; void *field_addr = base + fields[i].offset;
@ -720,11 +694,12 @@ bool ProtoMessage::decode_32bit_metadata(uint32_t field_id, Proto32Bit value, co
return false; return false;
} }
bool ProtoMessage::decode_64bit_metadata(uint32_t field_id, Proto64Bit value, const FieldMeta *fields, bool ProtoMessage::decode_64bit(uint32_t field_id, Proto64Bit value) {
size_t field_count) {
uint8_t *base = reinterpret_cast<uint8_t *>(this); uint8_t *base = reinterpret_cast<uint8_t *>(this);
// Check regular fields // Check regular fields
const FieldMeta *fields = get_field_metadata();
size_t field_count = get_field_count();
for (size_t i = 0; i < field_count; i++) { for (size_t i = 0; i < field_count; i++) {
if (fields[i].field_num == field_id && fields[i].wire_type == 1) { // 64-bit if (fields[i].field_num == field_id && fields[i].wire_type == 1) { // 64-bit
void *field_addr = base + fields[i].offset; void *field_addr = base + fields[i].offset;

7
esphome/components/api/proto.h
View File

@ -415,13 +415,6 @@ class ProtoMessage {
bool decode_length(uint32_t field_id, ProtoLengthDelimited value); bool decode_length(uint32_t field_id, ProtoLengthDelimited value);
bool decode_32bit(uint32_t field_id, Proto32Bit value); bool decode_32bit(uint32_t field_id, Proto32Bit value);
bool decode_64bit(uint32_t field_id, Proto64Bit value); bool decode_64bit(uint32_t field_id, Proto64Bit value);
// Metadata-driven decode methods (private implementation details)
bool decode_varint_metadata(uint32_t field_id, ProtoVarInt value, const FieldMeta *fields, size_t field_count);
bool decode_length_metadata(uint32_t field_id, ProtoLengthDelimited value, const FieldMeta *fields,
size_t field_count);
bool decode_32bit_metadata(uint32_t field_id, Proto32Bit value, const FieldMeta *fields, size_t field_count);
bool decode_64bit_metadata(uint32_t field_id, Proto64Bit value, const FieldMeta *fields, size_t field_count);
}; };
template<typename T> const char *proto_enum_to_string(T value); template<typename T> const char *proto_enum_to_string(T value);