From 1fbbc696beaa6f64d6832c83763fbd1dce10906c Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Tue, 26 Dec 2017 00:07:21 +0100 Subject: rename --- elegoo/elegoo.pb.c | 30 +++++++++++----------- elegoo/elegoo.pb.h | 74 +++++++++++++++++++++++++++--------------------------- 2 files changed, 52 insertions(+), 52 deletions(-) (limited to 'elegoo') diff --git a/elegoo/elegoo.pb.c b/elegoo/elegoo.pb.c index bee2e3d..04051f8 100644 --- a/elegoo/elegoo.pb.c +++ b/elegoo/elegoo.pb.c @@ -1,5 +1,5 @@ /* Automatically generated nanopb constant definitions */ -/* Generated by nanopb-0.3.9 at Wed Dec 13 00:35:27 2017. */ +/* Generated by nanopb-0.3.9 at Tue Dec 26 00:06:46 2017. */ #include "elegoo.pb.h" @@ -23,29 +23,29 @@ const pb_field_t elegoo_Command_fields[3] = { PB_LAST_FIELD }; -const pb_field_t elegoo_UltraSonic_fields[3] = { - PB_FIELD( 1, UINT32 , SINGULAR, STATIC , FIRST, elegoo_UltraSonic, Distance, Distance, 0), - PB_FIELD( 2, SINT32 , SINGULAR, STATIC , OTHER, elegoo_UltraSonic, Direction, Distance, 0), +const pb_field_t elegoo_Sonar_fields[3] = { + PB_FIELD( 1, UINT32 , SINGULAR, STATIC , FIRST, elegoo_Sonar, Distance, Distance, 0), + PB_FIELD( 2, SINT32 , SINGULAR, STATIC , OTHER, elegoo_Sonar, Direction, Distance, 0), PB_LAST_FIELD }; -const pb_field_t elegoo_InfraRed_fields[4] = { - PB_FIELD( 1, BOOL , SINGULAR, STATIC , FIRST, elegoo_InfraRed, R, R, 0), - PB_FIELD( 2, BOOL , SINGULAR, STATIC , OTHER, elegoo_InfraRed, C, R, 0), - PB_FIELD( 3, BOOL , SINGULAR, STATIC , OTHER, elegoo_InfraRed, L, C, 0), +const pb_field_t elegoo_Sensor_fields[4] = { + PB_FIELD( 1, BOOL , SINGULAR, STATIC , FIRST, elegoo_Sensor, R, R, 0), + PB_FIELD( 2, BOOL , SINGULAR, STATIC , OTHER, elegoo_Sensor, C, R, 0), + PB_FIELD( 3, BOOL , SINGULAR, STATIC , OTHER, elegoo_Sensor, L, C, 0), PB_LAST_FIELD }; -const pb_field_t elegoo_RemoteControl_fields[2] = { - PB_FIELD( 1, UINT32 , SINGULAR, STATIC , FIRST, elegoo_RemoteControl, Key, Key, 0), +const pb_field_t elegoo_Remote_fields[2] = { + PB_FIELD( 1, UINT32 , SINGULAR, STATIC , FIRST, elegoo_Remote, Key, Key, 0), 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_UltraSonic_fields), - PB_FIELD( 3, MESSAGE , SINGULAR, STATIC , OTHER, elegoo_Event, Sensor, Head, &elegoo_InfraRed_fields), - PB_FIELD( 4, MESSAGE , SINGULAR, STATIC , OTHER, elegoo_Event, Remote, Sensor, &elegoo_RemoteControl_fields), + 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 }; @@ -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_UltraSonic_elegoo_InfraRed_elegoo_RemoteControl_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_Speed_elegoo_Command_elegoo_Sonar_elegoo_Sensor_elegoo_Remote_elegoo_Event) #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_UltraSonic_elegoo_InfraRed_elegoo_RemoteControl_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_Speed_elegoo_Command_elegoo_Sonar_elegoo_Sensor_elegoo_Remote_elegoo_Event) #endif diff --git a/elegoo/elegoo.pb.h b/elegoo/elegoo.pb.h index b53e1cc..055fde6 100644 --- a/elegoo/elegoo.pb.h +++ b/elegoo/elegoo.pb.h @@ -1,5 +1,5 @@ /* Automatically generated nanopb header */ -/* Generated by nanopb-0.3.9 at Wed Dec 13 00:35:27 2017. */ +/* Generated by nanopb-0.3.9 at Tue Dec 26 00:06:46 2017. */ #ifndef PB_ELEGOO_ELEGOO_PB_H_INCLUDED #define PB_ELEGOO_ELEGOO_PB_H_INCLUDED @@ -15,17 +15,23 @@ extern "C" { #endif /* Struct definitions */ -typedef struct _elegoo_InfraRed { +typedef struct _elegoo_Remote { + uint32_t Key; +/* @@protoc_insertion_point(struct:elegoo_Remote) */ +} elegoo_Remote; + +typedef struct _elegoo_Sensor { bool R; bool C; bool L; -/* @@protoc_insertion_point(struct:elegoo_InfraRed) */ -} elegoo_InfraRed; +/* @@protoc_insertion_point(struct:elegoo_Sensor) */ +} elegoo_Sensor; -typedef struct _elegoo_RemoteControl { - uint32_t Key; -/* @@protoc_insertion_point(struct:elegoo_RemoteControl) */ -} elegoo_RemoteControl; +typedef struct _elegoo_Sonar { + uint32_t Distance; + int32_t Direction; +/* @@protoc_insertion_point(struct:elegoo_Sonar) */ +} elegoo_Sonar; typedef struct _elegoo_Speed { int32_t L; @@ -34,12 +40,6 @@ typedef struct _elegoo_Speed { /* @@protoc_insertion_point(struct:elegoo_Speed) */ } elegoo_Speed; -typedef struct _elegoo_UltraSonic { - uint32_t Distance; - int32_t Direction; -/* @@protoc_insertion_point(struct:elegoo_UltraSonic) */ -} elegoo_UltraSonic; - typedef struct _elegoo_Command { elegoo_Speed Speed; int32_t Look; @@ -48,9 +48,9 @@ typedef struct _elegoo_Command { typedef struct _elegoo_Event { uint32_t TimeStamp; - elegoo_UltraSonic Head; - elegoo_InfraRed Sensor; - elegoo_RemoteControl Remote; + elegoo_Sonar Head; + elegoo_Sensor Sensor; + elegoo_Remote Remote; /* @@protoc_insertion_point(struct:elegoo_Event) */ } elegoo_Event; @@ -59,27 +59,27 @@ typedef struct _elegoo_Event { /* 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_UltraSonic_init_default {0, 0} -#define elegoo_InfraRed_init_default {0, 0, 0} -#define elegoo_RemoteControl_init_default {0} -#define elegoo_Event_init_default {0, elegoo_UltraSonic_init_default, elegoo_InfraRed_init_default, elegoo_RemoteControl_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_UltraSonic_init_zero {0, 0} -#define elegoo_InfraRed_init_zero {0, 0, 0} -#define elegoo_RemoteControl_init_zero {0} -#define elegoo_Event_init_zero {0, elegoo_UltraSonic_init_zero, elegoo_InfraRed_init_zero, elegoo_RemoteControl_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_InfraRed_R_tag 1 -#define elegoo_InfraRed_C_tag 2 -#define elegoo_InfraRed_L_tag 3 -#define elegoo_RemoteControl_Key_tag 1 +#define elegoo_Remote_Key_tag 1 +#define elegoo_Sensor_R_tag 1 +#define elegoo_Sensor_C_tag 2 +#define elegoo_Sensor_L_tag 3 +#define elegoo_Sonar_Distance_tag 1 +#define elegoo_Sonar_Direction_tag 2 #define elegoo_Speed_L_tag 1 #define elegoo_Speed_R_tag 2 #define elegoo_Speed_StopAfter_tag 3 -#define elegoo_UltraSonic_Distance_tag 1 -#define elegoo_UltraSonic_Direction_tag 2 #define elegoo_Command_Speed_tag 1 #define elegoo_Command_Look_tag 2 #define elegoo_Event_TimeStamp_tag 1 @@ -90,17 +90,17 @@ typedef struct _elegoo_Event { /* 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_UltraSonic_fields[3]; -extern const pb_field_t elegoo_InfraRed_fields[4]; -extern const pb_field_t elegoo_RemoteControl_fields[2]; +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_UltraSonic_size 12 -#define elegoo_InfraRed_size 6 -#define elegoo_RemoteControl_size 6 +#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) */ -- cgit v1.2.3