This commit is contained in:
J. Nick Koston 2025-07-10 21:18:04 -10:00
parent 6ff19992da
commit ce350642e4
No known key found for this signature in database
3 changed files with 6 additions and 8 deletions

View File

@ -975,7 +975,7 @@ const MessageHandler MESSAGE_HANDLERS[2] = {
{nullptr, nullptr, nullptr}, {nullptr, nullptr, nullptr},
#endif #endif
}; };
const size_t MESSAGE_HANDLER_COUNT = 2; const uint8_t MESSAGE_HANDLER_COUNT = 2;
const RepeatedMessageHandler REPEATED_MESSAGE_HANDLERS[13] = { const RepeatedMessageHandler REPEATED_MESSAGE_HANDLERS[13] = {
{&encode_repeated_message_field<DeviceInfo>, &size_repeated_message_field<DeviceInfo>, {&encode_repeated_message_field<DeviceInfo>, &size_repeated_message_field<DeviceInfo>,
@ -1041,7 +1041,7 @@ const RepeatedMessageHandler REPEATED_MESSAGE_HANDLERS[13] = {
{nullptr, nullptr, nullptr}, {nullptr, nullptr, nullptr},
#endif #endif
}; };
const size_t REPEATED_MESSAGE_HANDLER_COUNT = 13; const uint8_t REPEATED_MESSAGE_HANDLER_COUNT = 13;
} // namespace api } // namespace api
} // namespace esphome } // namespace esphome

View File

@ -250,9 +250,9 @@ struct RepeatedMessageHandler {
// Global message handler registries (defined in api_pb2.cpp) // Global message handler registries (defined in api_pb2.cpp)
extern const MessageHandler MESSAGE_HANDLERS[]; extern const MessageHandler MESSAGE_HANDLERS[];
extern const size_t MESSAGE_HANDLER_COUNT; extern const uint8_t MESSAGE_HANDLER_COUNT;
extern const RepeatedMessageHandler REPEATED_MESSAGE_HANDLERS[]; extern const RepeatedMessageHandler REPEATED_MESSAGE_HANDLERS[];
extern const size_t REPEATED_MESSAGE_HANDLER_COUNT; extern const uint8_t REPEATED_MESSAGE_HANDLER_COUNT;
// Optimized metadata structure (4 bytes - no padding on 32-bit architectures) // Optimized metadata structure (4 bytes - no padding on 32-bit architectures)
struct FieldMeta { struct FieldMeta {

View File

@ -1973,9 +1973,7 @@ namespace api {
if cpp.endswith(",\n"): if cpp.endswith(",\n"):
cpp = cpp[:-2] + "\n" cpp = cpp[:-2] + "\n"
cpp += "};\n" cpp += "};\n"
cpp += ( cpp += f"const uint8_t MESSAGE_HANDLER_COUNT = {len(type_registry.message_registry)};\n"
f"const size_t MESSAGE_HANDLER_COUNT = {len(type_registry.message_registry)};\n"
)
# Generate REPEATED_MESSAGE_HANDLERS array with same approach # Generate REPEATED_MESSAGE_HANDLERS array with same approach
repeated_handler_count = ( repeated_handler_count = (
@ -2013,7 +2011,7 @@ namespace api {
if cpp.endswith(",\n"): if cpp.endswith(",\n"):
cpp = cpp[:-2] + "\n" cpp = cpp[:-2] + "\n"
cpp += "};\n" cpp += "};\n"
cpp += f"const size_t REPEATED_MESSAGE_HANDLER_COUNT = {len(type_registry.repeated_registry)};\n" cpp += f"const uint8_t REPEATED_MESSAGE_HANDLER_COUNT = {len(type_registry.repeated_registry)};\n"
cpp += """\ cpp += """\