From d2437aed7ec36d893cc13b9c04969e7dedc5f1c3 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Sun, 9 Sep 2018 11:28:22 +0200 Subject: annotate protobuf --- elegoo/elegoo.pb.c | 28 ++++++++++++++-------------- elegoo/elegoo.pb.h | 18 +++++++++--------- 2 files changed, 23 insertions(+), 23 deletions(-) (limited to 'elegoo') diff --git a/elegoo/elegoo.pb.c b/elegoo/elegoo.pb.c index 0f22015..95cd113 100644 --- a/elegoo/elegoo.pb.c +++ b/elegoo/elegoo.pb.c @@ -1,5 +1,5 @@ /* Automatically generated nanopb constant definitions */ -/* Generated by nanopb-0.4.0-dev at Sat Sep 8 11:29:35 2018. */ +/* Generated by nanopb-0.4.0-dev at Sun Sep 9 11:27:32 2018. */ #include "elegoo.pb.h" @@ -10,6 +10,12 @@ +const pb_field_t elegoo_Command_fields[3] = { + PB_FIELD( 1, MESSAGE , SINGULAR, STATIC , FIRST, elegoo_Command, Speed, Speed, &elegoo_Speed_fields), + PB_FIELD( 2, SINT32 , SINGULAR, STATIC , OTHER, elegoo_Command, Look, Speed, 0), + PB_LAST_FIELD +}; + const pb_field_t elegoo_Speed_fields[4] = { PB_FIELD( 1, SINT32 , SINGULAR, STATIC , FIRST, elegoo_Speed, L, L, 0), PB_FIELD( 2, SINT32 , SINGULAR, STATIC , OTHER, elegoo_Speed, R, L, 0), @@ -17,9 +23,11 @@ const pb_field_t elegoo_Speed_fields[4] = { PB_LAST_FIELD }; -const pb_field_t elegoo_Command_fields[3] = { - PB_FIELD( 1, MESSAGE , SINGULAR, STATIC , FIRST, elegoo_Command, Speed, Speed, &elegoo_Speed_fields), - PB_FIELD( 2, SINT32 , SINGULAR, STATIC , OTHER, elegoo_Command, Look, Speed, 0), +const pb_field_t elegoo_Event_fields[5] = { + PB_FIELD( 1, UINT32 , SINGULAR, STATIC , FIRST, elegoo_Event, TimeStamp, TimeStamp, 0), + PB_FIELD( 2, MESSAGE , SINGULAR, STATIC , OTHER, elegoo_Event, Head, TimeStamp, &elegoo_Sonar_fields), + PB_FIELD( 3, MESSAGE , SINGULAR, STATIC , OTHER, elegoo_Event, Sensor, Head, &elegoo_Sensor_fields), + PB_FIELD( 4, MESSAGE , SINGULAR, STATIC , OTHER, elegoo_Event, Remote, Sensor, &elegoo_Remote_fields), PB_LAST_FIELD }; @@ -41,14 +49,6 @@ const pb_field_t elegoo_Remote_fields[2] = { PB_LAST_FIELD }; -const pb_field_t elegoo_Event_fields[5] = { - PB_FIELD( 1, UINT32 , SINGULAR, STATIC , FIRST, elegoo_Event, TimeStamp, TimeStamp, 0), - PB_FIELD( 2, MESSAGE , SINGULAR, STATIC , OTHER, elegoo_Event, Head, TimeStamp, &elegoo_Sonar_fields), - PB_FIELD( 3, MESSAGE , SINGULAR, STATIC , OTHER, elegoo_Event, Sensor, Head, &elegoo_Sensor_fields), - PB_FIELD( 4, MESSAGE , SINGULAR, STATIC , OTHER, elegoo_Event, Remote, Sensor, &elegoo_Remote_fields), - PB_LAST_FIELD -}; - /* Check that field information fits in pb_field_t */ #if !defined(PB_FIELD_32BIT) @@ -59,7 +59,7 @@ const pb_field_t elegoo_Event_fields[5] = { * numbers or field sizes that are larger than what can fit in 8 or 16 bit * field descriptors. */ -PB_STATIC_ASSERT((pb_membersize(elegoo_Command, Speed) < 65536 && pb_membersize(elegoo_Event, Head) < 65536 && pb_membersize(elegoo_Event, Sensor) < 65536 && pb_membersize(elegoo_Event, Remote) < 65536), YOU_MUST_DEFINE_PB_FIELD_32BIT_FOR_MESSAGES_elegoo_Speed_elegoo_Command_elegoo_Sonar_elegoo_Sensor_elegoo_Remote_elegoo_Event) +PB_STATIC_ASSERT((pb_membersize(elegoo_Command, Speed) < 65536 && pb_membersize(elegoo_Event, Head) < 65536 && pb_membersize(elegoo_Event, Sensor) < 65536 && pb_membersize(elegoo_Event, Remote) < 65536), YOU_MUST_DEFINE_PB_FIELD_32BIT_FOR_MESSAGES_elegoo_Command_elegoo_Speed_elegoo_Event_elegoo_Sonar_elegoo_Sensor_elegoo_Remote) #endif #if !defined(PB_FIELD_16BIT) && !defined(PB_FIELD_32BIT) @@ -70,7 +70,7 @@ PB_STATIC_ASSERT((pb_membersize(elegoo_Command, Speed) < 65536 && pb_membersize( * numbers or field sizes that are larger than what can fit in the default * 8 bit descriptors. */ -PB_STATIC_ASSERT((pb_membersize(elegoo_Command, Speed) < 256 && pb_membersize(elegoo_Event, Head) < 256 && pb_membersize(elegoo_Event, Sensor) < 256 && pb_membersize(elegoo_Event, Remote) < 256), YOU_MUST_DEFINE_PB_FIELD_16BIT_FOR_MESSAGES_elegoo_Speed_elegoo_Command_elegoo_Sonar_elegoo_Sensor_elegoo_Remote_elegoo_Event) +PB_STATIC_ASSERT((pb_membersize(elegoo_Command, Speed) < 256 && pb_membersize(elegoo_Event, Head) < 256 && pb_membersize(elegoo_Event, Sensor) < 256 && pb_membersize(elegoo_Event, Remote) < 256), YOU_MUST_DEFINE_PB_FIELD_16BIT_FOR_MESSAGES_elegoo_Command_elegoo_Speed_elegoo_Event_elegoo_Sonar_elegoo_Sensor_elegoo_Remote) #endif diff --git a/elegoo/elegoo.pb.h b/elegoo/elegoo.pb.h index 5561ffc..a7d6798 100644 --- a/elegoo/elegoo.pb.h +++ b/elegoo/elegoo.pb.h @@ -1,5 +1,5 @@ /* Automatically generated nanopb header */ -/* Generated by nanopb-0.4.0-dev at Sat Sep 8 11:29:35 2018. */ +/* Generated by nanopb-0.4.0-dev at Sun Sep 9 11:27:32 2018. */ #ifndef PB_ELEGOO_ELEGOO_PB_H_INCLUDED #define PB_ELEGOO_ELEGOO_PB_H_INCLUDED @@ -57,18 +57,18 @@ typedef struct _elegoo_Event { /* Default values for struct fields */ /* Initializer values for message structs */ -#define elegoo_Speed_init_default {0, 0, 0} #define elegoo_Command_init_default {elegoo_Speed_init_default, 0} +#define elegoo_Speed_init_default {0, 0, 0} +#define elegoo_Event_init_default {0, elegoo_Sonar_init_default, elegoo_Sensor_init_default, elegoo_Remote_init_default} #define elegoo_Sonar_init_default {0, 0} #define elegoo_Sensor_init_default {0, 0, 0} #define elegoo_Remote_init_default {0} -#define elegoo_Event_init_default {0, elegoo_Sonar_init_default, elegoo_Sensor_init_default, elegoo_Remote_init_default} -#define elegoo_Speed_init_zero {0, 0, 0} #define elegoo_Command_init_zero {elegoo_Speed_init_zero, 0} +#define elegoo_Speed_init_zero {0, 0, 0} +#define elegoo_Event_init_zero {0, elegoo_Sonar_init_zero, elegoo_Sensor_init_zero, elegoo_Remote_init_zero} #define elegoo_Sonar_init_zero {0, 0} #define elegoo_Sensor_init_zero {0, 0, 0} #define elegoo_Remote_init_zero {0} -#define elegoo_Event_init_zero {0, elegoo_Sonar_init_zero, elegoo_Sensor_init_zero, elegoo_Remote_init_zero} /* Field tags (for use in manual encoding/decoding) */ #define elegoo_Remote_Key_tag 1 @@ -88,20 +88,20 @@ typedef struct _elegoo_Event { #define elegoo_Event_Remote_tag 4 /* Struct field encoding specification for nanopb */ -extern const pb_field_t elegoo_Speed_fields[4]; extern const pb_field_t elegoo_Command_fields[3]; +extern const pb_field_t elegoo_Speed_fields[4]; +extern const pb_field_t elegoo_Event_fields[5]; extern const pb_field_t elegoo_Sonar_fields[3]; extern const pb_field_t elegoo_Sensor_fields[4]; extern const pb_field_t elegoo_Remote_fields[2]; -extern const pb_field_t elegoo_Event_fields[5]; /* Maximum encoded size of messages (where known) */ -#define elegoo_Speed_size 18 #define elegoo_Command_size 26 +#define elegoo_Speed_size 18 +#define elegoo_Event_size 36 #define elegoo_Sonar_size 12 #define elegoo_Sensor_size 6 #define elegoo_Remote_size 6 -#define elegoo_Event_size 36 /* Message IDs (where set with "msgid" option) */ #ifdef PB_MSGID -- cgit v1.2.3