diff options
Diffstat (limited to 'gen')
-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 | ||||
-rw-r--r-- | gen/java/com/openxc/BinaryMessages.java | 105 | ||||
-rw-r--r-- | gen/python/openxc_pb2.py | 35 |
5 files changed, 35 insertions, 128 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 diff --git a/gen/java/com/openxc/BinaryMessages.java b/gen/java/com/openxc/BinaryMessages.java index 79df3f32..a2932845 100644 --- a/gen/java/com/openxc/BinaryMessages.java +++ b/gen/java/com/openxc/BinaryMessages.java @@ -1906,16 +1906,6 @@ public final class BinaryMessages { * <code>optional uint32 message_id = 2;</code> */ int getMessageId(); - - // optional uint64 data = 3; - /** - * <code>optional uint64 data = 3;</code> - */ - boolean hasData(); - /** - * <code>optional uint64 data = 3;</code> - */ - long getData(); } /** * Protobuf type {@code openxc.RawMessage} @@ -1978,11 +1968,6 @@ public final class BinaryMessages { messageId_ = input.readUInt32(); break; } - case 24: { - bitField0_ |= 0x00000004; - data_ = input.readUInt64(); - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -2055,26 +2040,9 @@ public final class BinaryMessages { return messageId_; } - // optional uint64 data = 3; - public static final int DATA_FIELD_NUMBER = 3; - private long data_; - /** - * <code>optional uint64 data = 3;</code> - */ - public boolean hasData() { - return ((bitField0_ & 0x00000004) == 0x00000004); - } - /** - * <code>optional uint64 data = 3;</code> - */ - public long getData() { - return data_; - } - private void initFields() { bus_ = 0; messageId_ = 0; - data_ = 0L; } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -2094,9 +2062,6 @@ public final class BinaryMessages { if (((bitField0_ & 0x00000002) == 0x00000002)) { output.writeUInt32(2, messageId_); } - if (((bitField0_ & 0x00000004) == 0x00000004)) { - output.writeUInt64(3, data_); - } getUnknownFields().writeTo(output); } @@ -2114,10 +2079,6 @@ public final class BinaryMessages { size += com.google.protobuf.CodedOutputStream .computeUInt32Size(2, messageId_); } - if (((bitField0_ & 0x00000004) == 0x00000004)) { - size += com.google.protobuf.CodedOutputStream - .computeUInt64Size(3, data_); - } size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; return size; @@ -2238,8 +2199,6 @@ public final class BinaryMessages { bitField0_ = (bitField0_ & ~0x00000001); messageId_ = 0; bitField0_ = (bitField0_ & ~0x00000002); - data_ = 0L; - bitField0_ = (bitField0_ & ~0x00000004); return this; } @@ -2276,10 +2235,6 @@ public final class BinaryMessages { to_bitField0_ |= 0x00000002; } result.messageId_ = messageId_; - if (((from_bitField0_ & 0x00000004) == 0x00000004)) { - to_bitField0_ |= 0x00000004; - } - result.data_ = data_; result.bitField0_ = to_bitField0_; onBuilt(); return result; @@ -2302,9 +2257,6 @@ public final class BinaryMessages { if (other.hasMessageId()) { setMessageId(other.getMessageId()); } - if (other.hasData()) { - setData(other.getData()); - } this.mergeUnknownFields(other.getUnknownFields()); return this; } @@ -2398,39 +2350,6 @@ public final class BinaryMessages { return this; } - // optional uint64 data = 3; - private long data_ ; - /** - * <code>optional uint64 data = 3;</code> - */ - public boolean hasData() { - return ((bitField0_ & 0x00000004) == 0x00000004); - } - /** - * <code>optional uint64 data = 3;</code> - */ - public long getData() { - return data_; - } - /** - * <code>optional uint64 data = 3;</code> - */ - public Builder setData(long value) { - bitField0_ |= 0x00000004; - data_ = value; - onChanged(); - return this; - } - /** - * <code>optional uint64 data = 3;</code> - */ - public Builder clearData() { - bitField0_ = (bitField0_ & ~0x00000004); - data_ = 0L; - onChanged(); - return this; - } - // @@protoc_insertion_point(builder_scope:openxc.RawMessage) } @@ -6435,17 +6354,17 @@ public final class BinaryMessages { "ventedNumericMessage\"e\n\004Type\022\007\n\003RAW\020\001\022\n\n" + "\006STRING\020\002\022\010\n\004BOOL\020\003\022\007\n\003NUM\020\004\022\017\n\013EVENTED_" + "NUM\020\005\022\022\n\016EVENTED_STRING\020\006\022\020\n\014EVENTED_BOO" + - "L\020\007\";\n\nRawMessage\022\013\n\003bus\030\001 \001(\005\022\022\n\nmessag" + - "e_id\030\002 \001(\r\022\014\n\004data\030\003 \001(\004\",\n\rStringMessag" + - "e\022\014\n\004name\030\001 \001(\t\022\r\n\005value\030\002 \001(\t\"-\n\016Numeri" + - "cMessage\022\014\n\004name\030\001 \001(\t\022\r\n\005value\030\002 \001(\001\"-\n" + - "\016BooleanMessage\022\014\n\004name\030\001 \001(\t\022\r\n\005value\030\002" + - " \001(\010\"B\n\024EventedStringMessage\022\014\n\004name\030\001 \001", - "(\t\022\r\n\005value\030\002 \001(\t\022\r\n\005event\030\003 \001(\t\"C\n\025Even" + - "tedBooleanMessage\022\014\n\004name\030\001 \001(\t\022\r\n\005value" + - "\030\002 \001(\t\022\r\n\005event\030\003 \001(\010\"C\n\025EventedNumericM" + - "essage\022\014\n\004name\030\001 \001(\t\022\r\n\005value\030\002 \001(\t\022\r\n\005e" + - "vent\030\003 \001(\001B\034\n\ncom.openxcB\016BinaryMessages" + "L\020\007\"-\n\nRawMessage\022\013\n\003bus\030\001 \001(\005\022\022\n\nmessag" + + "e_id\030\002 \001(\r\",\n\rStringMessage\022\014\n\004name\030\001 \001(" + + "\t\022\r\n\005value\030\002 \001(\t\"-\n\016NumericMessage\022\014\n\004na" + + "me\030\001 \001(\t\022\r\n\005value\030\002 \001(\001\"-\n\016BooleanMessag" + + "e\022\014\n\004name\030\001 \001(\t\022\r\n\005value\030\002 \001(\010\"B\n\024Evente" + + "dStringMessage\022\014\n\004name\030\001 \001(\t\022\r\n\005value\030\002 ", + "\001(\t\022\r\n\005event\030\003 \001(\t\"C\n\025EventedBooleanMess" + + "age\022\014\n\004name\030\001 \001(\t\022\r\n\005value\030\002 \001(\t\022\r\n\005even" + + "t\030\003 \001(\010\"C\n\025EventedNumericMessage\022\014\n\004name" + + "\030\001 \001(\t\022\r\n\005value\030\002 \001(\t\022\r\n\005event\030\003 \001(\001B\034\n\n" + + "com.openxcB\016BinaryMessages" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { @@ -6463,7 +6382,7 @@ public final class BinaryMessages { internal_static_openxc_RawMessage_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_openxc_RawMessage_descriptor, - new java.lang.String[] { "Bus", "MessageId", "Data", }); + new java.lang.String[] { "Bus", "MessageId", }); internal_static_openxc_StringMessage_descriptor = getDescriptor().getMessageTypes().get(2); internal_static_openxc_StringMessage_fieldAccessorTable = new diff --git a/gen/python/openxc_pb2.py b/gen/python/openxc_pb2.py index e5086b7f..6c773033 100644 --- a/gen/python/openxc_pb2.py +++ b/gen/python/openxc_pb2.py @@ -13,7 +13,7 @@ from google.protobuf import descriptor_pb2 DESCRIPTOR = _descriptor.FileDescriptor( name='openxc.proto', package='openxc', - serialized_pb='\n\x0copenxc.proto\x12\x06openxc\"\x9a\x04\n\x0eVehicleMessage\x12)\n\x04type\x18\x01 \x01(\x0e\x32\x1b.openxc.VehicleMessage.Type\x12\'\n\x0braw_message\x18\x02 \x01(\x0b\x32\x12.openxc.RawMessage\x12-\n\x0estring_message\x18\x03 \x01(\x0b\x32\x15.openxc.StringMessage\x12/\n\x0fnumeric_message\x18\x04 \x01(\x0b\x32\x16.openxc.NumericMessage\x12/\n\x0f\x62oolean_message\x18\x05 \x01(\x0b\x32\x16.openxc.BooleanMessage\x12<\n\x16\x65vented_string_message\x18\x06 \x01(\x0b\x32\x1c.openxc.EventedStringMessage\x12>\n\x17\x65vented_boolean_message\x18\x07 \x01(\x0b\x32\x1d.openxc.EventedBooleanMessage\x12>\n\x17\x65vented_numeric_message\x18\x08 \x01(\x0b\x32\x1d.openxc.EventedNumericMessage\"e\n\x04Type\x12\x07\n\x03RAW\x10\x01\x12\n\n\x06STRING\x10\x02\x12\x08\n\x04\x42OOL\x10\x03\x12\x07\n\x03NUM\x10\x04\x12\x0f\n\x0b\x45VENTED_NUM\x10\x05\x12\x12\n\x0e\x45VENTED_STRING\x10\x06\x12\x10\n\x0c\x45VENTED_BOOL\x10\x07\";\n\nRawMessage\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x12\n\nmessage_id\x18\x02 \x01(\r\x12\x0c\n\x04\x64\x61ta\x18\x03 \x01(\x04\",\n\rStringMessage\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t\"-\n\x0eNumericMessage\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x01\"-\n\x0e\x42ooleanMessage\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x08\"B\n\x14\x45ventedStringMessage\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t\x12\r\n\x05\x65vent\x18\x03 \x01(\t\"C\n\x15\x45ventedBooleanMessage\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t\x12\r\n\x05\x65vent\x18\x03 \x01(\x08\"C\n\x15\x45ventedNumericMessage\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t\x12\r\n\x05\x65vent\x18\x03 \x01(\x01\x42\x1c\n\ncom.openxcB\x0e\x42inaryMessages') + serialized_pb='\n\x0copenxc.proto\x12\x06openxc\"\x9a\x04\n\x0eVehicleMessage\x12)\n\x04type\x18\x01 \x01(\x0e\x32\x1b.openxc.VehicleMessage.Type\x12\'\n\x0braw_message\x18\x02 \x01(\x0b\x32\x12.openxc.RawMessage\x12-\n\x0estring_message\x18\x03 \x01(\x0b\x32\x15.openxc.StringMessage\x12/\n\x0fnumeric_message\x18\x04 \x01(\x0b\x32\x16.openxc.NumericMessage\x12/\n\x0f\x62oolean_message\x18\x05 \x01(\x0b\x32\x16.openxc.BooleanMessage\x12<\n\x16\x65vented_string_message\x18\x06 \x01(\x0b\x32\x1c.openxc.EventedStringMessage\x12>\n\x17\x65vented_boolean_message\x18\x07 \x01(\x0b\x32\x1d.openxc.EventedBooleanMessage\x12>\n\x17\x65vented_numeric_message\x18\x08 \x01(\x0b\x32\x1d.openxc.EventedNumericMessage\"e\n\x04Type\x12\x07\n\x03RAW\x10\x01\x12\n\n\x06STRING\x10\x02\x12\x08\n\x04\x42OOL\x10\x03\x12\x07\n\x03NUM\x10\x04\x12\x0f\n\x0b\x45VENTED_NUM\x10\x05\x12\x12\n\x0e\x45VENTED_STRING\x10\x06\x12\x10\n\x0c\x45VENTED_BOOL\x10\x07\"-\n\nRawMessage\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x12\n\nmessage_id\x18\x02 \x01(\r\",\n\rStringMessage\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t\"-\n\x0eNumericMessage\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x01\"-\n\x0e\x42ooleanMessage\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x08\"B\n\x14\x45ventedStringMessage\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t\x12\r\n\x05\x65vent\x18\x03 \x01(\t\"C\n\x15\x45ventedBooleanMessage\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t\x12\r\n\x05\x65vent\x18\x03 \x01(\x08\"C\n\x15\x45ventedNumericMessage\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t\x12\r\n\x05\x65vent\x18\x03 \x01(\x01\x42\x1c\n\ncom.openxcB\x0e\x42inaryMessages') @@ -158,13 +158,6 @@ _RAWMESSAGE = _descriptor.Descriptor( message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( - name='data', full_name='openxc.RawMessage.data', index=2, - number=3, type=4, cpp_type=4, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None), ], extensions=[ ], @@ -175,7 +168,7 @@ _RAWMESSAGE = _descriptor.Descriptor( is_extendable=False, extension_ranges=[], serialized_start=565, - serialized_end=624, + serialized_end=610, ) @@ -209,8 +202,8 @@ _STRINGMESSAGE = _descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - serialized_start=626, - serialized_end=670, + serialized_start=612, + serialized_end=656, ) @@ -244,8 +237,8 @@ _NUMERICMESSAGE = _descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - serialized_start=672, - serialized_end=717, + serialized_start=658, + serialized_end=703, ) @@ -279,8 +272,8 @@ _BOOLEANMESSAGE = _descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - serialized_start=719, - serialized_end=764, + serialized_start=705, + serialized_end=750, ) @@ -321,8 +314,8 @@ _EVENTEDSTRINGMESSAGE = _descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - serialized_start=766, - serialized_end=832, + serialized_start=752, + serialized_end=818, ) @@ -363,8 +356,8 @@ _EVENTEDBOOLEANMESSAGE = _descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - serialized_start=834, - serialized_end=901, + serialized_start=820, + serialized_end=887, ) @@ -405,8 +398,8 @@ _EVENTEDNUMERICMESSAGE = _descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - serialized_start=903, - serialized_end=970, + serialized_start=889, + serialized_end=956, ) _VEHICLEMESSAGE.fields_by_name['type'].enum_type = _VEHICLEMESSAGE_TYPE |