From 0dbcea457cb624a60ecffe59c163d775ea2fc490 Mon Sep 17 00:00:00 2001 From: Christopher Peplin Date: Fri, 4 Oct 2013 19:31:51 -0400 Subject: Merge all sub-types into a single TranslatedMessage type. --- gen/cpp/openxc.pb | 35 +++++++++++-------------- gen/cpp/openxc.pb.c | 35 ++++++++++--------------- gen/cpp/openxc.pb.h | 75 +++++++++++++++++++++-------------------------------- 3 files changed, 58 insertions(+), 87 deletions(-) (limited to 'gen/cpp') diff --git a/gen/cpp/openxc.pb b/gen/cpp/openxc.pb index e343eeb0..523fc767 100644 --- a/gen/cpp/openxc.pb +++ b/gen/cpp/openxc.pb @@ -1,30 +1,25 @@ -Å - openxc.protoopenxc"Å +Â + openxc.protoopenxc"¼ VehicleMessage) type (2.openxc.VehicleMessage.Type' - raw_message ( 2.openxc.RawMessage7 -string_message ( 2.openxc.TranslatedStringMessage; -numerical_message ( 2 .openxc.TranslatedNumericMessage9 -boolean_message ( 2 .openxc.TranslatedBooleanMessage". + raw_message ( 2.openxc.RawMessage5 +translated_message ( 2.openxc.TranslatedMessage" Type -RAW +RAW -STRING -NUM -BOOL"; +TRANSLATED"; RawMessage bus ( message_id (  -data ("6 -TranslatedStringMessage -name (  -value ( "7 -TranslatedNumericMessage -name (  -value ("7 -TranslatedBooleanMessage -name (  -value ( \ No newline at end of file +data ("­ +TranslatedMessage +name (  + string_value (  +numerical_value ( + boolean_value ( + string_event (  +numerical_event ( + boolean_event ( \ No newline at end of file diff --git a/gen/cpp/openxc.pb.c b/gen/cpp/openxc.pb.c index 89e32a60..a49e1c07 100644 --- a/gen/cpp/openxc.pb.c +++ b/gen/cpp/openxc.pb.c @@ -1,16 +1,14 @@ /* Automatically generated nanopb constant definitions */ -/* Generated by nanopb-0.2.4-dev at Tue Oct 1 16:51:23 2013. */ +/* Generated by nanopb-0.2.4-dev at Fri Oct 4 19:24:10 2013. */ #include "openxc.pb.h" -const pb_field_t openxc_VehicleMessage_fields[6] = { +const pb_field_t openxc_VehicleMessage_fields[4] = { PB_FIELD2( 1, ENUM , OPTIONAL, STATIC, FIRST, openxc_VehicleMessage, type, type, 0), PB_FIELD2( 2, MESSAGE , OPTIONAL, STATIC, OTHER, openxc_VehicleMessage, raw_message, type, &openxc_RawMessage_fields), - PB_FIELD2( 3, MESSAGE , OPTIONAL, STATIC, OTHER, openxc_VehicleMessage, string_message, raw_message, &openxc_TranslatedStringMessage_fields), - PB_FIELD2( 4, MESSAGE , OPTIONAL, STATIC, OTHER, openxc_VehicleMessage, numerical_message, string_message, &openxc_TranslatedNumericMessage_fields), - PB_FIELD2( 5, MESSAGE , OPTIONAL, STATIC, OTHER, openxc_VehicleMessage, boolean_message, numerical_message, &openxc_TranslatedBooleanMessage_fields), + PB_FIELD2( 3, MESSAGE , OPTIONAL, STATIC, OTHER, openxc_VehicleMessage, translated_message, raw_message, &openxc_TranslatedMessage_fields), PB_LAST_FIELD }; @@ -21,32 +19,25 @@ const pb_field_t openxc_RawMessage_fields[4] = { PB_LAST_FIELD }; -const pb_field_t openxc_TranslatedStringMessage_fields[3] = { - PB_FIELD2( 1, STRING , OPTIONAL, STATIC, FIRST, openxc_TranslatedStringMessage, name, name, 0), - PB_FIELD2( 2, STRING , OPTIONAL, STATIC, OTHER, openxc_TranslatedStringMessage, value, name, 0), - PB_LAST_FIELD -}; - -const pb_field_t openxc_TranslatedNumericMessage_fields[3] = { - PB_FIELD2( 1, STRING , OPTIONAL, STATIC, FIRST, openxc_TranslatedNumericMessage, name, name, 0), - PB_FIELD2( 2, DOUBLE , OPTIONAL, STATIC, OTHER, openxc_TranslatedNumericMessage, value, name, 0), - PB_LAST_FIELD -}; - -const pb_field_t openxc_TranslatedBooleanMessage_fields[3] = { - PB_FIELD2( 1, STRING , OPTIONAL, STATIC, FIRST, openxc_TranslatedBooleanMessage, name, name, 0), - PB_FIELD2( 2, BOOL , OPTIONAL, STATIC, OTHER, openxc_TranslatedBooleanMessage, value, name, 0), +const pb_field_t openxc_TranslatedMessage_fields[8] = { + PB_FIELD2( 1, STRING , OPTIONAL, STATIC, FIRST, openxc_TranslatedMessage, name, name, 0), + PB_FIELD2( 2, STRING , OPTIONAL, STATIC, OTHER, openxc_TranslatedMessage, string_value, name, 0), + PB_FIELD2( 3, DOUBLE , OPTIONAL, STATIC, OTHER, openxc_TranslatedMessage, numerical_value, string_value, 0), + PB_FIELD2( 4, BOOL , OPTIONAL, STATIC, OTHER, openxc_TranslatedMessage, boolean_value, numerical_value, 0), + PB_FIELD2( 5, STRING , OPTIONAL, STATIC, OTHER, openxc_TranslatedMessage, string_event, boolean_value, 0), + PB_FIELD2( 6, DOUBLE , OPTIONAL, STATIC, OTHER, openxc_TranslatedMessage, numerical_event, string_event, 0), + PB_FIELD2( 7, BOOL , OPTIONAL, STATIC, OTHER, openxc_TranslatedMessage, boolean_event, numerical_event, 0), PB_LAST_FIELD }; /* Check that field information fits in pb_field_t */ #if !defined(PB_FIELD_16BIT) && !defined(PB_FIELD_32BIT) -STATIC_ASSERT((pb_membersize(openxc_VehicleMessage, raw_message) < 256 && pb_membersize(openxc_VehicleMessage, string_message) < 256 && pb_membersize(openxc_VehicleMessage, numerical_message) < 256 && pb_membersize(openxc_VehicleMessage, boolean_message) < 256), YOU_MUST_DEFINE_PB_FIELD_16BIT_FOR_MESSAGES_openxc_VehicleMessage_openxc_RawMessage_openxc_TranslatedStringMessage_openxc_TranslatedNumericMessage_openxc_TranslatedBooleanMessage) +STATIC_ASSERT((pb_membersize(openxc_VehicleMessage, raw_message) < 256 && pb_membersize(openxc_VehicleMessage, translated_message) < 256), YOU_MUST_DEFINE_PB_FIELD_16BIT_FOR_MESSAGES_openxc_VehicleMessage_openxc_RawMessage_openxc_TranslatedMessage) #endif #if !defined(PB_FIELD_32BIT) -STATIC_ASSERT((pb_membersize(openxc_VehicleMessage, raw_message) < 65536 && pb_membersize(openxc_VehicleMessage, string_message) < 65536 && pb_membersize(openxc_VehicleMessage, numerical_message) < 65536 && pb_membersize(openxc_VehicleMessage, boolean_message) < 65536), YOU_MUST_DEFINE_PB_FIELD_32BIT_FOR_MESSAGES_openxc_VehicleMessage_openxc_RawMessage_openxc_TranslatedStringMessage_openxc_TranslatedNumericMessage_openxc_TranslatedBooleanMessage) +STATIC_ASSERT((pb_membersize(openxc_VehicleMessage, raw_message) < 65536 && pb_membersize(openxc_VehicleMessage, translated_message) < 65536), YOU_MUST_DEFINE_PB_FIELD_32BIT_FOR_MESSAGES_openxc_VehicleMessage_openxc_RawMessage_openxc_TranslatedMessage) #endif /* On some platforms (such as AVR), double is really float. diff --git a/gen/cpp/openxc.pb.h b/gen/cpp/openxc.pb.h index 9c50569d..8528e654 100644 --- a/gen/cpp/openxc.pb.h +++ b/gen/cpp/openxc.pb.h @@ -1,5 +1,5 @@ /* Automatically generated nanopb header */ -/* Generated by nanopb-0.2.4-dev at Tue Oct 1 16:51:23 2013. */ +/* Generated by nanopb-0.2.4-dev at Fri Oct 4 19:24:10 2013. */ #ifndef _PB_OPENXC_PB_H_ #define _PB_OPENXC_PB_H_ @@ -12,9 +12,7 @@ extern "C" { /* Enum definitions */ typedef enum _openxc_VehicleMessage_Type { openxc_VehicleMessage_Type_RAW = 1, - openxc_VehicleMessage_Type_STRING = 2, - openxc_VehicleMessage_Type_NUM = 3, - openxc_VehicleMessage_Type_BOOL = 4 + openxc_VehicleMessage_Type_TRANSLATED = 2 } openxc_VehicleMessage_Type; /* Struct definitions */ @@ -27,38 +25,30 @@ typedef struct _openxc_RawMessage { int64_t data; } openxc_RawMessage; -typedef struct _openxc_TranslatedBooleanMessage { +typedef struct _openxc_TranslatedMessage { bool has_name; char name[100]; - bool has_value; - bool value; -} openxc_TranslatedBooleanMessage; - -typedef struct _openxc_TranslatedNumericMessage { - bool has_name; - char name[100]; - bool has_value; - double value; -} openxc_TranslatedNumericMessage; - -typedef struct _openxc_TranslatedStringMessage { - bool has_name; - char name[100]; - bool has_value; - char value[100]; -} openxc_TranslatedStringMessage; + bool has_string_value; + char string_value[100]; + bool has_numerical_value; + double numerical_value; + bool has_boolean_value; + bool boolean_value; + bool has_string_event; + char string_event[100]; + bool has_numerical_event; + double numerical_event; + bool has_boolean_event; + bool boolean_event; +} openxc_TranslatedMessage; typedef struct _openxc_VehicleMessage { bool has_type; openxc_VehicleMessage_Type type; bool has_raw_message; openxc_RawMessage raw_message; - bool has_string_message; - openxc_TranslatedStringMessage string_message; - bool has_numerical_message; - openxc_TranslatedNumericMessage numerical_message; - bool has_boolean_message; - openxc_TranslatedBooleanMessage boolean_message; + bool has_translated_message; + openxc_TranslatedMessage translated_message; } openxc_VehicleMessage; /* Default values for struct fields */ @@ -67,31 +57,26 @@ typedef struct _openxc_VehicleMessage { #define openxc_RawMessage_bus_tag 1 #define openxc_RawMessage_message_id_tag 2 #define openxc_RawMessage_data_tag 3 -#define openxc_TranslatedBooleanMessage_name_tag 1 -#define openxc_TranslatedBooleanMessage_value_tag 2 -#define openxc_TranslatedNumericMessage_name_tag 1 -#define openxc_TranslatedNumericMessage_value_tag 2 -#define openxc_TranslatedStringMessage_name_tag 1 -#define openxc_TranslatedStringMessage_value_tag 2 +#define openxc_TranslatedMessage_name_tag 1 +#define openxc_TranslatedMessage_string_value_tag 2 +#define openxc_TranslatedMessage_numerical_value_tag 3 +#define openxc_TranslatedMessage_boolean_value_tag 4 +#define openxc_TranslatedMessage_string_event_tag 5 +#define openxc_TranslatedMessage_numerical_event_tag 6 +#define openxc_TranslatedMessage_boolean_event_tag 7 #define openxc_VehicleMessage_type_tag 1 #define openxc_VehicleMessage_raw_message_tag 2 -#define openxc_VehicleMessage_string_message_tag 3 -#define openxc_VehicleMessage_numerical_message_tag 4 -#define openxc_VehicleMessage_boolean_message_tag 5 +#define openxc_VehicleMessage_translated_message_tag 3 /* Struct field encoding specification for nanopb */ -extern const pb_field_t openxc_VehicleMessage_fields[6]; +extern const pb_field_t openxc_VehicleMessage_fields[4]; extern const pb_field_t openxc_RawMessage_fields[4]; -extern const pb_field_t openxc_TranslatedStringMessage_fields[3]; -extern const pb_field_t openxc_TranslatedNumericMessage_fields[3]; -extern const pb_field_t openxc_TranslatedBooleanMessage_fields[3]; +extern const pb_field_t openxc_TranslatedMessage_fields[8]; /* Maximum encoded size of messages (where known) */ -#define openxc_VehicleMessage_size 457 +#define openxc_VehicleMessage_size 362 #define openxc_RawMessage_size 23 -#define openxc_TranslatedStringMessage_size 204 -#define openxc_TranslatedNumericMessage_size 111 -#define openxc_TranslatedBooleanMessage_size 104 +#define openxc_TranslatedMessage_size 328 #ifdef __cplusplus } /* extern "C" */ -- cgit 1.2.3-korg