Mirrors_Framework/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-05-27 20:53:46 +08:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
J. Nick Koston
2026-01-12 17:06:49 -10:00
parent 5e911e20bc
commit b24a1a9e25
3 changed files with 71 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/api/api_pb2_service.cpp
+62 -116
View File
File diff suppressed because it is too large Load Diff
esphome/components/api/api_pb2_service.h
+1
View File
@@ -13,6 +13,7 @@ class APIServerConnectionBase : public ProtoService {
#ifdef HAS_PROTO_MESSAGE_DUMP #ifdef HAS_PROTO_MESSAGE_DUMP
protected: protected:
void log_send_message_(const char *name, const char *dump); void log_send_message_(const char *name, const char *dump);
void log_receive_message_(const char *name, const ProtoMessage &msg);
public: public:
#endif #endif
script/api_protobuf/api_protobuf.py
+8 -4
View File
@@ -2519,8 +2519,7 @@ def build_service_message_type(
case += "// Empty message: no decode needed\n" case += "// Empty message: no decode needed\n"
if log: if log:
case += "#ifdef HAS_PROTO_MESSAGE_DUMP\n" case += "#ifdef HAS_PROTO_MESSAGE_DUMP\n"
case += "DumpBuffer dump_buf;\n" case += f'this->log_receive_message_("{func}", msg);\n'
case += f'ESP_LOGVV(TAG, "{func}: %s", msg.dump_to(dump_buf));\n'
case += "#endif\n" case += "#endif\n"
case += f"this->{func}(msg);\n" case += f"this->{func}(msg);\n"
case += "break;" case += "break;"
@@ -2842,10 +2841,11 @@ static const char *const TAG = "api.service";
hpp += f"class {class_name} : public ProtoService {{\n" hpp += f"class {class_name} : public ProtoService {{\n"
hpp += " public:\n" hpp += " public:\n"
# Add logging helper method declaration # Add logging helper method declarations
hpp += "#ifdef HAS_PROTO_MESSAGE_DUMP\n" hpp += "#ifdef HAS_PROTO_MESSAGE_DUMP\n"
hpp += " protected:\n" hpp += " protected:\n"
hpp += " void log_send_message_(const char *name, const char *dump);\n" hpp += " void log_send_message_(const char *name, const char *dump);\n"
hpp += " void log_receive_message_(const char *name, const ProtoMessage &msg);\n"
hpp += " public:\n" hpp += " public:\n"
hpp += "#endif\n\n" hpp += "#endif\n\n"
@@ -2858,13 +2858,17 @@ static const char *const TAG = "api.service";
hpp += " return this->send_message_(msg, message_type);\n" hpp += " return this->send_message_(msg, message_type);\n"
hpp += " }\n\n" hpp += " }\n\n"
# Add logging helper method implementation to cpp # Add logging helper method implementations to cpp
cpp += "#ifdef HAS_PROTO_MESSAGE_DUMP\n" cpp += "#ifdef HAS_PROTO_MESSAGE_DUMP\n"
cpp += ( cpp += (
f"void {class_name}::log_send_message_(const char *name, const char *dump) {{\n" f"void {class_name}::log_send_message_(const char *name, const char *dump) {{\n"
) )
cpp += ' ESP_LOGVV(TAG, "send_message %s: %s", name, dump);\n' cpp += ' ESP_LOGVV(TAG, "send_message %s: %s", name, dump);\n'
cpp += "}\n" cpp += "}\n"
cpp += f"void {class_name}::log_receive_message_(const char *name, const ProtoMessage &msg) {{\n"
cpp += " DumpBuffer dump_buf;\n"
cpp += ' ESP_LOGVV(TAG, "%s: %s", name, msg.dump_to(dump_buf));\n'
cpp += "}\n"
cpp += "#endif\n\n" cpp += "#endif\n\n"
for mt in file.message_type: for mt in file.message_type: