diff options
23 files changed, 567 insertions, 500 deletions
diff --git a/Software/Code_Composer/twine_graphicslib/graphics_adapter.c b/Software/Code_Composer/twine_graphicslib/graphics_adapter.c index 47500d0a3..93eb6fa17 100644 --- a/Software/Code_Composer/twine_graphicslib/graphics_adapter.c +++ b/Software/Code_Composer/twine_graphicslib/graphics_adapter.c @@ -41,5 +41,5 @@ void draw_string(char* data, size_t length) GrContextFontSet(&g_sContext, TEXT_FONT); GrContextForegroundSet(&g_sContext, ClrWhite); - GrStringDraw(&g_sContext, data, length, 150, 80, true); + GrStringDraw(&g_sContext, data, length, 0, 0, true); } diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Common/MessageContainer.pb-c.c b/Software/Code_Composer/twine_usblib_demo/PMR/Common/MessageContainer.pb-c.c index c89b466dc..cd488bb01 100644 --- a/Software/Code_Composer/twine_usblib_demo/PMR/Common/MessageContainer.pb-c.c +++ b/Software/Code_Composer/twine_usblib_demo/PMR/Common/MessageContainer.pb-c.c @@ -7,61 +7,61 @@ #endif #include "MessageContainer.pb-c.h" -void tango__pmr__common__message_container__init - (Tango__PMR__Common__MessageContainer *message) +void message_container__init + (MessageContainer *message) { - static const Tango__PMR__Common__MessageContainer init_value = TANGO__PMR__COMMON__MESSAGE_CONTAINER__INIT; + static const MessageContainer init_value = MESSAGE_CONTAINER__INIT; *message = init_value; } -size_t tango__pmr__common__message_container__get_packed_size - (const Tango__PMR__Common__MessageContainer *message) +size_t message_container__get_packed_size + (const MessageContainer *message) { - assert(message->base.descriptor == &tango__pmr__common__message_container__descriptor); + assert(message->base.descriptor == &message_container__descriptor); return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message)); } -size_t tango__pmr__common__message_container__pack - (const Tango__PMR__Common__MessageContainer *message, +size_t message_container__pack + (const MessageContainer *message, uint8_t *out) { - assert(message->base.descriptor == &tango__pmr__common__message_container__descriptor); + assert(message->base.descriptor == &message_container__descriptor); return protobuf_c_message_pack ((const ProtobufCMessage*)message, out); } -size_t tango__pmr__common__message_container__pack_to_buffer - (const Tango__PMR__Common__MessageContainer *message, +size_t message_container__pack_to_buffer + (const MessageContainer *message, ProtobufCBuffer *buffer) { - assert(message->base.descriptor == &tango__pmr__common__message_container__descriptor); + assert(message->base.descriptor == &message_container__descriptor); return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer); } -Tango__PMR__Common__MessageContainer * - tango__pmr__common__message_container__unpack +MessageContainer * + message_container__unpack (ProtobufCAllocator *allocator, size_t len, const uint8_t *data) { - return (Tango__PMR__Common__MessageContainer *) - protobuf_c_message_unpack (&tango__pmr__common__message_container__descriptor, + return (MessageContainer *) + protobuf_c_message_unpack (&message_container__descriptor, allocator, len, data); } -void tango__pmr__common__message_container__free_unpacked - (Tango__PMR__Common__MessageContainer *message, +void message_container__free_unpacked + (MessageContainer *message, ProtobufCAllocator *allocator) { if(!message) return; - assert(message->base.descriptor == &tango__pmr__common__message_container__descriptor); + assert(message->base.descriptor == &message_container__descriptor); protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); } -static const ProtobufCFieldDescriptor tango__pmr__common__message_container__field_descriptors[5] = +static const ProtobufCFieldDescriptor message_container__field_descriptors[5] = { { "Type", 1, PROTOBUF_C_LABEL_OPTIONAL, PROTOBUF_C_TYPE_ENUM, - offsetof(Tango__PMR__Common__MessageContainer, has_type), - offsetof(Tango__PMR__Common__MessageContainer, type), - &tango__pmr__common__message_type__descriptor, + offsetof(MessageContainer, has_type), + offsetof(MessageContainer, type), + &message_type__descriptor, NULL, 0, /* flags */ 0,NULL,NULL /* reserved1,reserved2, etc */ @@ -72,7 +72,7 @@ static const ProtobufCFieldDescriptor tango__pmr__common__message_container__fie PROTOBUF_C_LABEL_OPTIONAL, PROTOBUF_C_TYPE_STRING, 0, /* quantifier_offset */ - offsetof(Tango__PMR__Common__MessageContainer, token), + offsetof(MessageContainer, token), NULL, NULL, 0, /* flags */ @@ -83,8 +83,8 @@ static const ProtobufCFieldDescriptor tango__pmr__common__message_container__fie 3, PROTOBUF_C_LABEL_OPTIONAL, PROTOBUF_C_TYPE_BOOL, - offsetof(Tango__PMR__Common__MessageContainer, has_continuous), - offsetof(Tango__PMR__Common__MessageContainer, continuous), + offsetof(MessageContainer, has_continuous), + offsetof(MessageContainer, continuous), NULL, NULL, 0, /* flags */ @@ -95,8 +95,8 @@ static const ProtobufCFieldDescriptor tango__pmr__common__message_container__fie 4, PROTOBUF_C_LABEL_OPTIONAL, PROTOBUF_C_TYPE_BOOL, - offsetof(Tango__PMR__Common__MessageContainer, has_completed), - offsetof(Tango__PMR__Common__MessageContainer, completed), + offsetof(MessageContainer, has_completed), + offsetof(MessageContainer, completed), NULL, NULL, 0, /* flags */ @@ -107,38 +107,38 @@ static const ProtobufCFieldDescriptor tango__pmr__common__message_container__fie 5, PROTOBUF_C_LABEL_OPTIONAL, PROTOBUF_C_TYPE_BYTES, - offsetof(Tango__PMR__Common__MessageContainer, has_data), - offsetof(Tango__PMR__Common__MessageContainer, data), + offsetof(MessageContainer, has_data), + offsetof(MessageContainer, data), NULL, NULL, 0, /* flags */ 0,NULL,NULL /* reserved1,reserved2, etc */ }, }; -static const unsigned tango__pmr__common__message_container__field_indices_by_name[] = { +static const unsigned message_container__field_indices_by_name[] = { 3, /* field[3] = Completed */ 2, /* field[2] = Continuous */ 4, /* field[4] = Data */ 1, /* field[1] = Token */ 0, /* field[0] = Type */ }; -static const ProtobufCIntRange tango__pmr__common__message_container__number_ranges[1 + 1] = +static const ProtobufCIntRange message_container__number_ranges[1 + 1] = { { 1, 0 }, { 0, 5 } }; -const ProtobufCMessageDescriptor tango__pmr__common__message_container__descriptor = +const ProtobufCMessageDescriptor message_container__descriptor = { PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC, - "Tango.PMR.Common.MessageContainer", "MessageContainer", - "Tango__PMR__Common__MessageContainer", - "Tango.PMR.Common", - sizeof(Tango__PMR__Common__MessageContainer), + "MessageContainer", + "MessageContainer", + "", + sizeof(MessageContainer), 5, - tango__pmr__common__message_container__field_descriptors, - tango__pmr__common__message_container__field_indices_by_name, - 1, tango__pmr__common__message_container__number_ranges, - (ProtobufCMessageInit) tango__pmr__common__message_container__init, + message_container__field_descriptors, + message_container__field_indices_by_name, + 1, message_container__number_ranges, + (ProtobufCMessageInit) message_container__init, NULL,NULL,NULL /* reserved[123] */ }; diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Common/MessageContainer.pb-c.h b/Software/Code_Composer/twine_usblib_demo/PMR/Common/MessageContainer.pb-c.h index edc29ee79..194907452 100644 --- a/Software/Code_Composer/twine_usblib_demo/PMR/Common/MessageContainer.pb-c.h +++ b/Software/Code_Composer/twine_usblib_demo/PMR/Common/MessageContainer.pb-c.h @@ -16,7 +16,7 @@ PROTOBUF_C__BEGIN_DECLS #include "MessageType.pb-c.h" -typedef struct _Tango__PMR__Common__MessageContainer Tango__PMR__Common__MessageContainer; +typedef struct _MessageContainer MessageContainer; /* --- enums --- */ @@ -24,11 +24,11 @@ typedef struct _Tango__PMR__Common__MessageContainer Tango__PMR__Common__Message /* --- messages --- */ -struct _Tango__PMR__Common__MessageContainer +struct _MessageContainer { ProtobufCMessage base; protobuf_c_boolean has_type; - Tango__PMR__Common__MessageType type; + MessageType type; char *token; protobuf_c_boolean has_continuous; protobuf_c_boolean continuous; @@ -37,34 +37,34 @@ struct _Tango__PMR__Common__MessageContainer protobuf_c_boolean has_data; ProtobufCBinaryData data; }; -#define TANGO__PMR__COMMON__MESSAGE_CONTAINER__INIT \ - { PROTOBUF_C_MESSAGE_INIT (&tango__pmr__common__message_container__descriptor) \ - , 0, TANGO__PMR__COMMON__MESSAGE_TYPE__RGB, NULL, 0, 0, 0, 0, 0, {0,NULL} } +#define MESSAGE_CONTAINER__INIT \ + { PROTOBUF_C_MESSAGE_INIT (&message_container__descriptor) \ + , 0, MESSAGE_TYPE__RGB, NULL, 0, 0, 0, 0, 0, {0,NULL} } -/* Tango__PMR__Common__MessageContainer methods */ -void tango__pmr__common__message_container__init - (Tango__PMR__Common__MessageContainer *message); -size_t tango__pmr__common__message_container__get_packed_size - (const Tango__PMR__Common__MessageContainer *message); -size_t tango__pmr__common__message_container__pack - (const Tango__PMR__Common__MessageContainer *message, +/* MessageContainer methods */ +void message_container__init + (MessageContainer *message); +size_t message_container__get_packed_size + (const MessageContainer *message); +size_t message_container__pack + (const MessageContainer *message, uint8_t *out); -size_t tango__pmr__common__message_container__pack_to_buffer - (const Tango__PMR__Common__MessageContainer *message, +size_t message_container__pack_to_buffer + (const MessageContainer *message, ProtobufCBuffer *buffer); -Tango__PMR__Common__MessageContainer * - tango__pmr__common__message_container__unpack +MessageContainer * + message_container__unpack (ProtobufCAllocator *allocator, size_t len, const uint8_t *data); -void tango__pmr__common__message_container__free_unpacked - (Tango__PMR__Common__MessageContainer *message, +void message_container__free_unpacked + (MessageContainer *message, ProtobufCAllocator *allocator); /* --- per-message closures --- */ -typedef void (*Tango__PMR__Common__MessageContainer_Closure) - (const Tango__PMR__Common__MessageContainer *message, +typedef void (*MessageContainer_Closure) + (const MessageContainer *message, void *closure_data); /* --- services --- */ @@ -72,7 +72,7 @@ typedef void (*Tango__PMR__Common__MessageContainer_Closure) /* --- descriptors --- */ -extern const ProtobufCMessageDescriptor tango__pmr__common__message_container__descriptor; +extern const ProtobufCMessageDescriptor message_container__descriptor; PROTOBUF_C__END_DECLS diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Common/MessageType.pb-c.c b/Software/Code_Composer/twine_usblib_demo/PMR/Common/MessageType.pb-c.c index f8d5e5ad2..faaef3d1f 100644 --- a/Software/Code_Composer/twine_usblib_demo/PMR/Common/MessageType.pb-c.c +++ b/Software/Code_Composer/twine_usblib_demo/PMR/Common/MessageType.pb-c.c @@ -7,20 +7,20 @@ #endif #include "MessageType.pb-c.h" -static const ProtobufCEnumValue tango__pmr__common__message_type__enum_values_by_number[7] = +static const ProtobufCEnumValue message_type__enum_values_by_number[7] = { - { "RGB", "TANGO__PMR__COMMON__MESSAGE_TYPE__RGB", 0 }, - { "Job", "TANGO__PMR__COMMON__MESSAGE_TYPE__Job", 1 }, - { "Segment", "TANGO__PMR__COMMON__MESSAGE_TYPE__Segment", 2 }, - { "CalculateRequest", "TANGO__PMR__COMMON__MESSAGE_TYPE__CalculateRequest", 3 }, - { "CalculateResponse", "TANGO__PMR__COMMON__MESSAGE_TYPE__CalculateResponse", 4 }, - { "ProgressRequest", "TANGO__PMR__COMMON__MESSAGE_TYPE__ProgressRequest", 5 }, - { "ProgressResponse", "TANGO__PMR__COMMON__MESSAGE_TYPE__ProgressResponse", 6 }, + { "RGB", "MESSAGE_TYPE__RGB", 0 }, + { "Job", "MESSAGE_TYPE__Job", 1 }, + { "Segment", "MESSAGE_TYPE__Segment", 2 }, + { "CalculateRequest", "MESSAGE_TYPE__CalculateRequest", 3 }, + { "CalculateResponse", "MESSAGE_TYPE__CalculateResponse", 4 }, + { "ProgressRequest", "MESSAGE_TYPE__ProgressRequest", 5 }, + { "ProgressResponse", "MESSAGE_TYPE__ProgressResponse", 6 }, }; -static const ProtobufCIntRange tango__pmr__common__message_type__value_ranges[] = { +static const ProtobufCIntRange message_type__value_ranges[] = { {0, 0},{0, 7} }; -static const ProtobufCEnumValueIndex tango__pmr__common__message_type__enum_values_by_name[7] = +static const ProtobufCEnumValueIndex message_type__enum_values_by_name[7] = { { "CalculateRequest", 3 }, { "CalculateResponse", 4 }, @@ -30,18 +30,18 @@ static const ProtobufCEnumValueIndex tango__pmr__common__message_type__enum_valu { "RGB", 0 }, { "Segment", 2 }, }; -const ProtobufCEnumDescriptor tango__pmr__common__message_type__descriptor = +const ProtobufCEnumDescriptor message_type__descriptor = { PROTOBUF_C__ENUM_DESCRIPTOR_MAGIC, - "Tango.PMR.Common.MessageType", "MessageType", - "Tango__PMR__Common__MessageType", - "Tango.PMR.Common", + "MessageType", + "MessageType", + "", 7, - tango__pmr__common__message_type__enum_values_by_number, + message_type__enum_values_by_number, 7, - tango__pmr__common__message_type__enum_values_by_name, + message_type__enum_values_by_name, 1, - tango__pmr__common__message_type__value_ranges, + message_type__value_ranges, NULL,NULL,NULL,NULL /* reserved[1234] */ }; diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Common/MessageType.pb-c.h b/Software/Code_Composer/twine_usblib_demo/PMR/Common/MessageType.pb-c.h index 9ceaacec7..952a677c6 100644 --- a/Software/Code_Composer/twine_usblib_demo/PMR/Common/MessageType.pb-c.h +++ b/Software/Code_Composer/twine_usblib_demo/PMR/Common/MessageType.pb-c.h @@ -19,16 +19,16 @@ PROTOBUF_C__BEGIN_DECLS /* --- enums --- */ -typedef enum _Tango__PMR__Common__MessageType { - TANGO__PMR__COMMON__MESSAGE_TYPE__RGB = 0, - TANGO__PMR__COMMON__MESSAGE_TYPE__Job = 1, - TANGO__PMR__COMMON__MESSAGE_TYPE__Segment = 2, - TANGO__PMR__COMMON__MESSAGE_TYPE__CalculateRequest = 3, - TANGO__PMR__COMMON__MESSAGE_TYPE__CalculateResponse = 4, - TANGO__PMR__COMMON__MESSAGE_TYPE__ProgressRequest = 5, - TANGO__PMR__COMMON__MESSAGE_TYPE__ProgressResponse = 6 - PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(TANGO__PMR__COMMON__MESSAGE_TYPE) -} Tango__PMR__Common__MessageType; +typedef enum _MessageType { + MESSAGE_TYPE__RGB = 0, + MESSAGE_TYPE__Job = 1, + MESSAGE_TYPE__Segment = 2, + MESSAGE_TYPE__CalculateRequest = 3, + MESSAGE_TYPE__CalculateResponse = 4, + MESSAGE_TYPE__ProgressRequest = 5, + MESSAGE_TYPE__ProgressResponse = 6 + PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(MESSAGE_TYPE) +} MessageType; /* --- messages --- */ @@ -40,7 +40,7 @@ typedef enum _Tango__PMR__Common__MessageType { /* --- descriptors --- */ -extern const ProtobufCEnumDescriptor tango__pmr__common__message_type__descriptor; +extern const ProtobufCEnumDescriptor message_type__descriptor; PROTOBUF_C__END_DECLS diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Common/RGB.pb-c.c b/Software/Code_Composer/twine_usblib_demo/PMR/Common/RGB.pb-c.c index 27e389ef6..df4a0e32f 100644 --- a/Software/Code_Composer/twine_usblib_demo/PMR/Common/RGB.pb-c.c +++ b/Software/Code_Composer/twine_usblib_demo/PMR/Common/RGB.pb-c.c @@ -7,60 +7,60 @@ #endif #include "RGB.pb-c.h" -void tango__pmr__common__rgb__init - (Tango__PMR__Common__RGB *message) +void rgb__init + (RGB *message) { - static const Tango__PMR__Common__RGB init_value = TANGO__PMR__COMMON__RGB__INIT; + static const RGB init_value = RGB__INIT; *message = init_value; } -size_t tango__pmr__common__rgb__get_packed_size - (const Tango__PMR__Common__RGB *message) +size_t rgb__get_packed_size + (const RGB *message) { - assert(message->base.descriptor == &tango__pmr__common__rgb__descriptor); + assert(message->base.descriptor == &rgb__descriptor); return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message)); } -size_t tango__pmr__common__rgb__pack - (const Tango__PMR__Common__RGB *message, +size_t rgb__pack + (const RGB *message, uint8_t *out) { - assert(message->base.descriptor == &tango__pmr__common__rgb__descriptor); + assert(message->base.descriptor == &rgb__descriptor); return protobuf_c_message_pack ((const ProtobufCMessage*)message, out); } -size_t tango__pmr__common__rgb__pack_to_buffer - (const Tango__PMR__Common__RGB *message, +size_t rgb__pack_to_buffer + (const RGB *message, ProtobufCBuffer *buffer) { - assert(message->base.descriptor == &tango__pmr__common__rgb__descriptor); + assert(message->base.descriptor == &rgb__descriptor); return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer); } -Tango__PMR__Common__RGB * - tango__pmr__common__rgb__unpack +RGB * + rgb__unpack (ProtobufCAllocator *allocator, size_t len, const uint8_t *data) { - return (Tango__PMR__Common__RGB *) - protobuf_c_message_unpack (&tango__pmr__common__rgb__descriptor, + return (RGB *) + protobuf_c_message_unpack (&rgb__descriptor, allocator, len, data); } -void tango__pmr__common__rgb__free_unpacked - (Tango__PMR__Common__RGB *message, +void rgb__free_unpacked + (RGB *message, ProtobufCAllocator *allocator) { if(!message) return; - assert(message->base.descriptor == &tango__pmr__common__rgb__descriptor); + assert(message->base.descriptor == &rgb__descriptor); protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); } -static const ProtobufCFieldDescriptor tango__pmr__common__rgb__field_descriptors[3] = +static const ProtobufCFieldDescriptor rgb__field_descriptors[3] = { { "R", 1, PROTOBUF_C_LABEL_OPTIONAL, PROTOBUF_C_TYPE_INT32, - offsetof(Tango__PMR__Common__RGB, has_r), - offsetof(Tango__PMR__Common__RGB, r), + offsetof(RGB, has_r), + offsetof(RGB, r), NULL, NULL, 0, /* flags */ @@ -71,8 +71,8 @@ static const ProtobufCFieldDescriptor tango__pmr__common__rgb__field_descriptors 2, PROTOBUF_C_LABEL_OPTIONAL, PROTOBUF_C_TYPE_INT32, - offsetof(Tango__PMR__Common__RGB, has_g), - offsetof(Tango__PMR__Common__RGB, g), + offsetof(RGB, has_g), + offsetof(RGB, g), NULL, NULL, 0, /* flags */ @@ -83,36 +83,36 @@ static const ProtobufCFieldDescriptor tango__pmr__common__rgb__field_descriptors 3, PROTOBUF_C_LABEL_OPTIONAL, PROTOBUF_C_TYPE_INT32, - offsetof(Tango__PMR__Common__RGB, has_b), - offsetof(Tango__PMR__Common__RGB, b), + offsetof(RGB, has_b), + offsetof(RGB, b), NULL, NULL, 0, /* flags */ 0,NULL,NULL /* reserved1,reserved2, etc */ }, }; -static const unsigned tango__pmr__common__rgb__field_indices_by_name[] = { +static const unsigned rgb__field_indices_by_name[] = { 2, /* field[2] = B */ 1, /* field[1] = G */ 0, /* field[0] = R */ }; -static const ProtobufCIntRange tango__pmr__common__rgb__number_ranges[1 + 1] = +static const ProtobufCIntRange rgb__number_ranges[1 + 1] = { { 1, 0 }, { 0, 3 } }; -const ProtobufCMessageDescriptor tango__pmr__common__rgb__descriptor = +const ProtobufCMessageDescriptor rgb__descriptor = { PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC, - "Tango.PMR.Common.RGB", "RGB", - "Tango__PMR__Common__RGB", - "Tango.PMR.Common", - sizeof(Tango__PMR__Common__RGB), + "RGB", + "RGB", + "", + sizeof(RGB), 3, - tango__pmr__common__rgb__field_descriptors, - tango__pmr__common__rgb__field_indices_by_name, - 1, tango__pmr__common__rgb__number_ranges, - (ProtobufCMessageInit) tango__pmr__common__rgb__init, + rgb__field_descriptors, + rgb__field_indices_by_name, + 1, rgb__number_ranges, + (ProtobufCMessageInit) rgb__init, NULL,NULL,NULL /* reserved[123] */ }; diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Common/RGB.pb-c.h b/Software/Code_Composer/twine_usblib_demo/PMR/Common/RGB.pb-c.h index 1a8655771..464d75297 100644 --- a/Software/Code_Composer/twine_usblib_demo/PMR/Common/RGB.pb-c.h +++ b/Software/Code_Composer/twine_usblib_demo/PMR/Common/RGB.pb-c.h @@ -15,7 +15,7 @@ PROTOBUF_C__BEGIN_DECLS #endif -typedef struct _Tango__PMR__Common__RGB Tango__PMR__Common__RGB; +typedef struct _RGB RGB; /* --- enums --- */ @@ -23,7 +23,7 @@ typedef struct _Tango__PMR__Common__RGB Tango__PMR__Common__RGB; /* --- messages --- */ -struct _Tango__PMR__Common__RGB +struct _RGB { ProtobufCMessage base; protobuf_c_boolean has_r; @@ -33,34 +33,34 @@ struct _Tango__PMR__Common__RGB protobuf_c_boolean has_b; int32_t b; }; -#define TANGO__PMR__COMMON__RGB__INIT \ - { PROTOBUF_C_MESSAGE_INIT (&tango__pmr__common__rgb__descriptor) \ +#define RGB__INIT \ + { PROTOBUF_C_MESSAGE_INIT (&rgb__descriptor) \ , 0, 0, 0, 0, 0, 0 } -/* Tango__PMR__Common__RGB methods */ -void tango__pmr__common__rgb__init - (Tango__PMR__Common__RGB *message); -size_t tango__pmr__common__rgb__get_packed_size - (const Tango__PMR__Common__RGB *message); -size_t tango__pmr__common__rgb__pack - (const Tango__PMR__Common__RGB *message, +/* RGB methods */ +void rgb__init + (RGB *message); +size_t rgb__get_packed_size + (const RGB *message); +size_t rgb__pack + (const RGB *message, uint8_t *out); -size_t tango__pmr__common__rgb__pack_to_buffer - (const Tango__PMR__Common__RGB *message, +size_t rgb__pack_to_buffer + (const RGB *message, ProtobufCBuffer *buffer); -Tango__PMR__Common__RGB * - tango__pmr__common__rgb__unpack +RGB * + rgb__unpack (ProtobufCAllocator *allocator, size_t len, const uint8_t *data); -void tango__pmr__common__rgb__free_unpacked - (Tango__PMR__Common__RGB *message, +void rgb__free_unpacked + (RGB *message, ProtobufCAllocator *allocator); /* --- per-message closures --- */ -typedef void (*Tango__PMR__Common__RGB_Closure) - (const Tango__PMR__Common__RGB *message, +typedef void (*RGB_Closure) + (const RGB *message, void *closure_data); /* --- services --- */ @@ -68,7 +68,7 @@ typedef void (*Tango__PMR__Common__RGB_Closure) /* --- descriptors --- */ -extern const ProtobufCMessageDescriptor tango__pmr__common__rgb__descriptor; +extern const ProtobufCMessageDescriptor rgb__descriptor; PROTOBUF_C__END_DECLS diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Jobs/Job.pb-c.c b/Software/Code_Composer/twine_usblib_demo/PMR/Jobs/Job.pb-c.c index f0cb22bac..0213521e5 100644 --- a/Software/Code_Composer/twine_usblib_demo/PMR/Jobs/Job.pb-c.c +++ b/Software/Code_Composer/twine_usblib_demo/PMR/Jobs/Job.pb-c.c @@ -7,52 +7,52 @@ #endif #include "Job.pb-c.h" -void tango__pmr__jobs__job__init - (Tango__PMR__Jobs__Job *message) +void job__init + (Job *message) { - static const Tango__PMR__Jobs__Job init_value = TANGO__PMR__JOBS__JOB__INIT; + static const Job init_value = JOB__INIT; *message = init_value; } -size_t tango__pmr__jobs__job__get_packed_size - (const Tango__PMR__Jobs__Job *message) +size_t job__get_packed_size + (const Job *message) { - assert(message->base.descriptor == &tango__pmr__jobs__job__descriptor); + assert(message->base.descriptor == &job__descriptor); return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message)); } -size_t tango__pmr__jobs__job__pack - (const Tango__PMR__Jobs__Job *message, +size_t job__pack + (const Job *message, uint8_t *out) { - assert(message->base.descriptor == &tango__pmr__jobs__job__descriptor); + assert(message->base.descriptor == &job__descriptor); return protobuf_c_message_pack ((const ProtobufCMessage*)message, out); } -size_t tango__pmr__jobs__job__pack_to_buffer - (const Tango__PMR__Jobs__Job *message, +size_t job__pack_to_buffer + (const Job *message, ProtobufCBuffer *buffer) { - assert(message->base.descriptor == &tango__pmr__jobs__job__descriptor); + assert(message->base.descriptor == &job__descriptor); return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer); } -Tango__PMR__Jobs__Job * - tango__pmr__jobs__job__unpack +Job * + job__unpack (ProtobufCAllocator *allocator, size_t len, const uint8_t *data) { - return (Tango__PMR__Jobs__Job *) - protobuf_c_message_unpack (&tango__pmr__jobs__job__descriptor, + return (Job *) + protobuf_c_message_unpack (&job__descriptor, allocator, len, data); } -void tango__pmr__jobs__job__free_unpacked - (Tango__PMR__Jobs__Job *message, +void job__free_unpacked + (Job *message, ProtobufCAllocator *allocator) { if(!message) return; - assert(message->base.descriptor == &tango__pmr__jobs__job__descriptor); + assert(message->base.descriptor == &job__descriptor); protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); } -static const ProtobufCFieldDescriptor tango__pmr__jobs__job__field_descriptors[2] = +static const ProtobufCFieldDescriptor job__field_descriptors[2] = { { "Name", @@ -60,7 +60,7 @@ static const ProtobufCFieldDescriptor tango__pmr__jobs__job__field_descriptors[2 PROTOBUF_C_LABEL_OPTIONAL, PROTOBUF_C_TYPE_STRING, 0, /* quantifier_offset */ - offsetof(Tango__PMR__Jobs__Job, name), + offsetof(Job, name), NULL, NULL, 0, /* flags */ @@ -71,35 +71,35 @@ static const ProtobufCFieldDescriptor tango__pmr__jobs__job__field_descriptors[2 2, PROTOBUF_C_LABEL_REPEATED, PROTOBUF_C_TYPE_MESSAGE, - offsetof(Tango__PMR__Jobs__Job, n_segments), - offsetof(Tango__PMR__Jobs__Job, segments), - &tango__pmr__jobs__segment__descriptor, + offsetof(Job, n_segments), + offsetof(Job, segments), + &segment__descriptor, NULL, 0, /* flags */ 0,NULL,NULL /* reserved1,reserved2, etc */ }, }; -static const unsigned tango__pmr__jobs__job__field_indices_by_name[] = { +static const unsigned job__field_indices_by_name[] = { 0, /* field[0] = Name */ 1, /* field[1] = Segments */ }; -static const ProtobufCIntRange tango__pmr__jobs__job__number_ranges[1 + 1] = +static const ProtobufCIntRange job__number_ranges[1 + 1] = { { 1, 0 }, { 0, 2 } }; -const ProtobufCMessageDescriptor tango__pmr__jobs__job__descriptor = +const ProtobufCMessageDescriptor job__descriptor = { PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC, - "Tango.PMR.Jobs.Job", "Job", - "Tango__PMR__Jobs__Job", - "Tango.PMR.Jobs", - sizeof(Tango__PMR__Jobs__Job), + "Job", + "Job", + "", + sizeof(Job), 2, - tango__pmr__jobs__job__field_descriptors, - tango__pmr__jobs__job__field_indices_by_name, - 1, tango__pmr__jobs__job__number_ranges, - (ProtobufCMessageInit) tango__pmr__jobs__job__init, + job__field_descriptors, + job__field_indices_by_name, + 1, job__number_ranges, + (ProtobufCMessageInit) job__init, NULL,NULL,NULL /* reserved[123] */ }; diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Jobs/Job.pb-c.h b/Software/Code_Composer/twine_usblib_demo/PMR/Jobs/Job.pb-c.h index 79e598e36..c94f78bbb 100644 --- a/Software/Code_Composer/twine_usblib_demo/PMR/Jobs/Job.pb-c.h +++ b/Software/Code_Composer/twine_usblib_demo/PMR/Jobs/Job.pb-c.h @@ -16,7 +16,7 @@ PROTOBUF_C__BEGIN_DECLS #include "Segment.pb-c.h" -typedef struct _Tango__PMR__Jobs__Job Tango__PMR__Jobs__Job; +typedef struct _Job Job; /* --- enums --- */ @@ -24,41 +24,41 @@ typedef struct _Tango__PMR__Jobs__Job Tango__PMR__Jobs__Job; /* --- messages --- */ -struct _Tango__PMR__Jobs__Job +struct _Job { ProtobufCMessage base; char *name; size_t n_segments; - Tango__PMR__Jobs__Segment **segments; + Segment **segments; }; -#define TANGO__PMR__JOBS__JOB__INIT \ - { PROTOBUF_C_MESSAGE_INIT (&tango__pmr__jobs__job__descriptor) \ +#define JOB__INIT \ + { PROTOBUF_C_MESSAGE_INIT (&job__descriptor) \ , NULL, 0,NULL } -/* Tango__PMR__Jobs__Job methods */ -void tango__pmr__jobs__job__init - (Tango__PMR__Jobs__Job *message); -size_t tango__pmr__jobs__job__get_packed_size - (const Tango__PMR__Jobs__Job *message); -size_t tango__pmr__jobs__job__pack - (const Tango__PMR__Jobs__Job *message, +/* Job methods */ +void job__init + (Job *message); +size_t job__get_packed_size + (const Job *message); +size_t job__pack + (const Job *message, uint8_t *out); -size_t tango__pmr__jobs__job__pack_to_buffer - (const Tango__PMR__Jobs__Job *message, +size_t job__pack_to_buffer + (const Job *message, ProtobufCBuffer *buffer); -Tango__PMR__Jobs__Job * - tango__pmr__jobs__job__unpack +Job * + job__unpack (ProtobufCAllocator *allocator, size_t len, const uint8_t *data); -void tango__pmr__jobs__job__free_unpacked - (Tango__PMR__Jobs__Job *message, +void job__free_unpacked + (Job *message, ProtobufCAllocator *allocator); /* --- per-message closures --- */ -typedef void (*Tango__PMR__Jobs__Job_Closure) - (const Tango__PMR__Jobs__Job *message, +typedef void (*Job_Closure) + (const Job *message, void *closure_data); /* --- services --- */ @@ -66,7 +66,7 @@ typedef void (*Tango__PMR__Jobs__Job_Closure) /* --- descriptors --- */ -extern const ProtobufCMessageDescriptor tango__pmr__jobs__job__descriptor; +extern const ProtobufCMessageDescriptor job__descriptor; PROTOBUF_C__END_DECLS diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Jobs/Segment.pb-c.c b/Software/Code_Composer/twine_usblib_demo/PMR/Jobs/Segment.pb-c.c index adedc8378..764b6721b 100644 --- a/Software/Code_Composer/twine_usblib_demo/PMR/Jobs/Segment.pb-c.c +++ b/Software/Code_Composer/twine_usblib_demo/PMR/Jobs/Segment.pb-c.c @@ -7,52 +7,52 @@ #endif #include "Segment.pb-c.h" -void tango__pmr__jobs__segment__init - (Tango__PMR__Jobs__Segment *message) +void segment__init + (Segment *message) { - static const Tango__PMR__Jobs__Segment init_value = TANGO__PMR__JOBS__SEGMENT__INIT; + static const Segment init_value = SEGMENT__INIT; *message = init_value; } -size_t tango__pmr__jobs__segment__get_packed_size - (const Tango__PMR__Jobs__Segment *message) +size_t segment__get_packed_size + (const Segment *message) { - assert(message->base.descriptor == &tango__pmr__jobs__segment__descriptor); + assert(message->base.descriptor == &segment__descriptor); return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message)); } -size_t tango__pmr__jobs__segment__pack - (const Tango__PMR__Jobs__Segment *message, +size_t segment__pack + (const Segment *message, uint8_t *out) { - assert(message->base.descriptor == &tango__pmr__jobs__segment__descriptor); + assert(message->base.descriptor == &segment__descriptor); return protobuf_c_message_pack ((const ProtobufCMessage*)message, out); } -size_t tango__pmr__jobs__segment__pack_to_buffer - (const Tango__PMR__Jobs__Segment *message, +size_t segment__pack_to_buffer + (const Segment *message, ProtobufCBuffer *buffer) { - assert(message->base.descriptor == &tango__pmr__jobs__segment__descriptor); + assert(message->base.descriptor == &segment__descriptor); return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer); } -Tango__PMR__Jobs__Segment * - tango__pmr__jobs__segment__unpack +Segment * + segment__unpack (ProtobufCAllocator *allocator, size_t len, const uint8_t *data) { - return (Tango__PMR__Jobs__Segment *) - protobuf_c_message_unpack (&tango__pmr__jobs__segment__descriptor, + return (Segment *) + protobuf_c_message_unpack (&segment__descriptor, allocator, len, data); } -void tango__pmr__jobs__segment__free_unpacked - (Tango__PMR__Jobs__Segment *message, +void segment__free_unpacked + (Segment *message, ProtobufCAllocator *allocator) { if(!message) return; - assert(message->base.descriptor == &tango__pmr__jobs__segment__descriptor); + assert(message->base.descriptor == &segment__descriptor); protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); } -static const ProtobufCFieldDescriptor tango__pmr__jobs__segment__field_descriptors[3] = +static const ProtobufCFieldDescriptor segment__field_descriptors[3] = { { "Name", @@ -60,7 +60,7 @@ static const ProtobufCFieldDescriptor tango__pmr__jobs__segment__field_descripto PROTOBUF_C_LABEL_OPTIONAL, PROTOBUF_C_TYPE_STRING, 0, /* quantifier_offset */ - offsetof(Tango__PMR__Jobs__Segment, name), + offsetof(Segment, name), NULL, NULL, 0, /* flags */ @@ -71,8 +71,8 @@ static const ProtobufCFieldDescriptor tango__pmr__jobs__segment__field_descripto 2, PROTOBUF_C_LABEL_OPTIONAL, PROTOBUF_C_TYPE_INT32, - offsetof(Tango__PMR__Jobs__Segment, has_length), - offsetof(Tango__PMR__Jobs__Segment, length), + offsetof(Segment, has_length), + offsetof(Segment, length), NULL, NULL, 0, /* flags */ @@ -84,35 +84,35 @@ static const ProtobufCFieldDescriptor tango__pmr__jobs__segment__field_descripto PROTOBUF_C_LABEL_OPTIONAL, PROTOBUF_C_TYPE_MESSAGE, 0, /* quantifier_offset */ - offsetof(Tango__PMR__Jobs__Segment, color), - &tango__pmr__common__rgb__descriptor, + offsetof(Segment, color), + &rgb__descriptor, NULL, 0, /* flags */ 0,NULL,NULL /* reserved1,reserved2, etc */ }, }; -static const unsigned tango__pmr__jobs__segment__field_indices_by_name[] = { +static const unsigned segment__field_indices_by_name[] = { 2, /* field[2] = Color */ 1, /* field[1] = Length */ 0, /* field[0] = Name */ }; -static const ProtobufCIntRange tango__pmr__jobs__segment__number_ranges[1 + 1] = +static const ProtobufCIntRange segment__number_ranges[1 + 1] = { { 1, 0 }, { 0, 3 } }; -const ProtobufCMessageDescriptor tango__pmr__jobs__segment__descriptor = +const ProtobufCMessageDescriptor segment__descriptor = { PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC, - "Tango.PMR.Jobs.Segment", "Segment", - "Tango__PMR__Jobs__Segment", - "Tango.PMR.Jobs", - sizeof(Tango__PMR__Jobs__Segment), + "Segment", + "Segment", + "", + sizeof(Segment), 3, - tango__pmr__jobs__segment__field_descriptors, - tango__pmr__jobs__segment__field_indices_by_name, - 1, tango__pmr__jobs__segment__number_ranges, - (ProtobufCMessageInit) tango__pmr__jobs__segment__init, + segment__field_descriptors, + segment__field_indices_by_name, + 1, segment__number_ranges, + (ProtobufCMessageInit) segment__init, NULL,NULL,NULL /* reserved[123] */ }; diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Jobs/Segment.pb-c.h b/Software/Code_Composer/twine_usblib_demo/PMR/Jobs/Segment.pb-c.h index 16fd48659..5991f3228 100644 --- a/Software/Code_Composer/twine_usblib_demo/PMR/Jobs/Segment.pb-c.h +++ b/Software/Code_Composer/twine_usblib_demo/PMR/Jobs/Segment.pb-c.h @@ -16,7 +16,7 @@ PROTOBUF_C__BEGIN_DECLS #include "RGB.pb-c.h" -typedef struct _Tango__PMR__Jobs__Segment Tango__PMR__Jobs__Segment; +typedef struct _Segment Segment; /* --- enums --- */ @@ -24,42 +24,42 @@ typedef struct _Tango__PMR__Jobs__Segment Tango__PMR__Jobs__Segment; /* --- messages --- */ -struct _Tango__PMR__Jobs__Segment +struct _Segment { ProtobufCMessage base; char *name; protobuf_c_boolean has_length; int32_t length; - Tango__PMR__Common__RGB *color; + RGB *color; }; -#define TANGO__PMR__JOBS__SEGMENT__INIT \ - { PROTOBUF_C_MESSAGE_INIT (&tango__pmr__jobs__segment__descriptor) \ +#define SEGMENT__INIT \ + { PROTOBUF_C_MESSAGE_INIT (&segment__descriptor) \ , NULL, 0, 0, NULL } -/* Tango__PMR__Jobs__Segment methods */ -void tango__pmr__jobs__segment__init - (Tango__PMR__Jobs__Segment *message); -size_t tango__pmr__jobs__segment__get_packed_size - (const Tango__PMR__Jobs__Segment *message); -size_t tango__pmr__jobs__segment__pack - (const Tango__PMR__Jobs__Segment *message, +/* Segment methods */ +void segment__init + (Segment *message); +size_t segment__get_packed_size + (const Segment *message); +size_t segment__pack + (const Segment *message, uint8_t *out); -size_t tango__pmr__jobs__segment__pack_to_buffer - (const Tango__PMR__Jobs__Segment *message, +size_t segment__pack_to_buffer + (const Segment *message, ProtobufCBuffer *buffer); -Tango__PMR__Jobs__Segment * - tango__pmr__jobs__segment__unpack +Segment * + segment__unpack (ProtobufCAllocator *allocator, size_t len, const uint8_t *data); -void tango__pmr__jobs__segment__free_unpacked - (Tango__PMR__Jobs__Segment *message, +void segment__free_unpacked + (Segment *message, ProtobufCAllocator *allocator); /* --- per-message closures --- */ -typedef void (*Tango__PMR__Jobs__Segment_Closure) - (const Tango__PMR__Jobs__Segment *message, +typedef void (*Segment_Closure) + (const Segment *message, void *closure_data); /* --- services --- */ @@ -67,7 +67,7 @@ typedef void (*Tango__PMR__Jobs__Segment_Closure) /* --- descriptors --- */ -extern const ProtobufCMessageDescriptor tango__pmr__jobs__segment__descriptor; +extern const ProtobufCMessageDescriptor segment__descriptor; PROTOBUF_C__END_DECLS diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/CalculateRequest.pb-c.c b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/CalculateRequest.pb-c.c index c091ded25..68134c1f8 100644 --- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/CalculateRequest.pb-c.c +++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/CalculateRequest.pb-c.c @@ -7,60 +7,60 @@ #endif #include "CalculateRequest.pb-c.h" -void tango__pmr__stubs__calculate_request__init - (Tango__PMR__Stubs__CalculateRequest *message) +void calculate_request__init + (CalculateRequest *message) { - static const Tango__PMR__Stubs__CalculateRequest init_value = TANGO__PMR__STUBS__CALCULATE_REQUEST__INIT; + static const CalculateRequest init_value = CALCULATE_REQUEST__INIT; *message = init_value; } -size_t tango__pmr__stubs__calculate_request__get_packed_size - (const Tango__PMR__Stubs__CalculateRequest *message) +size_t calculate_request__get_packed_size + (const CalculateRequest *message) { - assert(message->base.descriptor == &tango__pmr__stubs__calculate_request__descriptor); + assert(message->base.descriptor == &calculate_request__descriptor); return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message)); } -size_t tango__pmr__stubs__calculate_request__pack - (const Tango__PMR__Stubs__CalculateRequest *message, +size_t calculate_request__pack + (const CalculateRequest *message, uint8_t *out) { - assert(message->base.descriptor == &tango__pmr__stubs__calculate_request__descriptor); + assert(message->base.descriptor == &calculate_request__descriptor); return protobuf_c_message_pack ((const ProtobufCMessage*)message, out); } -size_t tango__pmr__stubs__calculate_request__pack_to_buffer - (const Tango__PMR__Stubs__CalculateRequest *message, +size_t calculate_request__pack_to_buffer + (const CalculateRequest *message, ProtobufCBuffer *buffer) { - assert(message->base.descriptor == &tango__pmr__stubs__calculate_request__descriptor); + assert(message->base.descriptor == &calculate_request__descriptor); return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer); } -Tango__PMR__Stubs__CalculateRequest * - tango__pmr__stubs__calculate_request__unpack +CalculateRequest * + calculate_request__unpack (ProtobufCAllocator *allocator, size_t len, const uint8_t *data) { - return (Tango__PMR__Stubs__CalculateRequest *) - protobuf_c_message_unpack (&tango__pmr__stubs__calculate_request__descriptor, + return (CalculateRequest *) + protobuf_c_message_unpack (&calculate_request__descriptor, allocator, len, data); } -void tango__pmr__stubs__calculate_request__free_unpacked - (Tango__PMR__Stubs__CalculateRequest *message, +void calculate_request__free_unpacked + (CalculateRequest *message, ProtobufCAllocator *allocator) { if(!message) return; - assert(message->base.descriptor == &tango__pmr__stubs__calculate_request__descriptor); + assert(message->base.descriptor == &calculate_request__descriptor); protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); } -static const ProtobufCFieldDescriptor tango__pmr__stubs__calculate_request__field_descriptors[2] = +static const ProtobufCFieldDescriptor calculate_request__field_descriptors[2] = { { "A", 1, PROTOBUF_C_LABEL_OPTIONAL, PROTOBUF_C_TYPE_DOUBLE, - offsetof(Tango__PMR__Stubs__CalculateRequest, has_a), - offsetof(Tango__PMR__Stubs__CalculateRequest, a), + offsetof(CalculateRequest, has_a), + offsetof(CalculateRequest, a), NULL, NULL, 0, /* flags */ @@ -71,35 +71,35 @@ static const ProtobufCFieldDescriptor tango__pmr__stubs__calculate_request__fiel 2, PROTOBUF_C_LABEL_OPTIONAL, PROTOBUF_C_TYPE_DOUBLE, - offsetof(Tango__PMR__Stubs__CalculateRequest, has_b), - offsetof(Tango__PMR__Stubs__CalculateRequest, b), + offsetof(CalculateRequest, has_b), + offsetof(CalculateRequest, b), NULL, NULL, 0, /* flags */ 0,NULL,NULL /* reserved1,reserved2, etc */ }, }; -static const unsigned tango__pmr__stubs__calculate_request__field_indices_by_name[] = { +static const unsigned calculate_request__field_indices_by_name[] = { 0, /* field[0] = A */ 1, /* field[1] = B */ }; -static const ProtobufCIntRange tango__pmr__stubs__calculate_request__number_ranges[1 + 1] = +static const ProtobufCIntRange calculate_request__number_ranges[1 + 1] = { { 1, 0 }, { 0, 2 } }; -const ProtobufCMessageDescriptor tango__pmr__stubs__calculate_request__descriptor = +const ProtobufCMessageDescriptor calculate_request__descriptor = { PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC, - "Tango.PMR.Stubs.CalculateRequest", "CalculateRequest", - "Tango__PMR__Stubs__CalculateRequest", - "Tango.PMR.Stubs", - sizeof(Tango__PMR__Stubs__CalculateRequest), + "CalculateRequest", + "CalculateRequest", + "", + sizeof(CalculateRequest), 2, - tango__pmr__stubs__calculate_request__field_descriptors, - tango__pmr__stubs__calculate_request__field_indices_by_name, - 1, tango__pmr__stubs__calculate_request__number_ranges, - (ProtobufCMessageInit) tango__pmr__stubs__calculate_request__init, + calculate_request__field_descriptors, + calculate_request__field_indices_by_name, + 1, calculate_request__number_ranges, + (ProtobufCMessageInit) calculate_request__init, NULL,NULL,NULL /* reserved[123] */ }; diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/CalculateRequest.pb-c.h b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/CalculateRequest.pb-c.h index 1ea0683a3..4ad015493 100644 --- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/CalculateRequest.pb-c.h +++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/CalculateRequest.pb-c.h @@ -15,7 +15,7 @@ PROTOBUF_C__BEGIN_DECLS #endif -typedef struct _Tango__PMR__Stubs__CalculateRequest Tango__PMR__Stubs__CalculateRequest; +typedef struct _CalculateRequest CalculateRequest; /* --- enums --- */ @@ -23,7 +23,7 @@ typedef struct _Tango__PMR__Stubs__CalculateRequest Tango__PMR__Stubs__Calculate /* --- messages --- */ -struct _Tango__PMR__Stubs__CalculateRequest +struct _CalculateRequest { ProtobufCMessage base; protobuf_c_boolean has_a; @@ -31,34 +31,34 @@ struct _Tango__PMR__Stubs__CalculateRequest protobuf_c_boolean has_b; double b; }; -#define TANGO__PMR__STUBS__CALCULATE_REQUEST__INIT \ - { PROTOBUF_C_MESSAGE_INIT (&tango__pmr__stubs__calculate_request__descriptor) \ +#define CALCULATE_REQUEST__INIT \ + { PROTOBUF_C_MESSAGE_INIT (&calculate_request__descriptor) \ , 0, 0, 0, 0 } -/* Tango__PMR__Stubs__CalculateRequest methods */ -void tango__pmr__stubs__calculate_request__init - (Tango__PMR__Stubs__CalculateRequest *message); -size_t tango__pmr__stubs__calculate_request__get_packed_size - (const Tango__PMR__Stubs__CalculateRequest *message); -size_t tango__pmr__stubs__calculate_request__pack - (const Tango__PMR__Stubs__CalculateRequest *message, +/* CalculateRequest methods */ +void calculate_request__init + (CalculateRequest *message); +size_t calculate_request__get_packed_size + (const CalculateRequest *message); +size_t calculate_request__pack + (const CalculateRequest *message, uint8_t *out); -size_t tango__pmr__stubs__calculate_request__pack_to_buffer - (const Tango__PMR__Stubs__CalculateRequest *message, +size_t calculate_request__pack_to_buffer + (const CalculateRequest *message, ProtobufCBuffer *buffer); -Tango__PMR__Stubs__CalculateRequest * - tango__pmr__stubs__calculate_request__unpack +CalculateRequest * + calculate_request__unpack (ProtobufCAllocator *allocator, size_t len, const uint8_t *data); -void tango__pmr__stubs__calculate_request__free_unpacked - (Tango__PMR__Stubs__CalculateRequest *message, +void calculate_request__free_unpacked + (CalculateRequest *message, ProtobufCAllocator *allocator); /* --- per-message closures --- */ -typedef void (*Tango__PMR__Stubs__CalculateRequest_Closure) - (const Tango__PMR__Stubs__CalculateRequest *message, +typedef void (*CalculateRequest_Closure) + (const CalculateRequest *message, void *closure_data); /* --- services --- */ @@ -66,7 +66,7 @@ typedef void (*Tango__PMR__Stubs__CalculateRequest_Closure) /* --- descriptors --- */ -extern const ProtobufCMessageDescriptor tango__pmr__stubs__calculate_request__descriptor; +extern const ProtobufCMessageDescriptor calculate_request__descriptor; PROTOBUF_C__END_DECLS diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/CalculateResponse.pb-c.c b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/CalculateResponse.pb-c.c index feb52455a..920356a05 100644 --- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/CalculateResponse.pb-c.c +++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/CalculateResponse.pb-c.c @@ -7,86 +7,86 @@ #endif #include "CalculateResponse.pb-c.h" -void tango__pmr__stubs__calculate_response__init - (Tango__PMR__Stubs__CalculateResponse *message) +void calculate_response__init + (CalculateResponse *message) { - static const Tango__PMR__Stubs__CalculateResponse init_value = TANGO__PMR__STUBS__CALCULATE_RESPONSE__INIT; + static const CalculateResponse init_value = CALCULATE_RESPONSE__INIT; *message = init_value; } -size_t tango__pmr__stubs__calculate_response__get_packed_size - (const Tango__PMR__Stubs__CalculateResponse *message) +size_t calculate_response__get_packed_size + (const CalculateResponse *message) { - assert(message->base.descriptor == &tango__pmr__stubs__calculate_response__descriptor); + assert(message->base.descriptor == &calculate_response__descriptor); return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message)); } -size_t tango__pmr__stubs__calculate_response__pack - (const Tango__PMR__Stubs__CalculateResponse *message, +size_t calculate_response__pack + (const CalculateResponse *message, uint8_t *out) { - assert(message->base.descriptor == &tango__pmr__stubs__calculate_response__descriptor); + assert(message->base.descriptor == &calculate_response__descriptor); return protobuf_c_message_pack ((const ProtobufCMessage*)message, out); } -size_t tango__pmr__stubs__calculate_response__pack_to_buffer - (const Tango__PMR__Stubs__CalculateResponse *message, +size_t calculate_response__pack_to_buffer + (const CalculateResponse *message, ProtobufCBuffer *buffer) { - assert(message->base.descriptor == &tango__pmr__stubs__calculate_response__descriptor); + assert(message->base.descriptor == &calculate_response__descriptor); return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer); } -Tango__PMR__Stubs__CalculateResponse * - tango__pmr__stubs__calculate_response__unpack +CalculateResponse * + calculate_response__unpack (ProtobufCAllocator *allocator, size_t len, const uint8_t *data) { - return (Tango__PMR__Stubs__CalculateResponse *) - protobuf_c_message_unpack (&tango__pmr__stubs__calculate_response__descriptor, + return (CalculateResponse *) + protobuf_c_message_unpack (&calculate_response__descriptor, allocator, len, data); } -void tango__pmr__stubs__calculate_response__free_unpacked - (Tango__PMR__Stubs__CalculateResponse *message, +void calculate_response__free_unpacked + (CalculateResponse *message, ProtobufCAllocator *allocator) { if(!message) return; - assert(message->base.descriptor == &tango__pmr__stubs__calculate_response__descriptor); + assert(message->base.descriptor == &calculate_response__descriptor); protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); } -static const ProtobufCFieldDescriptor tango__pmr__stubs__calculate_response__field_descriptors[1] = +static const ProtobufCFieldDescriptor calculate_response__field_descriptors[1] = { { "Sum", 1, PROTOBUF_C_LABEL_OPTIONAL, PROTOBUF_C_TYPE_DOUBLE, - offsetof(Tango__PMR__Stubs__CalculateResponse, has_sum), - offsetof(Tango__PMR__Stubs__CalculateResponse, sum), + offsetof(CalculateResponse, has_sum), + offsetof(CalculateResponse, sum), NULL, NULL, 0, /* flags */ 0,NULL,NULL /* reserved1,reserved2, etc */ }, }; -static const unsigned tango__pmr__stubs__calculate_response__field_indices_by_name[] = { +static const unsigned calculate_response__field_indices_by_name[] = { 0, /* field[0] = Sum */ }; -static const ProtobufCIntRange tango__pmr__stubs__calculate_response__number_ranges[1 + 1] = +static const ProtobufCIntRange calculate_response__number_ranges[1 + 1] = { { 1, 0 }, { 0, 1 } }; -const ProtobufCMessageDescriptor tango__pmr__stubs__calculate_response__descriptor = +const ProtobufCMessageDescriptor calculate_response__descriptor = { PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC, - "Tango.PMR.Stubs.CalculateResponse", "CalculateResponse", - "Tango__PMR__Stubs__CalculateResponse", - "Tango.PMR.Stubs", - sizeof(Tango__PMR__Stubs__CalculateResponse), + "CalculateResponse", + "CalculateResponse", + "", + sizeof(CalculateResponse), 1, - tango__pmr__stubs__calculate_response__field_descriptors, - tango__pmr__stubs__calculate_response__field_indices_by_name, - 1, tango__pmr__stubs__calculate_response__number_ranges, - (ProtobufCMessageInit) tango__pmr__stubs__calculate_response__init, + calculate_response__field_descriptors, + calculate_response__field_indices_by_name, + 1, calculate_response__number_ranges, + (ProtobufCMessageInit) calculate_response__init, NULL,NULL,NULL /* reserved[123] */ }; diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/CalculateResponse.pb-c.h b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/CalculateResponse.pb-c.h index bad222d0b..05bdf2b52 100644 --- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/CalculateResponse.pb-c.h +++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/CalculateResponse.pb-c.h @@ -15,7 +15,7 @@ PROTOBUF_C__BEGIN_DECLS #endif -typedef struct _Tango__PMR__Stubs__CalculateResponse Tango__PMR__Stubs__CalculateResponse; +typedef struct _CalculateResponse CalculateResponse; /* --- enums --- */ @@ -23,40 +23,40 @@ typedef struct _Tango__PMR__Stubs__CalculateResponse Tango__PMR__Stubs__Calculat /* --- messages --- */ -struct _Tango__PMR__Stubs__CalculateResponse +struct _CalculateResponse { ProtobufCMessage base; protobuf_c_boolean has_sum; double sum; }; -#define TANGO__PMR__STUBS__CALCULATE_RESPONSE__INIT \ - { PROTOBUF_C_MESSAGE_INIT (&tango__pmr__stubs__calculate_response__descriptor) \ +#define CALCULATE_RESPONSE__INIT \ + { PROTOBUF_C_MESSAGE_INIT (&calculate_response__descriptor) \ , 0, 0 } -/* Tango__PMR__Stubs__CalculateResponse methods */ -void tango__pmr__stubs__calculate_response__init - (Tango__PMR__Stubs__CalculateResponse *message); -size_t tango__pmr__stubs__calculate_response__get_packed_size - (const Tango__PMR__Stubs__CalculateResponse *message); -size_t tango__pmr__stubs__calculate_response__pack - (const Tango__PMR__Stubs__CalculateResponse *message, +/* CalculateResponse methods */ +void calculate_response__init + (CalculateResponse *message); +size_t calculate_response__get_packed_size + (const CalculateResponse *message); +size_t calculate_response__pack + (const CalculateResponse *message, uint8_t *out); -size_t tango__pmr__stubs__calculate_response__pack_to_buffer - (const Tango__PMR__Stubs__CalculateResponse *message, +size_t calculate_response__pack_to_buffer + (const CalculateResponse *message, ProtobufCBuffer *buffer); -Tango__PMR__Stubs__CalculateResponse * - tango__pmr__stubs__calculate_response__unpack +CalculateResponse * + calculate_response__unpack (ProtobufCAllocator *allocator, size_t len, const uint8_t *data); -void tango__pmr__stubs__calculate_response__free_unpacked - (Tango__PMR__Stubs__CalculateResponse *message, +void calculate_response__free_unpacked + (CalculateResponse *message, ProtobufCAllocator *allocator); /* --- per-message closures --- */ -typedef void (*Tango__PMR__Stubs__CalculateResponse_Closure) - (const Tango__PMR__Stubs__CalculateResponse *message, +typedef void (*CalculateResponse_Closure) + (const CalculateResponse *message, void *closure_data); /* --- services --- */ @@ -64,7 +64,7 @@ typedef void (*Tango__PMR__Stubs__CalculateResponse_Closure) /* --- descriptors --- */ -extern const ProtobufCMessageDescriptor tango__pmr__stubs__calculate_response__descriptor; +extern const ProtobufCMessageDescriptor calculate_response__descriptor; PROTOBUF_C__END_DECLS diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/ProgressRequest.pb-c.c b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/ProgressRequest.pb-c.c index 878a63cfc..1eddd4d17 100644 --- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/ProgressRequest.pb-c.c +++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/ProgressRequest.pb-c.c @@ -7,66 +7,66 @@ #endif #include "ProgressRequest.pb-c.h" -void tango__pmr__stubs__progress_request__init - (Tango__PMR__Stubs__ProgressRequest *message) +void progress_request__init + (ProgressRequest *message) { - static const Tango__PMR__Stubs__ProgressRequest init_value = TANGO__PMR__STUBS__PROGRESS_REQUEST__INIT; + static const ProgressRequest init_value = PROGRESS_REQUEST__INIT; *message = init_value; } -size_t tango__pmr__stubs__progress_request__get_packed_size - (const Tango__PMR__Stubs__ProgressRequest *message) +size_t progress_request__get_packed_size + (const ProgressRequest *message) { - assert(message->base.descriptor == &tango__pmr__stubs__progress_request__descriptor); + assert(message->base.descriptor == &progress_request__descriptor); return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message)); } -size_t tango__pmr__stubs__progress_request__pack - (const Tango__PMR__Stubs__ProgressRequest *message, +size_t progress_request__pack + (const ProgressRequest *message, uint8_t *out) { - assert(message->base.descriptor == &tango__pmr__stubs__progress_request__descriptor); + assert(message->base.descriptor == &progress_request__descriptor); return protobuf_c_message_pack ((const ProtobufCMessage*)message, out); } -size_t tango__pmr__stubs__progress_request__pack_to_buffer - (const Tango__PMR__Stubs__ProgressRequest *message, +size_t progress_request__pack_to_buffer + (const ProgressRequest *message, ProtobufCBuffer *buffer) { - assert(message->base.descriptor == &tango__pmr__stubs__progress_request__descriptor); + assert(message->base.descriptor == &progress_request__descriptor); return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer); } -Tango__PMR__Stubs__ProgressRequest * - tango__pmr__stubs__progress_request__unpack +ProgressRequest * + progress_request__unpack (ProtobufCAllocator *allocator, size_t len, const uint8_t *data) { - return (Tango__PMR__Stubs__ProgressRequest *) - protobuf_c_message_unpack (&tango__pmr__stubs__progress_request__descriptor, + return (ProgressRequest *) + protobuf_c_message_unpack (&progress_request__descriptor, allocator, len, data); } -void tango__pmr__stubs__progress_request__free_unpacked - (Tango__PMR__Stubs__ProgressRequest *message, +void progress_request__free_unpacked + (ProgressRequest *message, ProtobufCAllocator *allocator) { if(!message) return; - assert(message->base.descriptor == &tango__pmr__stubs__progress_request__descriptor); + assert(message->base.descriptor == &progress_request__descriptor); protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); } -#define tango__pmr__stubs__progress_request__field_descriptors NULL -#define tango__pmr__stubs__progress_request__field_indices_by_name NULL -#define tango__pmr__stubs__progress_request__number_ranges NULL -const ProtobufCMessageDescriptor tango__pmr__stubs__progress_request__descriptor = +#define progress_request__field_descriptors NULL +#define progress_request__field_indices_by_name NULL +#define progress_request__number_ranges NULL +const ProtobufCMessageDescriptor progress_request__descriptor = { PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC, - "Tango.PMR.Stubs.ProgressRequest", "ProgressRequest", - "Tango__PMR__Stubs__ProgressRequest", - "Tango.PMR.Stubs", - sizeof(Tango__PMR__Stubs__ProgressRequest), + "ProgressRequest", + "ProgressRequest", + "", + sizeof(ProgressRequest), 0, - tango__pmr__stubs__progress_request__field_descriptors, - tango__pmr__stubs__progress_request__field_indices_by_name, - 0, tango__pmr__stubs__progress_request__number_ranges, - (ProtobufCMessageInit) tango__pmr__stubs__progress_request__init, + progress_request__field_descriptors, + progress_request__field_indices_by_name, + 0, progress_request__number_ranges, + (ProtobufCMessageInit) progress_request__init, NULL,NULL,NULL /* reserved[123] */ }; diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/ProgressRequest.pb-c.h b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/ProgressRequest.pb-c.h index 5776c0846..0b6b641ad 100644 --- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/ProgressRequest.pb-c.h +++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/ProgressRequest.pb-c.h @@ -15,7 +15,7 @@ PROTOBUF_C__BEGIN_DECLS #endif -typedef struct _Tango__PMR__Stubs__ProgressRequest Tango__PMR__Stubs__ProgressRequest; +typedef struct _ProgressRequest ProgressRequest; /* --- enums --- */ @@ -23,38 +23,38 @@ typedef struct _Tango__PMR__Stubs__ProgressRequest Tango__PMR__Stubs__ProgressRe /* --- messages --- */ -struct _Tango__PMR__Stubs__ProgressRequest +struct _ProgressRequest { ProtobufCMessage base; }; -#define TANGO__PMR__STUBS__PROGRESS_REQUEST__INIT \ - { PROTOBUF_C_MESSAGE_INIT (&tango__pmr__stubs__progress_request__descriptor) \ +#define PROGRESS_REQUEST__INIT \ + { PROTOBUF_C_MESSAGE_INIT (&progress_request__descriptor) \ } -/* Tango__PMR__Stubs__ProgressRequest methods */ -void tango__pmr__stubs__progress_request__init - (Tango__PMR__Stubs__ProgressRequest *message); -size_t tango__pmr__stubs__progress_request__get_packed_size - (const Tango__PMR__Stubs__ProgressRequest *message); -size_t tango__pmr__stubs__progress_request__pack - (const Tango__PMR__Stubs__ProgressRequest *message, +/* ProgressRequest methods */ +void progress_request__init + (ProgressRequest *message); +size_t progress_request__get_packed_size + (const ProgressRequest *message); +size_t progress_request__pack + (const ProgressRequest *message, uint8_t *out); -size_t tango__pmr__stubs__progress_request__pack_to_buffer - (const Tango__PMR__Stubs__ProgressRequest *message, +size_t progress_request__pack_to_buffer + (const ProgressRequest *message, ProtobufCBuffer *buffer); -Tango__PMR__Stubs__ProgressRequest * - tango__pmr__stubs__progress_request__unpack +ProgressRequest * + progress_request__unpack (ProtobufCAllocator *allocator, size_t len, const uint8_t *data); -void tango__pmr__stubs__progress_request__free_unpacked - (Tango__PMR__Stubs__ProgressRequest *message, +void progress_request__free_unpacked + (ProgressRequest *message, ProtobufCAllocator *allocator); /* --- per-message closures --- */ -typedef void (*Tango__PMR__Stubs__ProgressRequest_Closure) - (const Tango__PMR__Stubs__ProgressRequest *message, +typedef void (*ProgressRequest_Closure) + (const ProgressRequest *message, void *closure_data); /* --- services --- */ @@ -62,7 +62,7 @@ typedef void (*Tango__PMR__Stubs__ProgressRequest_Closure) /* --- descriptors --- */ -extern const ProtobufCMessageDescriptor tango__pmr__stubs__progress_request__descriptor; +extern const ProtobufCMessageDescriptor progress_request__descriptor; PROTOBUF_C__END_DECLS diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/ProgressResponse.pb-c.c b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/ProgressResponse.pb-c.c index 909e38ca4..9e54fb5d6 100644 --- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/ProgressResponse.pb-c.c +++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/ProgressResponse.pb-c.c @@ -7,86 +7,86 @@ #endif #include "ProgressResponse.pb-c.h" -void tango__pmr__stubs__progress_response__init - (Tango__PMR__Stubs__ProgressResponse *message) +void progress_response__init + (ProgressResponse *message) { - static const Tango__PMR__Stubs__ProgressResponse init_value = TANGO__PMR__STUBS__PROGRESS_RESPONSE__INIT; + static const ProgressResponse init_value = PROGRESS_RESPONSE__INIT; *message = init_value; } -size_t tango__pmr__stubs__progress_response__get_packed_size - (const Tango__PMR__Stubs__ProgressResponse *message) +size_t progress_response__get_packed_size + (const ProgressResponse *message) { - assert(message->base.descriptor == &tango__pmr__stubs__progress_response__descriptor); + assert(message->base.descriptor == &progress_response__descriptor); return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message)); } -size_t tango__pmr__stubs__progress_response__pack - (const Tango__PMR__Stubs__ProgressResponse *message, +size_t progress_response__pack + (const ProgressResponse *message, uint8_t *out) { - assert(message->base.descriptor == &tango__pmr__stubs__progress_response__descriptor); + assert(message->base.descriptor == &progress_response__descriptor); return protobuf_c_message_pack ((const ProtobufCMessage*)message, out); } -size_t tango__pmr__stubs__progress_response__pack_to_buffer - (const Tango__PMR__Stubs__ProgressResponse *message, +size_t progress_response__pack_to_buffer + (const ProgressResponse *message, ProtobufCBuffer *buffer) { - assert(message->base.descriptor == &tango__pmr__stubs__progress_response__descriptor); + assert(message->base.descriptor == &progress_response__descriptor); return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer); } -Tango__PMR__Stubs__ProgressResponse * - tango__pmr__stubs__progress_response__unpack +ProgressResponse * + progress_response__unpack (ProtobufCAllocator *allocator, size_t len, const uint8_t *data) { - return (Tango__PMR__Stubs__ProgressResponse *) - protobuf_c_message_unpack (&tango__pmr__stubs__progress_response__descriptor, + return (ProgressResponse *) + protobuf_c_message_unpack (&progress_response__descriptor, allocator, len, data); } -void tango__pmr__stubs__progress_response__free_unpacked - (Tango__PMR__Stubs__ProgressResponse *message, +void progress_response__free_unpacked + (ProgressResponse *message, ProtobufCAllocator *allocator) { if(!message) return; - assert(message->base.descriptor == &tango__pmr__stubs__progress_response__descriptor); + assert(message->base.descriptor == &progress_response__descriptor); protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); } -static const ProtobufCFieldDescriptor tango__pmr__stubs__progress_response__field_descriptors[1] = +static const ProtobufCFieldDescriptor progress_response__field_descriptors[1] = { { "Progress", 1, PROTOBUF_C_LABEL_OPTIONAL, PROTOBUF_C_TYPE_DOUBLE, - offsetof(Tango__PMR__Stubs__ProgressResponse, has_progress), - offsetof(Tango__PMR__Stubs__ProgressResponse, progress), + offsetof(ProgressResponse, has_progress), + offsetof(ProgressResponse, progress), NULL, NULL, 0, /* flags */ 0,NULL,NULL /* reserved1,reserved2, etc */ }, }; -static const unsigned tango__pmr__stubs__progress_response__field_indices_by_name[] = { +static const unsigned progress_response__field_indices_by_name[] = { 0, /* field[0] = Progress */ }; -static const ProtobufCIntRange tango__pmr__stubs__progress_response__number_ranges[1 + 1] = +static const ProtobufCIntRange progress_response__number_ranges[1 + 1] = { { 1, 0 }, { 0, 1 } }; -const ProtobufCMessageDescriptor tango__pmr__stubs__progress_response__descriptor = +const ProtobufCMessageDescriptor progress_response__descriptor = { PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC, - "Tango.PMR.Stubs.ProgressResponse", "ProgressResponse", - "Tango__PMR__Stubs__ProgressResponse", - "Tango.PMR.Stubs", - sizeof(Tango__PMR__Stubs__ProgressResponse), + "ProgressResponse", + "ProgressResponse", + "", + sizeof(ProgressResponse), 1, - tango__pmr__stubs__progress_response__field_descriptors, - tango__pmr__stubs__progress_response__field_indices_by_name, - 1, tango__pmr__stubs__progress_response__number_ranges, - (ProtobufCMessageInit) tango__pmr__stubs__progress_response__init, + progress_response__field_descriptors, + progress_response__field_indices_by_name, + 1, progress_response__number_ranges, + (ProtobufCMessageInit) progress_response__init, NULL,NULL,NULL /* reserved[123] */ }; diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/ProgressResponse.pb-c.h b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/ProgressResponse.pb-c.h index 76e196a97..de5201ee5 100644 --- a/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/ProgressResponse.pb-c.h +++ b/Software/Code_Composer/twine_usblib_demo/PMR/Stubs/ProgressResponse.pb-c.h @@ -15,7 +15,7 @@ PROTOBUF_C__BEGIN_DECLS #endif -typedef struct _Tango__PMR__Stubs__ProgressResponse Tango__PMR__Stubs__ProgressResponse; +typedef struct _ProgressResponse ProgressResponse; /* --- enums --- */ @@ -23,40 +23,40 @@ typedef struct _Tango__PMR__Stubs__ProgressResponse Tango__PMR__Stubs__ProgressR /* --- messages --- */ -struct _Tango__PMR__Stubs__ProgressResponse +struct _ProgressResponse { ProtobufCMessage base; protobuf_c_boolean has_progress; double progress; }; -#define TANGO__PMR__STUBS__PROGRESS_RESPONSE__INIT \ - { PROTOBUF_C_MESSAGE_INIT (&tango__pmr__stubs__progress_response__descriptor) \ +#define PROGRESS_RESPONSE__INIT \ + { PROTOBUF_C_MESSAGE_INIT (&progress_response__descriptor) \ , 0, 0 } -/* Tango__PMR__Stubs__ProgressResponse methods */ -void tango__pmr__stubs__progress_response__init - (Tango__PMR__Stubs__ProgressResponse *message); -size_t tango__pmr__stubs__progress_response__get_packed_size - (const Tango__PMR__Stubs__ProgressResponse *message); -size_t tango__pmr__stubs__progress_response__pack - (const Tango__PMR__Stubs__ProgressResponse *message, +/* ProgressResponse methods */ +void progress_response__init + (ProgressResponse *message); +size_t progress_response__get_packed_size + (const ProgressResponse *message); +size_t progress_response__pack + (const ProgressResponse *message, uint8_t *out); -size_t tango__pmr__stubs__progress_response__pack_to_buffer - (const Tango__PMR__Stubs__ProgressResponse *message, +size_t progress_response__pack_to_buffer + (const ProgressResponse *message, ProtobufCBuffer *buffer); -Tango__PMR__Stubs__ProgressResponse * - tango__pmr__stubs__progress_response__unpack +ProgressResponse * + progress_response__unpack (ProtobufCAllocator *allocator, size_t len, const uint8_t *data); -void tango__pmr__stubs__progress_response__free_unpacked - (Tango__PMR__Stubs__ProgressResponse *message, +void progress_response__free_unpacked + (ProgressResponse *message, ProtobufCAllocator *allocator); /* --- per-message closures --- */ -typedef void (*Tango__PMR__Stubs__ProgressResponse_Closure) - (const Tango__PMR__Stubs__ProgressResponse *message, +typedef void (*ProgressResponse_Closure) + (const ProgressResponse *message, void *closure_data); /* --- services --- */ @@ -64,7 +64,7 @@ typedef void (*Tango__PMR__Stubs__ProgressResponse_Closure) /* --- descriptors --- */ -extern const ProtobufCMessageDescriptor tango__pmr__stubs__progress_response__descriptor; +extern const ProtobufCMessageDescriptor progress_response__descriptor; PROTOBUF_C__END_DECLS diff --git a/Software/Code_Composer/twine_usblib_demo/main.c b/Software/Code_Composer/twine_usblib_demo/main.c index db6f6fec5..3b9da30da 100644 --- a/Software/Code_Composer/twine_usblib_demo/main.c +++ b/Software/Code_Composer/twine_usblib_demo/main.c @@ -1,7 +1,9 @@ #include <protobuf-c/person-pb-c.h> #include <stdbool.h> #include <stdlib.h> +#include <stdio.h> #include <stdint.h> +#include <string.h> #include "inc/hw_ints.h" #include "inc/hw_memmap.h" #include "inc/hw_types.h" @@ -75,33 +77,44 @@ void receive_callback(char* buffer, size_t length) //draw_string(buffer, length); //draw_image((uint8_t *)buffer); - Tango__PMR__Common__MessageContainer* container = tango__pmr__common__message_container__unpack(NULL, length, (uint8_t*)buffer); + MessageContainer* container = message_container__unpack(NULL, length, (uint8_t*)buffer); - if (container->type == TANGO__PMR__COMMON__MESSAGE_TYPE__CalculateRequest) + if (container->type == MESSAGE_TYPE__CalculateRequest) { - Tango__PMR__Stubs__CalculateRequest* request = tango__pmr__stubs__calculate_request__unpack(NULL, container->data.len, container->data.data); + CalculateRequest* request = calculate_request__unpack(NULL, container->data.len, container->data.data); - Tango__PMR__Stubs__CalculateResponse* response = NULL; - tango__pmr__stubs__calculate_response__init(response); - response->sum = request->a + request->b; - response->has_sum = true; + char screen_text[100]; + strcpy(screen_text, "Calculate Request: "); - Tango__PMR__Common__MessageContainer responseContainer = TANGO__PMR__COMMON__MESSAGE_CONTAINER__INIT; + char num_buf[5]; + ltoa(request->a, num_buf); + strcat(screen_text, num_buf); + strcat(screen_text, " + "); + ltoa(request->b, num_buf); + strcat(screen_text, num_buf); + + draw_string(screen_text,strlen(screen_text)); + + CalculateResponse response = CALCULATE_RESPONSE__INIT; + response.sum = request->a + request->b; + response.has_sum = true; + + MessageContainer responseContainer = MESSAGE_CONTAINER__INIT; responseContainer.completed = true; responseContainer.token = container->token; responseContainer.has_completed = true; responseContainer.has_data = true; responseContainer.has_type = true; - responseContainer.type = TANGO__PMR__COMMON__MESSAGE_TYPE__CalculateResponse; + responseContainer.type = MESSAGE_TYPE__CalculateResponse; - uint8_t* d; - size_t size = tango__pmr__stubs__calculate_response__pack(response, d); + uint8_t* d = malloc(calculate_response__get_packed_size(&response)); + size_t size = calculate_response__pack(&response, d); responseContainer.data.data = d; responseContainer.data.len = size; - uint8_t* output = NULL; - size = tango__pmr__common__message_container__pack(&responseContainer, &output); + uint8_t* output = malloc(message_container__get_packed_size(&responseContainer)); + size = message_container__pack(&responseContainer, output); SendChars(output, size); } diff --git a/Software/Visual_Studio/Tango.Core/Helpers/PathHelper.cs b/Software/Visual_Studio/Tango.Core/Helpers/PathHelper.cs index fa52eb42b..dd613ac5e 100644 --- a/Software/Visual_Studio/Tango.Core/Helpers/PathHelper.cs +++ b/Software/Visual_Studio/Tango.Core/Helpers/PathHelper.cs @@ -28,5 +28,44 @@ namespace Tango.Core.Helpers return false; } } + + + public static void CopyDirectory(string sourceDirName, string destDirName, bool copySubDirs) + { + // Get the subdirectories for the specified directory. + DirectoryInfo dir = new DirectoryInfo(sourceDirName); + + if (!dir.Exists) + { + throw new DirectoryNotFoundException( + "Source directory does not exist or could not be found: " + + sourceDirName); + } + + DirectoryInfo[] dirs = dir.GetDirectories(); + // If the destination directory doesn't exist, create it. + if (!Directory.Exists(destDirName)) + { + Directory.CreateDirectory(destDirName); + } + + // Get the files in the directory and copy them to the new location. + FileInfo[] files = dir.GetFiles(); + foreach (FileInfo file in files) + { + string temppath = Path.Combine(destDirName, file.Name); + file.CopyTo(temppath, false); + } + + // If copying subdirectories, copy them and their contents to new location. + if (copySubDirs) + { + foreach (DirectoryInfo subdir in dirs) + { + string temppath = Path.Combine(destDirName, subdir.Name); + CopyDirectory(subdir.FullName, temppath, copySubDirs); + } + } + } } } diff --git a/Software/Visual_Studio/Tango.Protobuf/Compilers/CCompiler.cs b/Software/Visual_Studio/Tango.Protobuf/Compilers/CCompiler.cs index 0d97c9711..57064ec9f 100644 --- a/Software/Visual_Studio/Tango.Protobuf/Compilers/CCompiler.cs +++ b/Software/Visual_Studio/Tango.Protobuf/Compilers/CCompiler.cs @@ -1,8 +1,10 @@ using System; using System.Collections.Generic; +using System.IO; using System.Linq; using System.Text; using System.Threading.Tasks; +using Tango.Core.Helpers; namespace Tango.Protobuf.Compilers { @@ -39,22 +41,35 @@ namespace Tango.Protobuf.Compilers } /// <summary> - /// Compiles the specified .proto message file. + /// Compiles all files in the specified folder recursively. /// </summary> - /// <param name="inputFile">.proto file to compile</param> + /// <param name="sourceFolder">The source folder</param> /// <returns> - /// A list of compiled results. + /// Compilation result. /// </returns> - //public override IEnumerable<CompilerFileResult> CompileFile(string inputFile) - //{ - // var files = base.CompileFile(inputFile); + public override CompilerFolderResult CompileFolder(string sourceFolder) + { + String temp = PathHelper.GetTempFolderPath(); + PathHelper.CopyDirectory(sourceFolder, temp, true); + + List<String> directories = Directory.GetDirectories(sourceFolder, "*", SearchOption.AllDirectories).ToList(); + + foreach (var file in Directory.GetFiles(temp, "*.proto", SearchOption.AllDirectories)) + { + String str = File.ReadAllText(file); - // foreach (var file in files) - // { - // file.Name = file.Name.Replace(".pb-c", ""); - // } + foreach (String dir in directories.Select(x => Path.GetFileName(x))) + { + str = str.Replace(dir + ".", ""); + } - // return files; - //} + var lines = str.ToLines(); + lines.RemoveAll(x => x.Contains("package ")); + str = String.Join(Environment.NewLine, lines); + File.WriteAllText(file, str); + } + + return base.CompileFolder(temp); + } } } diff --git a/Software/Visual_Studio/Utilities/Tango.MobileEM.UI/App.xaml.cs b/Software/Visual_Studio/Utilities/Tango.MobileEM.UI/App.xaml.cs index 57e3ddcad..577dd41b4 100644 --- a/Software/Visual_Studio/Utilities/Tango.MobileEM.UI/App.xaml.cs +++ b/Software/Visual_Studio/Utilities/Tango.MobileEM.UI/App.xaml.cs @@ -21,7 +21,7 @@ namespace Tango.MobileEM.UI protected override void OnStartup(StartupEventArgs e) { base.OnStartup(e); - Emulator = new MobileEmulator(new ProtoTransporter(new TcpTransportAdapter("127.0.0.1", 9999))); + Emulator = new MobileEmulator(new ProtoTransporter(new UsbTransportAdapter("COM9"))); } } } |