fix max message sizes for unused protobufs

pull/1453/head
Sacha Weatherstone 2022-05-12 23:12:37 +10:00
rodzic d9e2e09149
commit 3b4c8ad0e2
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 7AB2D7E206124B31
4 zmienionych plików z 16 dodań i 14 usunięć

@ -1 +1 @@
Subproject commit f1e495cbba4ef235a23446709b9df292636937d6 Subproject commit 88ad1b2e34286a6a6f71bc62b1ea24e82ca513e4

Wyświetl plik

@ -6,7 +6,7 @@
#error Regenerate this file with the current version of nanopb generator. #error Regenerate this file with the current version of nanopb generator.
#endif #endif
PB_BIND(ChannelSet, ChannelSet, AUTO) PB_BIND(ChannelSet, ChannelSet, 2)

Wyświetl plik

@ -18,7 +18,8 @@
This abstraction is used only on the the 'app side' of the world (ie python, javascript and android etc) to show a group of Channels as a (long) URL */ This abstraction is used only on the the 'app side' of the world (ie python, javascript and android etc) to show a group of Channels as a (long) URL */
typedef struct _ChannelSet { typedef struct _ChannelSet {
/* TODO: REPLACE */ /* TODO: REPLACE */
pb_callback_t settings; pb_size_t settings_count;
ChannelSettings settings[10];
} ChannelSet; } ChannelSet;
@ -27,16 +28,16 @@ extern "C" {
#endif #endif
/* Initializer values for message structs */ /* Initializer values for message structs */
#define ChannelSet_init_default {{{NULL}, NULL}} #define ChannelSet_init_default {0, {ChannelSettings_init_default, ChannelSettings_init_default, ChannelSettings_init_default, ChannelSettings_init_default, ChannelSettings_init_default, ChannelSettings_init_default, ChannelSettings_init_default, ChannelSettings_init_default, ChannelSettings_init_default, ChannelSettings_init_default}}
#define ChannelSet_init_zero {{{NULL}, NULL}} #define ChannelSet_init_zero {0, {ChannelSettings_init_zero, ChannelSettings_init_zero, ChannelSettings_init_zero, ChannelSettings_init_zero, ChannelSettings_init_zero, ChannelSettings_init_zero, ChannelSettings_init_zero, ChannelSettings_init_zero, ChannelSettings_init_zero, ChannelSettings_init_zero}}
/* Field tags (for use in manual encoding/decoding) */ /* Field tags (for use in manual encoding/decoding) */
#define ChannelSet_settings_tag 1 #define ChannelSet_settings_tag 1
/* Struct field encoding specification for nanopb */ /* Struct field encoding specification for nanopb */
#define ChannelSet_FIELDLIST(X, a) \ #define ChannelSet_FIELDLIST(X, a) \
X(a, CALLBACK, REPEATED, MESSAGE, settings, 1) X(a, STATIC, REPEATED, MESSAGE, settings, 1)
#define ChannelSet_CALLBACK pb_default_field_callback #define ChannelSet_CALLBACK NULL
#define ChannelSet_DEFAULT NULL #define ChannelSet_DEFAULT NULL
#define ChannelSet_settings_MSGTYPE ChannelSettings #define ChannelSet_settings_MSGTYPE ChannelSettings
@ -46,7 +47,7 @@ extern const pb_msgdesc_t ChannelSet_msg;
#define ChannelSet_fields &ChannelSet_msg #define ChannelSet_fields &ChannelSet_msg
/* Maximum encoded size of messages (where known) */ /* Maximum encoded size of messages (where known) */
/* ChannelSet_size depends on runtime parameters */ #define ChannelSet_size 630
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */

Wyświetl plik

@ -235,9 +235,10 @@ typedef enum _LogRecord_Level {
} LogRecord_Level; } LogRecord_Level;
/* Struct definitions */ /* Struct definitions */
typedef PB_BYTES_ARRAY_T(237) Compressed_data_t;
typedef struct _Compressed { typedef struct _Compressed {
PortNum portnum; PortNum portnum;
pb_callback_t data; Compressed_data_t data;
} Compressed; } Compressed;
/* Location of a waypoint to associate with a message */ /* Location of a waypoint to associate with a message */
@ -711,7 +712,7 @@ extern "C" {
#define FromRadio_init_default {0, 0, {MyNodeInfo_init_default}} #define FromRadio_init_default {0, 0, {MyNodeInfo_init_default}}
#define ToRadio_init_default {0, {MeshPacket_init_default}} #define ToRadio_init_default {0, {MeshPacket_init_default}}
#define ToRadio_PeerInfo_init_default {0, 0} #define ToRadio_PeerInfo_init_default {0, 0}
#define Compressed_init_default {_PortNum_MIN, {{NULL}, NULL}} #define Compressed_init_default {_PortNum_MIN, {0, {0}}}
#define Position_init_zero {0, 0, 0, 0, _Position_LocSource_MIN, _Position_AltSource_MIN, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} #define Position_init_zero {0, 0, 0, 0, _Position_LocSource_MIN, _Position_AltSource_MIN, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
#define User_init_zero {"", "", "", {0}, _HardwareModel_MIN, 0, 0, 0, 0} #define User_init_zero {"", "", "", {0}, _HardwareModel_MIN, 0, 0, 0, 0}
#define RouteDiscovery_init_zero {0, {0, 0, 0, 0, 0, 0, 0, 0}} #define RouteDiscovery_init_zero {0, {0, 0, 0, 0, 0, 0, 0, 0}}
@ -725,7 +726,7 @@ extern "C" {
#define FromRadio_init_zero {0, 0, {MyNodeInfo_init_zero}} #define FromRadio_init_zero {0, 0, {MyNodeInfo_init_zero}}
#define ToRadio_init_zero {0, {MeshPacket_init_zero}} #define ToRadio_init_zero {0, {MeshPacket_init_zero}}
#define ToRadio_PeerInfo_init_zero {0, 0} #define ToRadio_PeerInfo_init_zero {0, 0}
#define Compressed_init_zero {_PortNum_MIN, {{NULL}, NULL}} #define Compressed_init_zero {_PortNum_MIN, {0, {0}}}
/* Field tags (for use in manual encoding/decoding) */ /* Field tags (for use in manual encoding/decoding) */
#define Compressed_portnum_tag 1 #define Compressed_portnum_tag 1
@ -1003,8 +1004,8 @@ X(a, STATIC, SINGULAR, BOOL, mqtt_gateway, 2)
#define Compressed_FIELDLIST(X, a) \ #define Compressed_FIELDLIST(X, a) \
X(a, STATIC, SINGULAR, UENUM, portnum, 1) \ X(a, STATIC, SINGULAR, UENUM, portnum, 1) \
X(a, CALLBACK, SINGULAR, BYTES, data, 2) X(a, STATIC, SINGULAR, BYTES, data, 2)
#define Compressed_CALLBACK pb_default_field_callback #define Compressed_CALLBACK NULL
#define Compressed_DEFAULT NULL #define Compressed_DEFAULT NULL
extern const pb_msgdesc_t Position_msg; extern const pb_msgdesc_t Position_msg;
@ -1039,7 +1040,7 @@ extern const pb_msgdesc_t Compressed_msg;
#define Compressed_fields &Compressed_msg #define Compressed_fields &Compressed_msg
/* Maximum encoded size of messages (where known) */ /* Maximum encoded size of messages (where known) */
/* Compressed_size depends on runtime parameters */ #define Compressed_size 243
#define Data_size 296 #define Data_size 296
#define FromRadio_size 356 #define FromRadio_size 356
#define Location_size 24 #define Location_size 24