diff options
Diffstat (limited to 'gen/cpp/openxc.pb.h')
| -rw-r--r-- | gen/cpp/openxc.pb.h | 42 |
1 files changed, 27 insertions, 15 deletions
diff --git a/gen/cpp/openxc.pb.h b/gen/cpp/openxc.pb.h index d278c681..81a0779d 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 Wed Oct 9 14:26:13 2013. */ +/* Generated by nanopb-0.2.4-dev at Thu Oct 24 10:06:38 2013. */ #ifndef _PB_OPENXC_PB_H_ #define _PB_OPENXC_PB_H_ @@ -15,6 +15,15 @@ typedef enum _openxc_VehicleMessage_Type { openxc_VehicleMessage_Type_TRANSLATED = 2 } openxc_VehicleMessage_Type; +typedef enum _openxc_TranslatedMessage_Type { + openxc_TranslatedMessage_Type_STRING = 1, + openxc_TranslatedMessage_Type_NUM = 2, + openxc_TranslatedMessage_Type_BOOL = 3, + openxc_TranslatedMessage_Type_EVENTED_STRING = 4, + openxc_TranslatedMessage_Type_EVENTED_NUM = 5, + openxc_TranslatedMessage_Type_EVENTED_BOOL = 6 +} openxc_TranslatedMessage_Type; + /* Struct definitions */ typedef struct _openxc_RawMessage { bool has_bus; @@ -26,18 +35,20 @@ typedef struct _openxc_RawMessage { } openxc_RawMessage; typedef struct _openxc_TranslatedMessage { + bool has_type; + openxc_TranslatedMessage_Type type; bool has_name; char name[100]; bool has_string_value; char string_value[100]; - bool has_numerical_value; - double numerical_value; + bool has_numeric_value; + double numeric_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_numeric_event; + double numeric_event; bool has_boolean_event; bool boolean_event; } openxc_TranslatedMessage; @@ -57,13 +68,14 @@ 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_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_TranslatedMessage_type_tag 1 +#define openxc_TranslatedMessage_name_tag 2 +#define openxc_TranslatedMessage_string_value_tag 3 +#define openxc_TranslatedMessage_numeric_value_tag 4 +#define openxc_TranslatedMessage_boolean_value_tag 5 +#define openxc_TranslatedMessage_string_event_tag 6 +#define openxc_TranslatedMessage_numeric_event_tag 7 +#define openxc_TranslatedMessage_boolean_event_tag 8 #define openxc_VehicleMessage_type_tag 1 #define openxc_VehicleMessage_raw_message_tag 2 #define openxc_VehicleMessage_translated_message_tag 3 @@ -71,12 +83,12 @@ typedef struct _openxc_VehicleMessage { /* Struct field encoding specification for nanopb */ extern const pb_field_t openxc_VehicleMessage_fields[4]; extern const pb_field_t openxc_RawMessage_fields[4]; -extern const pb_field_t openxc_TranslatedMessage_fields[8]; +extern const pb_field_t openxc_TranslatedMessage_fields[9]; /* Maximum encoded size of messages (where known) */ -#define openxc_VehicleMessage_size 362 +#define openxc_VehicleMessage_size 368 #define openxc_RawMessage_size 23 -#define openxc_TranslatedMessage_size 328 +#define openxc_TranslatedMessage_size 334 #ifdef __cplusplus } /* extern "C" */ |