From: Christopher Peplin Date: Wed, 23 Oct 2013 13:55:14 +0000 (-0400) Subject: Restore accidentally deleted data field from raw message. X-Git-Tag: 3.99.1~103^2~47 X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=a1b4117678436b6956d9c244c1b19d9e3694bc78;p=apps%2Flow-level-can-service.git Restore accidentally deleted data field from raw message. --- diff --git a/gen/cpp/openxc.pb b/gen/cpp/openxc.pb index 7efe870..348c1ae 100644 --- a/gen/cpp/openxc.pb +++ b/gen/cpp/openxc.pb @@ -1,5 +1,5 @@ -Ú +è openxc.protoopenxc"š VehicleMessage) type (2.openxc.VehicleMessage.Type' @@ -18,12 +18,13 @@ NUM EVENTED_NUM EVENTED_STRING - EVENTED_BOOL"- + EVENTED_BOOL"; RawMessage bus ( -message_id ( ", +message_id (  +data (", StringMessage name (  value ( "- diff --git a/gen/cpp/openxc.pb.c b/gen/cpp/openxc.pb.c index 541c6b0..943a895 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 08:59:20 2013. */ +/* Generated by nanopb-0.2.4-dev at Wed Oct 23 09:56:27 2013. */ #include "openxc.pb.h" @@ -17,9 +17,10 @@ const pb_field_t openxc_VehicleMessage_fields[9] = { PB_LAST_FIELD }; -const pb_field_t openxc_RawMessage_fields[3] = { +const pb_field_t openxc_RawMessage_fields[4] = { 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 389c09c..c18a640 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 08:59:20 2013. */ +/* Generated by nanopb-0.2.4-dev at Wed Oct 23 09:56:27 2013. */ #ifndef _PB_OPENXC_PB_H_ #define _PB_OPENXC_PB_H_ @@ -67,6 +67,8 @@ 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 { @@ -113,6 +115,7 @@ 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 @@ -126,7 +129,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[3]; +extern const pb_field_t openxc_RawMessage_fields[4]; 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]; @@ -135,8 +138,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 1180 -#define openxc_RawMessage_size 12 +#define openxc_VehicleMessage_size 1191 +#define openxc_RawMessage_size 23 #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 a293284..79df3f3 100644 --- a/gen/java/com/openxc/BinaryMessages.java +++ b/gen/java/com/openxc/BinaryMessages.java @@ -1906,6 +1906,16 @@ public final class BinaryMessages { * optional uint32 message_id = 2; */ int getMessageId(); + + // optional uint64 data = 3; + /** + * optional uint64 data = 3; + */ + boolean hasData(); + /** + * optional uint64 data = 3; + */ + long getData(); } /** * Protobuf type {@code openxc.RawMessage} @@ -1968,6 +1978,11 @@ public final class BinaryMessages { messageId_ = input.readUInt32(); break; } + case 24: { + bitField0_ |= 0x00000004; + data_ = input.readUInt64(); + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -2040,9 +2055,26 @@ public final class BinaryMessages { return messageId_; } + // optional uint64 data = 3; + public static final int DATA_FIELD_NUMBER = 3; + private long data_; + /** + * optional uint64 data = 3; + */ + public boolean hasData() { + return ((bitField0_ & 0x00000004) == 0x00000004); + } + /** + * optional uint64 data = 3; + */ + public long getData() { + return data_; + } + private void initFields() { bus_ = 0; messageId_ = 0; + data_ = 0L; } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -2062,6 +2094,9 @@ public final class BinaryMessages { if (((bitField0_ & 0x00000002) == 0x00000002)) { output.writeUInt32(2, messageId_); } + if (((bitField0_ & 0x00000004) == 0x00000004)) { + output.writeUInt64(3, data_); + } getUnknownFields().writeTo(output); } @@ -2079,6 +2114,10 @@ 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; @@ -2199,6 +2238,8 @@ public final class BinaryMessages { bitField0_ = (bitField0_ & ~0x00000001); messageId_ = 0; bitField0_ = (bitField0_ & ~0x00000002); + data_ = 0L; + bitField0_ = (bitField0_ & ~0x00000004); return this; } @@ -2235,6 +2276,10 @@ 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; @@ -2257,6 +2302,9 @@ public final class BinaryMessages { if (other.hasMessageId()) { setMessageId(other.getMessageId()); } + if (other.hasData()) { + setData(other.getData()); + } this.mergeUnknownFields(other.getUnknownFields()); return this; } @@ -2350,6 +2398,39 @@ public final class BinaryMessages { return this; } + // optional uint64 data = 3; + private long data_ ; + /** + * optional uint64 data = 3; + */ + public boolean hasData() { + return ((bitField0_ & 0x00000004) == 0x00000004); + } + /** + * optional uint64 data = 3; + */ + public long getData() { + return data_; + } + /** + * optional uint64 data = 3; + */ + public Builder setData(long value) { + bitField0_ |= 0x00000004; + data_ = value; + onChanged(); + return this; + } + /** + * optional uint64 data = 3; + */ + public Builder clearData() { + bitField0_ = (bitField0_ & ~0x00000004); + data_ = 0L; + onChanged(); + return this; + } + // @@protoc_insertion_point(builder_scope:openxc.RawMessage) } @@ -6354,17 +6435,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\",\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" + "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" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { @@ -6382,7 +6463,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", }); + new java.lang.String[] { "Bus", "MessageId", "Data", }); 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 6c77303..e5086b7 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\",\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\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') @@ -158,6 +158,13 @@ _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=[ ], @@ -168,7 +175,7 @@ _RAWMESSAGE = _descriptor.Descriptor( is_extendable=False, extension_ranges=[], serialized_start=565, - serialized_end=610, + serialized_end=624, ) @@ -202,8 +209,8 @@ _STRINGMESSAGE = _descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - serialized_start=612, - serialized_end=656, + serialized_start=626, + serialized_end=670, ) @@ -237,8 +244,8 @@ _NUMERICMESSAGE = _descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - serialized_start=658, - serialized_end=703, + serialized_start=672, + serialized_end=717, ) @@ -272,8 +279,8 @@ _BOOLEANMESSAGE = _descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - serialized_start=705, - serialized_end=750, + serialized_start=719, + serialized_end=764, ) @@ -314,8 +321,8 @@ _EVENTEDSTRINGMESSAGE = _descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - serialized_start=752, - serialized_end=818, + serialized_start=766, + serialized_end=832, ) @@ -356,8 +363,8 @@ _EVENTEDBOOLEANMESSAGE = _descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - serialized_start=820, - serialized_end=887, + serialized_start=834, + serialized_end=901, ) @@ -398,8 +405,8 @@ _EVENTEDNUMERICMESSAGE = _descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - serialized_start=889, - serialized_end=956, + serialized_start=903, + serialized_end=970, ) _VEHICLEMESSAGE.fields_by_name['type'].enum_type = _VEHICLEMESSAGE_TYPE diff --git a/openxc.proto b/openxc.proto index 5413343..1af8436 100644 --- a/openxc.proto +++ b/openxc.proto @@ -27,6 +27,7 @@ message VehicleMessage { message RawMessage { optional int32 bus = 1; optional uint32 message_id = 2; + optional uint64 data = 3; } message StringMessage {