From 5ae4edf8fd5e36eb342d7300903cfd3d78775bc3 Mon Sep 17 00:00:00 2001 From: Kevin Hester Date: Thu, 25 Feb 2021 20:36:37 +0800 Subject: [PATCH] move admin out of core proto --- proto | 2 +- src/mesh/generated/admin.pb.c | 12 ++++++ src/mesh/generated/admin.pb.h | 66 ++++++++++++++++++++++++++++++ src/mesh/generated/deviceonly.pb.h | 2 +- src/mesh/generated/mesh.pb.c | 3 -- src/mesh/generated/mesh.pb.h | 33 ++------------- src/mesh/mesh-pb-constants.h | 1 + 7 files changed, 84 insertions(+), 35 deletions(-) create mode 100644 src/mesh/generated/admin.pb.c create mode 100644 src/mesh/generated/admin.pb.h diff --git a/proto b/proto index b53818d67..75ae9929a 160000 --- a/proto +++ b/proto @@ -1 +1 @@ -Subproject commit b53818d67b34bf7a221ae2292cd2cd4af9412253 +Subproject commit 75ae9929a22a0cfa65059f30b27485f2ae8f3a63 diff --git a/src/mesh/generated/admin.pb.c b/src/mesh/generated/admin.pb.c new file mode 100644 index 000000000..4b90c51ae --- /dev/null +++ b/src/mesh/generated/admin.pb.c @@ -0,0 +1,12 @@ +/* Automatically generated nanopb constant definitions */ +/* Generated by nanopb-0.4.4 */ + +#include "admin.pb.h" +#if PB_PROTO_HEADER_VERSION != 40 +#error Regenerate this file with the current version of nanopb generator. +#endif + +PB_BIND(AdminMessage, AdminMessage, 2) + + + diff --git a/src/mesh/generated/admin.pb.h b/src/mesh/generated/admin.pb.h new file mode 100644 index 000000000..b3d29825a --- /dev/null +++ b/src/mesh/generated/admin.pb.h @@ -0,0 +1,66 @@ +/* Automatically generated nanopb header */ +/* Generated by nanopb-0.4.4 */ + +#ifndef PB_ADMIN_PB_H_INCLUDED +#define PB_ADMIN_PB_H_INCLUDED +#include +#include "mesh.pb.h" + +#if PB_PROTO_HEADER_VERSION != 40 +#error Regenerate this file with the current version of nanopb generator. +#endif + +/* Struct definitions */ +typedef struct _AdminMessage { + pb_size_t which_variant; + union { + RadioConfig set_radio; + User set_owner; + Channel set_channel; + bool get_radio; + uint32_t get_channel; + }; +} AdminMessage; + + +#ifdef __cplusplus +extern "C" { +#endif + +/* Initializer values for message structs */ +#define AdminMessage_init_default {0, {RadioConfig_init_default}} +#define AdminMessage_init_zero {0, {RadioConfig_init_zero}} + +/* Field tags (for use in manual encoding/decoding) */ +#define AdminMessage_set_radio_tag 1 +#define AdminMessage_set_owner_tag 2 +#define AdminMessage_set_channel_tag 3 +#define AdminMessage_get_radio_tag 4 +#define AdminMessage_get_channel_tag 5 + +/* Struct field encoding specification for nanopb */ +#define AdminMessage_FIELDLIST(X, a) \ +X(a, STATIC, ONEOF, MESSAGE, (variant,set_radio,set_radio), 1) \ +X(a, STATIC, ONEOF, MESSAGE, (variant,set_owner,set_owner), 2) \ +X(a, STATIC, ONEOF, MESSAGE, (variant,set_channel,set_channel), 3) \ +X(a, STATIC, ONEOF, BOOL, (variant,get_radio,get_radio), 4) \ +X(a, STATIC, ONEOF, UINT32, (variant,get_channel,get_channel), 5) +#define AdminMessage_CALLBACK NULL +#define AdminMessage_DEFAULT NULL +#define AdminMessage_variant_set_radio_MSGTYPE RadioConfig +#define AdminMessage_variant_set_owner_MSGTYPE User +#define AdminMessage_variant_set_channel_MSGTYPE Channel + +extern const pb_msgdesc_t AdminMessage_msg; + +/* Defines for backwards compatibility with code written before nanopb-0.4.0 */ +#define AdminMessage_fields &AdminMessage_msg + +/* Maximum encoded size of messages (where known) */ +#define AdminMessage_size 338 + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif diff --git a/src/mesh/generated/deviceonly.pb.h b/src/mesh/generated/deviceonly.pb.h index 01246c70e..3b81f2240 100644 --- a/src/mesh/generated/deviceonly.pb.h +++ b/src/mesh/generated/deviceonly.pb.h @@ -80,7 +80,7 @@ extern const pb_msgdesc_t DeviceState_msg; #define DeviceState_fields &DeviceState_msg /* Maximum encoded size of messages (where known) */ -#define DeviceState_size 6152 +#define DeviceState_size 6146 #ifdef __cplusplus } /* extern "C" */ diff --git a/src/mesh/generated/mesh.pb.c b/src/mesh/generated/mesh.pb.c index f0b3f8c66..c4fd0d8e5 100644 --- a/src/mesh/generated/mesh.pb.c +++ b/src/mesh/generated/mesh.pb.c @@ -51,9 +51,6 @@ PB_BIND(FromRadio, FromRadio, 2) PB_BIND(ToRadio, ToRadio, 2) -PB_BIND(AdminMessage, AdminMessage, 2) - - diff --git a/src/mesh/generated/mesh.pb.h b/src/mesh/generated/mesh.pb.h index 6ad5945e1..eed90661c 100644 --- a/src/mesh/generated/mesh.pb.h +++ b/src/mesh/generated/mesh.pb.h @@ -247,7 +247,7 @@ typedef PB_BYTES_ARRAY_T(256) MeshPacket_encrypted_t; typedef struct _MeshPacket { uint32_t from; uint32_t to; - uint32_t channel; + uint8_t channel; pb_size_t which_payloadVariant; union { Data decoded; @@ -288,15 +288,6 @@ typedef struct _Routing { uint32_t original_id; } Routing; -typedef struct _AdminMessage { - pb_size_t which_variant; - union { - RadioConfig set_radio; - User set_owner; - Channel set_channel; - }; -} AdminMessage; - typedef struct _FromRadio { uint32_t num; pb_size_t which_payloadVariant; @@ -387,7 +378,6 @@ extern "C" { #define LogRecord_init_default {"", 0, "", _LogRecord_Level_MIN} #define FromRadio_init_default {0, 0, {MyNodeInfo_init_default}} #define ToRadio_init_default {0, {MeshPacket_init_default}} -#define AdminMessage_init_default {0, {RadioConfig_init_default}} #define Position_init_zero {0, 0, 0, 0, 0} #define User_init_zero {"", "", "", {0}} #define RouteDiscovery_init_zero {0, {0, 0, 0, 0, 0, 0, 0, 0}} @@ -403,7 +393,6 @@ extern "C" { #define LogRecord_init_zero {"", 0, "", _LogRecord_Level_MIN} #define FromRadio_init_zero {0, 0, {MyNodeInfo_init_zero}} #define ToRadio_init_zero {0, {MeshPacket_init_zero}} -#define AdminMessage_init_zero {0, {RadioConfig_init_zero}} /* Field tags (for use in manual encoding/decoding) */ #define ChannelSettings_tx_power_tag 1 @@ -521,9 +510,6 @@ extern "C" { #define Routing_success_id_tag 4 #define Routing_fail_id_tag 5 #define Routing_original_id_tag 6 -#define AdminMessage_set_radio_tag 1 -#define AdminMessage_set_owner_tag 2 -#define AdminMessage_set_channel_tag 3 #define FromRadio_num_tag 1 #define FromRadio_my_info_tag 3 #define FromRadio_node_info_tag 4 @@ -737,16 +723,6 @@ X(a, STATIC, ONEOF, UINT32, (payloadVariant,want_config_id,want_config_id #define ToRadio_DEFAULT NULL #define ToRadio_payloadVariant_packet_MSGTYPE MeshPacket -#define AdminMessage_FIELDLIST(X, a) \ -X(a, STATIC, ONEOF, MESSAGE, (variant,set_radio,set_radio), 1) \ -X(a, STATIC, ONEOF, MESSAGE, (variant,set_owner,set_owner), 2) \ -X(a, STATIC, ONEOF, MESSAGE, (variant,set_channel,set_channel), 3) -#define AdminMessage_CALLBACK NULL -#define AdminMessage_DEFAULT NULL -#define AdminMessage_variant_set_radio_MSGTYPE RadioConfig -#define AdminMessage_variant_set_owner_MSGTYPE User -#define AdminMessage_variant_set_channel_MSGTYPE Channel - extern const pb_msgdesc_t Position_msg; extern const pb_msgdesc_t User_msg; extern const pb_msgdesc_t RouteDiscovery_msg; @@ -762,7 +738,6 @@ extern const pb_msgdesc_t MyNodeInfo_msg; extern const pb_msgdesc_t LogRecord_msg; extern const pb_msgdesc_t FromRadio_msg; extern const pb_msgdesc_t ToRadio_msg; -extern const pb_msgdesc_t AdminMessage_msg; /* Defines for backwards compatibility with code written before nanopb-0.4.0 */ #define Position_fields &Position_msg @@ -780,7 +755,6 @@ extern const pb_msgdesc_t AdminMessage_msg; #define LogRecord_fields &LogRecord_msg #define FromRadio_fields &FromRadio_msg #define ToRadio_fields &ToRadio_msg -#define AdminMessage_fields &AdminMessage_msg /* Maximum encoded size of messages (where known) */ #define Position_size 37 @@ -788,7 +762,7 @@ extern const pb_msgdesc_t AdminMessage_msg; #define RouteDiscovery_size 40 #define Routing_size 47 #define Data_size 255 -#define MeshPacket_size 297 +#define MeshPacket_size 294 #define ChannelSettings_size 87 #define Channel_size 94 #define RadioConfig_size 335 @@ -797,8 +771,7 @@ extern const pb_msgdesc_t AdminMessage_msg; #define MyNodeInfo_size 89 #define LogRecord_size 81 #define FromRadio_size 344 -#define ToRadio_size 300 -#define AdminMessage_size 338 +#define ToRadio_size 297 #ifdef __cplusplus } /* extern "C" */ diff --git a/src/mesh/mesh-pb-constants.h b/src/mesh/mesh-pb-constants.h index 21163c496..0b2a0d6cf 100644 --- a/src/mesh/mesh-pb-constants.h +++ b/src/mesh/mesh-pb-constants.h @@ -2,6 +2,7 @@ #include "mesh/generated/mesh.pb.h" #include "mesh/generated/deviceonly.pb.h" +#include "mesh/generated/admin.pb.h" // this file defines constants which come from mesh.options