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

cleanup

Browse Source
This commit is contained in:
J. Nick Koston 2025-07-10 21:11:37 -10:00
parent 58ff3a8abd
commit 6ff19992da
No known key found for this signature in database
4 changed files with 330 additions and 320 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

596
esphome/components/api/api_pb2.h
View File

File diff suppressed because it is too large Load Diff

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

@ -319,9 +319,9 @@ void ProtoMessage::decode(const uint8_t *buffer, size_t length) {
// Get metadata
const FieldMeta *fields = get_field_metadata();
size_t field_count = get_field_count();
uint8_t field_count = get_field_count();
const RepeatedFieldMeta *repeated_fields = get_repeated_field_metadata();
size_t repeated_count = get_repeated_field_count();
uint8_t repeated_count = get_repeated_field_count();
// Handle empty message
if (field_count == 0 && repeated_count == 0) {
@ -358,7 +358,7 @@ void ProtoMessage::decode(const uint8_t *buffer, size_t length) {
ProtoVarInt value = *value_res;
// Try regular fields first
for (size_t j = 0; j < field_count; j++) {
for (uint8_t j = 0; j < field_count; j++) {
if (fields[j].field_num == field_id && get_wire_type(fields[j].get_type()) == 0) {
void *field_addr = base + fields[j].get_offset();
decoded = decode_varint_field(fields[j].get_type(), field_addr, value);
@ -368,7 +368,7 @@ void ProtoMessage::decode(const uint8_t *buffer, size_t length) {
// If not found, try repeated fields
if (!decoded) {
for (size_t j = 0; j < repeated_count; j++) {
for (uint8_t j = 0; j < repeated_count; j++) {
if (repeated_fields[j].field_num == field_id && get_wire_type(repeated_fields[j].get_type()) == 0) {
void *field_addr = base + repeated_fields[j].get_offset();
decoded = decode_repeated_varint_field(repeated_fields[j].get_type(), field_addr, value);
@ -398,7 +398,7 @@ void ProtoMessage::decode(const uint8_t *buffer, size_t length) {
ProtoLengthDelimited value(&buffer[i], field_length);
// Try regular fields first
for (size_t j = 0; j < field_count; j++) {
for (uint8_t j = 0; j < field_count; j++) {
if (fields[j].field_num == field_id && get_wire_type(fields[j].get_type()) == 2) {
void *field_addr = base + fields[j].get_offset();
decoded = decode_length_field(fields[j].get_type(), field_addr, value, fields[j].get_message_type_id());
@ -408,7 +408,7 @@ void ProtoMessage::decode(const uint8_t *buffer, size_t length) {
// If not found, try repeated fields
if (!decoded) {
for (size_t j = 0; j < repeated_count; j++) {
for (uint8_t j = 0; j < repeated_count; j++) {
if (repeated_fields[j].field_num == field_id && get_wire_type(repeated_fields[j].get_type()) == 2) {
void *field_addr = base + repeated_fields[j].get_offset();
decoded = decode_repeated_length_field(repeated_fields[j].get_type(), field_addr, value,
@ -436,7 +436,7 @@ void ProtoMessage::decode(const uint8_t *buffer, size_t length) {
Proto32Bit value(raw);
// Try regular fields first
for (size_t j = 0; j < field_count; j++) {
for (uint8_t j = 0; j < field_count; j++) {
if (fields[j].field_num == field_id && get_wire_type(fields[j].get_type()) == 5) {
void *field_addr = base + fields[j].get_offset();
decoded = decode_32bit_field(fields[j].get_type(), field_addr, value);
@ -446,7 +446,7 @@ void ProtoMessage::decode(const uint8_t *buffer, size_t length) {
// If not found, try repeated fields
if (!decoded) {
for (size_t j = 0; j < repeated_count; j++) {
for (uint8_t j = 0; j < repeated_count; j++) {
if (repeated_fields[j].field_num == field_id && get_wire_type(repeated_fields[j].get_type()) == 5) {
void *field_addr = base + repeated_fields[j].get_offset();
decoded = decode_repeated_32bit_field(repeated_fields[j].get_type(), field_addr, value);
@ -475,9 +475,9 @@ void ProtoMessage::encode(ProtoWriteBuffer buffer) const {
// Encode regular fields
const FieldMeta *fields = get_field_metadata();
size_t field_count = get_field_count();
uint8_t field_count = get_field_count();
for (size_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();
if (fields[i].get_type() == ProtoFieldType::TYPE_MESSAGE) {
@ -492,9 +492,9 @@ void ProtoMessage::encode(ProtoWriteBuffer buffer) const {
// Encode repeated fields - reuse the same encode_field function!
const RepeatedFieldMeta *repeated_fields = get_repeated_field_metadata();
size_t repeated_count = get_repeated_field_count();
uint8_t repeated_count = get_repeated_field_count();
for (size_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();
if (repeated_fields[i].get_type() == ProtoFieldType::TYPE_MESSAGE) {
@ -520,9 +520,9 @@ void ProtoMessage::calculate_size(uint32_t &total_size) const {
// Calculate size for regular fields
const FieldMeta *fields = get_field_metadata();
size_t field_count = get_field_count();
uint8_t field_count = get_field_count();
for (size_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();
if (fields[i].get_type() == ProtoFieldType::TYPE_MESSAGE) {
@ -537,9 +537,9 @@ void ProtoMessage::calculate_size(uint32_t &total_size) const {
// Calculate size for repeated fields - reuse the same calculate_field_size function!
const RepeatedFieldMeta *repeated_fields = get_repeated_field_metadata();
size_t repeated_count = get_repeated_field_count();
uint8_t repeated_count = get_repeated_field_count();
for (size_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();
if (repeated_fields[i].get_type() == ProtoFieldType::TYPE_MESSAGE) {

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

@ -443,9 +443,9 @@ class ProtoMessage {
// Metadata getters - must be implemented by derived classes
virtual const FieldMeta *get_field_metadata() const { return nullptr; }
virtual size_t get_field_count() const { return 0; }
virtual uint8_t get_field_count() const { return 0; }
virtual const RepeatedFieldMeta *get_repeated_field_metadata() const { return nullptr; }
virtual size_t get_repeated_field_count() const { return 0; }
virtual uint8_t get_repeated_field_count() const { return 0; }
// Encode/decode/calculate_size using V2 metadata (will check for V3 first)
void encode(ProtoWriteBuffer buffer) const;

18
script/api_protobuf/api_protobuf.py
View File

@ -1345,16 +1345,26 @@ def build_message_type(
# Add metadata declarations
if regular_fields:
public_content.append(f"static const FieldMeta FIELDS[{len(regular_fields)}];")
# Validate field count fits in uint8_t
if len(regular_fields) > 255:
raise ValueError(
f"Message '{desc.name}' has {len(regular_fields)} fields which exceeds the maximum of 255."
)
public_content.append(
f"static constexpr size_t FIELD_COUNT = {len(regular_fields)};"
f"static constexpr uint8_t FIELD_COUNT = {len(regular_fields)};"
)
if repeated_fields:
public_content.append(
f"static const RepeatedFieldMeta REPEATED_FIELDS[{len(repeated_fields)}];"
)
# Validate repeated field count fits in uint8_t
if len(repeated_fields) > 255:
raise ValueError(
f"Message '{desc.name}' has {len(repeated_fields)} repeated fields which exceeds the maximum of 255."
)
public_content.append(
f"static constexpr size_t REPEATED_COUNT = {len(repeated_fields)};"
f"static constexpr uint8_t REPEATED_COUNT = {len(repeated_fields)};"
)
# Add virtual getter methods only when needed
@ -1367,7 +1377,7 @@ def build_message_type(
"const FieldMeta *get_field_metadata() const override { return FIELDS; }"
)
public_content.append(
"size_t get_field_count() const override { return FIELD_COUNT; }"
"uint8_t get_field_count() const override { return FIELD_COUNT; }"
)
if repeated_fields:
@ -1375,7 +1385,7 @@ def build_message_type(
"const RepeatedFieldMeta *get_repeated_field_metadata() const override { return REPEATED_FIELDS; }"
)
public_content.append(
"size_t get_repeated_field_count() const override { return REPEATED_COUNT; }"
"uint8_t get_repeated_field_count() const override { return REPEATED_COUNT; }"
)
# dump_to method declaration in header