diff options
Diffstat (limited to 'gen/cpp')
| -rw-r--r-- | gen/cpp/openxc.pb | 7 | ||||
| -rw-r--r-- | gen/cpp/openxc.pb.c | 5 | ||||
| -rw-r--r-- | gen/cpp/openxc.pb.h | 11 |
3 files changed, 9 insertions, 14 deletions
diff --git a/gen/cpp/openxc.pb b/gen/cpp/openxc.pb index 348c1ae0..7efe870c 100644 --- a/gen/cpp/openxc.pb +++ b/gen/cpp/openxc.pb @@ -1,5 +1,5 @@ -è +Ú openxc.protoopenxc"š VehicleMessage) type (2.openxc.VehicleMessage.Type' @@ -18,13 +18,12 @@ NUM EVENTED_NUM EVENTED_STRING - EVENTED_BOOL"; + EVENTED_BOOL"- RawMessage bus ( -message_id (
-data (", +message_id (
",
StringMessage name (
value ( "- diff --git a/gen/cpp/openxc.pb.c b/gen/cpp/openxc.pb.c index 943a8951..541c6b0c 100644 --- a/gen/cpp/openxc.pb.c +++ b/gen/cpp/openxc.pb.c @@ -1,5 +1,5 @@ /* Automatically generated nanopb constant definitions */ -/* Generated by nanopb-0.2.4-dev at Wed Oct 23 09:56:27 2013. */ +/* Generated by nanopb-0.2.4-dev at Wed Oct 23 08:59:20 2013. */ #include "openxc.pb.h" @@ -17,10 +17,9 @@ const pb_field_t openxc_VehicleMessage_fields[9] = { PB_LAST_FIELD }; -const pb_field_t openxc_RawMessage_fields[4] = { +const pb_field_t openxc_RawMessage_fields[3] = { PB_FIELD2( 1, INT32 , OPTIONAL, STATIC, FIRST, openxc_RawMessage, bus, bus, 0), PB_FIELD2( 2, UINT32 , OPTIONAL, STATIC, OTHER, openxc_RawMessage, message_id, bus, 0), - PB_FIELD2( 3, UINT64 , OPTIONAL, STATIC, OTHER, openxc_RawMessage, data, message_id, 0), PB_LAST_FIELD }; diff --git a/gen/cpp/openxc.pb.h b/gen/cpp/openxc.pb.h index c18a640a..389c09c9 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 23 09:56:27 2013. */ +/* Generated by nanopb-0.2.4-dev at Wed Oct 23 08:59:20 2013. */ #ifndef _PB_OPENXC_PB_H_ #define _PB_OPENXC_PB_H_ @@ -67,8 +67,6 @@ typedef struct _openxc_RawMessage { int32_t bus; bool has_message_id; uint32_t message_id; - bool has_data; - uint64_t data; } openxc_RawMessage; typedef struct _openxc_StringMessage { @@ -115,7 +113,6 @@ typedef struct _openxc_VehicleMessage { #define openxc_NumericMessage_value_tag 2 #define openxc_RawMessage_bus_tag 1 #define openxc_RawMessage_message_id_tag 2 -#define openxc_RawMessage_data_tag 3 #define openxc_StringMessage_name_tag 1 #define openxc_StringMessage_value_tag 2 #define openxc_VehicleMessage_type_tag 1 @@ -129,7 +126,7 @@ typedef struct _openxc_VehicleMessage { /* Struct field encoding specification for nanopb */ extern const pb_field_t openxc_VehicleMessage_fields[9]; -extern const pb_field_t openxc_RawMessage_fields[4]; +extern const pb_field_t openxc_RawMessage_fields[3]; extern const pb_field_t openxc_StringMessage_fields[3]; extern const pb_field_t openxc_NumericMessage_fields[3]; extern const pb_field_t openxc_BooleanMessage_fields[3]; @@ -138,8 +135,8 @@ extern const pb_field_t openxc_EventedBooleanMessage_fields[4]; extern const pb_field_t openxc_EventedNumericMessage_fields[4]; /* Maximum encoded size of messages (where known) */ -#define openxc_VehicleMessage_size 1191 -#define openxc_RawMessage_size 23 +#define openxc_VehicleMessage_size 1180 +#define openxc_RawMessage_size 12 #define openxc_StringMessage_size 204 #define openxc_NumericMessage_size 111 #define openxc_BooleanMessage_size 104 |