summaryrefslogtreecommitdiffstats
path: root/gen
diff options
context:
space:
mode:
authorChristopher Peplin <chris.peplin@rhubarbtech.com>2014-01-17 14:43:05 -0500
committerChristopher Peplin <chris.peplin@rhubarbtech.com>2014-01-17 14:43:05 -0500
commitad6058e1fcaa780fe2f6537412fd6663df9f5cc6 (patch)
tree890c23b5df569a09d330428782a8e8c7fd17030b /gen
parent59f06d99530676c638495d9cde0748f7653e33e5 (diff)
Add Diagnostic type within VehicleMessage supertype.
Diffstat (limited to 'gen')
-rw-r--r--gen/cpp/openxc.pb11
-rw-r--r--gen/cpp/openxc.pb.c9
-rw-r--r--gen/cpp/openxc.pb.h12
-rw-r--r--gen/java/com/openxc/BinaryMessages.java238
-rw-r--r--gen/python/openxc_pb2.py36
5 files changed, 264 insertions, 42 deletions
diff --git a/gen/cpp/openxc.pb b/gen/cpp/openxc.pb
index 82bfdd4f..9d6271d1 100644
--- a/gen/cpp/openxc.pb
+++ b/gen/cpp/openxc.pb
@@ -1,14 +1,17 @@
-�
- openxc.protoopenxc"�
+�
+ openxc.protoopenxc"�
VehicleMessage)
type (2.openxc.VehicleMessage.Type'
raw_message ( 2.openxc.RawMessage5
-translated_message ( 2.openxc.TranslatedMessage"
+translated_message ( 2.openxc.TranslatedMessage5
+diagnostic_message ( 2.openxc.DiagnosticMessage"/
Type
RAW
-TRANSLATED";
+TRANSLATED
+
+DIAGNOSTIC";
RawMessage
bus (
diff --git a/gen/cpp/openxc.pb.c b/gen/cpp/openxc.pb.c
index 7e2d390d..3c3958f1 100644
--- a/gen/cpp/openxc.pb.c
+++ b/gen/cpp/openxc.pb.c
@@ -1,14 +1,15 @@
/* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.2.5 at Fri Jan 17 14:31:26 2014. */
+/* Generated by nanopb-0.2.5 at Fri Jan 17 14:40:08 2014. */
#include "openxc.pb.h"
-const pb_field_t openxc_VehicleMessage_fields[4] = {
+const pb_field_t openxc_VehicleMessage_fields[5] = {
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, translated_message, raw_message, &openxc_TranslatedMessage_fields),
+ PB_FIELD2( 4, MESSAGE , OPTIONAL, STATIC , OTHER, openxc_VehicleMessage, diagnostic_message, translated_message, &openxc_DiagnosticMessage_fields),
PB_LAST_FIELD
};
@@ -45,11 +46,11 @@ const pb_field_t openxc_TranslatedMessage_fields[9] = {
/* 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, translated_message) < 256), YOU_MUST_DEFINE_PB_FIELD_16BIT_FOR_MESSAGES_openxc_VehicleMessage_openxc_RawMessage_openxc_DiagnosticMessage_openxc_TranslatedMessage)
+STATIC_ASSERT((pb_membersize(openxc_VehicleMessage, raw_message) < 256 && pb_membersize(openxc_VehicleMessage, translated_message) < 256 && pb_membersize(openxc_VehicleMessage, diagnostic_message) < 256), YOU_MUST_DEFINE_PB_FIELD_16BIT_FOR_MESSAGES_openxc_VehicleMessage_openxc_RawMessage_openxc_DiagnosticMessage_openxc_TranslatedMessage)
#endif
#if !defined(PB_FIELD_32BIT)
-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_DiagnosticMessage_openxc_TranslatedMessage)
+STATIC_ASSERT((pb_membersize(openxc_VehicleMessage, raw_message) < 65536 && pb_membersize(openxc_VehicleMessage, translated_message) < 65536 && pb_membersize(openxc_VehicleMessage, diagnostic_message) < 65536), YOU_MUST_DEFINE_PB_FIELD_32BIT_FOR_MESSAGES_openxc_VehicleMessage_openxc_RawMessage_openxc_DiagnosticMessage_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 f5f117e4..95276b45 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.5 at Fri Jan 17 14:31:26 2014. */
+/* Generated by nanopb-0.2.5 at Fri Jan 17 14:40:08 2014. */
#ifndef _PB_OPENXC_PB_H_
#define _PB_OPENXC_PB_H_
@@ -12,7 +12,8 @@ extern "C" {
/* Enum definitions */
typedef enum _openxc_VehicleMessage_Type {
openxc_VehicleMessage_Type_RAW = 1,
- openxc_VehicleMessage_Type_TRANSLATED = 2
+ openxc_VehicleMessage_Type_TRANSLATED = 2,
+ openxc_VehicleMessage_Type_DIAGNOSTIC = 3
} openxc_VehicleMessage_Type;
typedef enum _openxc_TranslatedMessage_Type {
@@ -82,6 +83,8 @@ typedef struct _openxc_VehicleMessage {
openxc_RawMessage raw_message;
bool has_translated_message;
openxc_TranslatedMessage translated_message;
+ bool has_diagnostic_message;
+ openxc_DiagnosticMessage diagnostic_message;
} openxc_VehicleMessage;
/* Default values for struct fields */
@@ -108,15 +111,16 @@ typedef struct _openxc_VehicleMessage {
#define openxc_VehicleMessage_type_tag 1
#define openxc_VehicleMessage_raw_message_tag 2
#define openxc_VehicleMessage_translated_message_tag 3
+#define openxc_VehicleMessage_diagnostic_message_tag 4
/* Struct field encoding specification for nanopb */
-extern const pb_field_t openxc_VehicleMessage_fields[4];
+extern const pb_field_t openxc_VehicleMessage_fields[5];
extern const pb_field_t openxc_RawMessage_fields[4];
extern const pb_field_t openxc_DiagnosticMessage_fields[8];
extern const pb_field_t openxc_TranslatedMessage_fields[9];
/* Maximum encoded size of messages (where known) */
-#define openxc_VehicleMessage_size 373
+#define openxc_VehicleMessage_size 422
#define openxc_RawMessage_size 28
#define openxc_DiagnosticMessage_size 47
#define openxc_TranslatedMessage_size 334
diff --git a/gen/java/com/openxc/BinaryMessages.java b/gen/java/com/openxc/BinaryMessages.java
index 749ed5a8..495925b1 100644
--- a/gen/java/com/openxc/BinaryMessages.java
+++ b/gen/java/com/openxc/BinaryMessages.java
@@ -48,6 +48,20 @@ public final class BinaryMessages {
* <code>optional .openxc.TranslatedMessage translated_message = 3;</code>
*/
com.openxc.BinaryMessages.TranslatedMessageOrBuilder getTranslatedMessageOrBuilder();
+
+ // optional .openxc.DiagnosticMessage diagnostic_message = 4;
+ /**
+ * <code>optional .openxc.DiagnosticMessage diagnostic_message = 4;</code>
+ */
+ boolean hasDiagnosticMessage();
+ /**
+ * <code>optional .openxc.DiagnosticMessage diagnostic_message = 4;</code>
+ */
+ com.openxc.BinaryMessages.DiagnosticMessage getDiagnosticMessage();
+ /**
+ * <code>optional .openxc.DiagnosticMessage diagnostic_message = 4;</code>
+ */
+ com.openxc.BinaryMessages.DiagnosticMessageOrBuilder getDiagnosticMessageOrBuilder();
}
/**
* Protobuf type {@code openxc.VehicleMessage}
@@ -137,6 +151,19 @@ public final class BinaryMessages {
bitField0_ |= 0x00000004;
break;
}
+ case 34: {
+ com.openxc.BinaryMessages.DiagnosticMessage.Builder subBuilder = null;
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ subBuilder = diagnosticMessage_.toBuilder();
+ }
+ diagnosticMessage_ = input.readMessage(com.openxc.BinaryMessages.DiagnosticMessage.PARSER, extensionRegistry);
+ if (subBuilder != null) {
+ subBuilder.mergeFrom(diagnosticMessage_);
+ diagnosticMessage_ = subBuilder.buildPartial();
+ }
+ bitField0_ |= 0x00000008;
+ break;
+ }
}
}
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -189,6 +216,10 @@ public final class BinaryMessages {
* <code>TRANSLATED = 2;</code>
*/
TRANSLATED(1, 2),
+ /**
+ * <code>DIAGNOSTIC = 3;</code>
+ */
+ DIAGNOSTIC(2, 3),
;
/**
@@ -199,6 +230,10 @@ public final class BinaryMessages {
* <code>TRANSLATED = 2;</code>
*/
public static final int TRANSLATED_VALUE = 2;
+ /**
+ * <code>DIAGNOSTIC = 3;</code>
+ */
+ public static final int DIAGNOSTIC_VALUE = 3;
public final int getNumber() { return value; }
@@ -207,6 +242,7 @@ public final class BinaryMessages {
switch (value) {
case 1: return RAW;
case 2: return TRANSLATED;
+ case 3: return DIAGNOSTIC;
default: return null;
}
}
@@ -319,10 +355,33 @@ public final class BinaryMessages {
return translatedMessage_;
}
+ // optional .openxc.DiagnosticMessage diagnostic_message = 4;
+ public static final int DIAGNOSTIC_MESSAGE_FIELD_NUMBER = 4;
+ private com.openxc.BinaryMessages.DiagnosticMessage diagnosticMessage_;
+ /**
+ * <code>optional .openxc.DiagnosticMessage diagnostic_message = 4;</code>
+ */
+ public boolean hasDiagnosticMessage() {
+ return ((bitField0_ & 0x00000008) == 0x00000008);
+ }
+ /**
+ * <code>optional .openxc.DiagnosticMessage diagnostic_message = 4;</code>
+ */
+ public com.openxc.BinaryMessages.DiagnosticMessage getDiagnosticMessage() {
+ return diagnosticMessage_;
+ }
+ /**
+ * <code>optional .openxc.DiagnosticMessage diagnostic_message = 4;</code>
+ */
+ public com.openxc.BinaryMessages.DiagnosticMessageOrBuilder getDiagnosticMessageOrBuilder() {
+ return diagnosticMessage_;
+ }
+
private void initFields() {
type_ = com.openxc.BinaryMessages.VehicleMessage.Type.RAW;
rawMessage_ = com.openxc.BinaryMessages.RawMessage.getDefaultInstance();
translatedMessage_ = com.openxc.BinaryMessages.TranslatedMessage.getDefaultInstance();
+ diagnosticMessage_ = com.openxc.BinaryMessages.DiagnosticMessage.getDefaultInstance();
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
@@ -345,6 +404,9 @@ public final class BinaryMessages {
if (((bitField0_ & 0x00000004) == 0x00000004)) {
output.writeMessage(3, translatedMessage_);
}
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ output.writeMessage(4, diagnosticMessage_);
+ }
getUnknownFields().writeTo(output);
}
@@ -366,6 +428,10 @@ public final class BinaryMessages {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(3, translatedMessage_);
}
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeMessageSize(4, diagnosticMessage_);
+ }
size += getUnknownFields().getSerializedSize();
memoizedSerializedSize = size;
return size;
@@ -476,6 +542,7 @@ public final class BinaryMessages {
if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
getRawMessageFieldBuilder();
getTranslatedMessageFieldBuilder();
+ getDiagnosticMessageFieldBuilder();
}
}
private static Builder create() {
@@ -498,6 +565,12 @@ public final class BinaryMessages {
translatedMessageBuilder_.clear();
}
bitField0_ = (bitField0_ & ~0x00000004);
+ if (diagnosticMessageBuilder_ == null) {
+ diagnosticMessage_ = com.openxc.BinaryMessages.DiagnosticMessage.getDefaultInstance();
+ } else {
+ diagnosticMessageBuilder_.clear();
+ }
+ bitField0_ = (bitField0_ & ~0x00000008);
return this;
}
@@ -546,6 +619,14 @@ public final class BinaryMessages {
} else {
result.translatedMessage_ = translatedMessageBuilder_.build();
}
+ if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
+ to_bitField0_ |= 0x00000008;
+ }
+ if (diagnosticMessageBuilder_ == null) {
+ result.diagnosticMessage_ = diagnosticMessage_;
+ } else {
+ result.diagnosticMessage_ = diagnosticMessageBuilder_.build();
+ }
result.bitField0_ = to_bitField0_;
onBuilt();
return result;
@@ -571,6 +652,9 @@ public final class BinaryMessages {
if (other.hasTranslatedMessage()) {
mergeTranslatedMessage(other.getTranslatedMessage());
}
+ if (other.hasDiagnosticMessage()) {
+ mergeDiagnosticMessage(other.getDiagnosticMessage());
+ }
this.mergeUnknownFields(other.getUnknownFields());
return this;
}
@@ -868,6 +952,123 @@ public final class BinaryMessages {
return translatedMessageBuilder_;
}
+ // optional .openxc.DiagnosticMessage diagnostic_message = 4;
+ private com.openxc.BinaryMessages.DiagnosticMessage diagnosticMessage_ = com.openxc.BinaryMessages.DiagnosticMessage.getDefaultInstance();
+ private com.google.protobuf.SingleFieldBuilder<
+ com.openxc.BinaryMessages.DiagnosticMessage, com.openxc.BinaryMessages.DiagnosticMessage.Builder, com.openxc.BinaryMessages.DiagnosticMessageOrBuilder> diagnosticMessageBuilder_;
+ /**
+ * <code>optional .openxc.DiagnosticMessage diagnostic_message = 4;</code>
+ */
+ public boolean hasDiagnosticMessage() {
+ return ((bitField0_ & 0x00000008) == 0x00000008);
+ }
+ /**
+ * <code>optional .openxc.DiagnosticMessage diagnostic_message = 4;</code>
+ */
+ public com.openxc.BinaryMessages.DiagnosticMessage getDiagnosticMessage() {
+ if (diagnosticMessageBuilder_ == null) {
+ return diagnosticMessage_;
+ } else {
+ return diagnosticMessageBuilder_.getMessage();
+ }
+ }
+ /**
+ * <code>optional .openxc.DiagnosticMessage diagnostic_message = 4;</code>
+ */
+ public Builder setDiagnosticMessage(com.openxc.BinaryMessages.DiagnosticMessage value) {
+ if (diagnosticMessageBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ diagnosticMessage_ = value;
+ onChanged();
+ } else {
+ diagnosticMessageBuilder_.setMessage(value);
+ }
+ bitField0_ |= 0x00000008;
+ return this;
+ }
+ /**
+ * <code>optional .openxc.DiagnosticMessage diagnostic_message = 4;</code>
+ */
+ public Builder setDiagnosticMessage(
+ com.openxc.BinaryMessages.DiagnosticMessage.Builder builderForValue) {
+ if (diagnosticMessageBuilder_ == null) {
+ diagnosticMessage_ = builderForValue.build();
+ onChanged();
+ } else {
+ diagnosticMessageBuilder_.setMessage(builderForValue.build());
+ }
+ bitField0_ |= 0x00000008;
+ return this;
+ }
+ /**
+ * <code>optional .openxc.DiagnosticMessage diagnostic_message = 4;</code>
+ */
+ public Builder mergeDiagnosticMessage(com.openxc.BinaryMessages.DiagnosticMessage value) {
+ if (diagnosticMessageBuilder_ == null) {
+ if (((bitField0_ & 0x00000008) == 0x00000008) &&
+ diagnosticMessage_ != com.openxc.BinaryMessages.DiagnosticMessage.getDefaultInstance()) {
+ diagnosticMessage_ =
+ com.openxc.BinaryMessages.DiagnosticMessage.newBuilder(diagnosticMessage_).mergeFrom(value).buildPartial();
+ } else {
+ diagnosticMessage_ = value;
+ }
+ onChanged();
+ } else {
+ diagnosticMessageBuilder_.mergeFrom(value);
+ }
+ bitField0_ |= 0x00000008;
+ return this;
+ }
+ /**
+ * <code>optional .openxc.DiagnosticMessage diagnostic_message = 4;</code>
+ */
+ public Builder clearDiagnosticMessage() {
+ if (diagnosticMessageBuilder_ == null) {
+ diagnosticMessage_ = com.openxc.BinaryMessages.DiagnosticMessage.getDefaultInstance();
+ onChanged();
+ } else {
+ diagnosticMessageBuilder_.clear();
+ }
+ bitField0_ = (bitField0_ & ~0x00000008);
+ return this;
+ }
+ /**
+ * <code>optional .openxc.DiagnosticMessage diagnostic_message = 4;</code>
+ */
+ public com.openxc.BinaryMessages.DiagnosticMessage.Builder getDiagnosticMessageBuilder() {
+ bitField0_ |= 0x00000008;
+ onChanged();
+ return getDiagnosticMessageFieldBuilder().getBuilder();
+ }
+ /**
+ * <code>optional .openxc.DiagnosticMessage diagnostic_message = 4;</code>
+ */
+ public com.openxc.BinaryMessages.DiagnosticMessageOrBuilder getDiagnosticMessageOrBuilder() {
+ if (diagnosticMessageBuilder_ != null) {
+ return diagnosticMessageBuilder_.getMessageOrBuilder();
+ } else {
+ return diagnosticMessage_;
+ }
+ }
+ /**
+ * <code>optional .openxc.DiagnosticMessage diagnostic_message = 4;</code>
+ */
+ private com.google.protobuf.SingleFieldBuilder<
+ com.openxc.BinaryMessages.DiagnosticMessage, com.openxc.BinaryMessages.DiagnosticMessage.Builder, com.openxc.BinaryMessages.DiagnosticMessageOrBuilder>
+ getDiagnosticMessageFieldBuilder() {
+ if (diagnosticMessageBuilder_ == null) {
+ diagnosticMessageBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ com.openxc.BinaryMessages.DiagnosticMessage, com.openxc.BinaryMessages.DiagnosticMessage.Builder, com.openxc.BinaryMessages.DiagnosticMessageOrBuilder>(
+ diagnosticMessage_,
+ getParentForChildren(),
+ isClean());
+ diagnosticMessage_ = null;
+ }
+ return diagnosticMessageBuilder_;
+ }
+
// @@protoc_insertion_point(builder_scope:openxc.VehicleMessage)
}
@@ -3706,26 +3907,27 @@ public final class BinaryMessages {
descriptor;
static {
java.lang.String[] descriptorData = {
- "\n\014openxc.proto\022\006openxc\"\274\001\n\016VehicleMessag" +
+ "\n\014openxc.proto\022\006openxc\"\203\002\n\016VehicleMessag" +
"e\022)\n\004type\030\001 \001(\0162\033.openxc.VehicleMessage." +
"Type\022\'\n\013raw_message\030\002 \001(\0132\022.openxc.RawMe" +
"ssage\0225\n\022translated_message\030\003 \001(\0132\031.open" +
- "xc.TranslatedMessage\"\037\n\004Type\022\007\n\003RAW\020\001\022\016\n" +
- "\nTRANSLATED\020\002\";\n\nRawMessage\022\013\n\003bus\030\001 \001(\005" +
- "\022\022\n\nmessage_id\030\002 \001(\r\022\014\n\004data\030\003 \001(\004\"\221\001\n\021D" +
- "iagnosticMessage\022\013\n\003bus\030\001 \001(\005\022\022\n\nmessage" +
- "_id\030\002 \001(\r\022\014\n\004mode\030\003 \001(\r\022\013\n\003pid\030\004 \001(\r\022\017\n\007" +
- "success\030\005 \001(\010\022\036\n\026negative_response_code\030",
- "\006 \001(\r\022\017\n\007payload\030\007 \001(\014\"\265\002\n\021TranslatedMes" +
- "sage\022,\n\004type\030\001 \001(\0162\036.openxc.TranslatedMe" +
- "ssage.Type\022\014\n\004name\030\002 \001(\t\022\024\n\014string_value" +
- "\030\003 \001(\t\022\025\n\rnumeric_value\030\004 \001(\001\022\025\n\rboolean" +
- "_value\030\005 \001(\010\022\024\n\014string_event\030\006 \001(\t\022\025\n\rnu" +
- "meric_event\030\007 \001(\001\022\025\n\rboolean_event\030\010 \001(\010" +
- "\"\\\n\004Type\022\n\n\006STRING\020\001\022\007\n\003NUM\020\002\022\010\n\004BOOL\020\003\022" +
- "\022\n\016EVENTED_STRING\020\004\022\017\n\013EVENTED_NUM\020\005\022\020\n\014" +
- "EVENTED_BOOL\020\006B\034\n\ncom.openxcB\016BinaryMess" +
- "ages"
+ "xc.TranslatedMessage\0225\n\022diagnostic_messa" +
+ "ge\030\004 \001(\0132\031.openxc.DiagnosticMessage\"/\n\004T" +
+ "ype\022\007\n\003RAW\020\001\022\016\n\nTRANSLATED\020\002\022\016\n\nDIAGNOST" +
+ "IC\020\003\";\n\nRawMessage\022\013\n\003bus\030\001 \001(\005\022\022\n\nmessa" +
+ "ge_id\030\002 \001(\r\022\014\n\004data\030\003 \001(\004\"\221\001\n\021Diagnostic" +
+ "Message\022\013\n\003bus\030\001 \001(\005\022\022\n\nmessage_id\030\002 \001(\r",
+ "\022\014\n\004mode\030\003 \001(\r\022\013\n\003pid\030\004 \001(\r\022\017\n\007success\030\005" +
+ " \001(\010\022\036\n\026negative_response_code\030\006 \001(\r\022\017\n\007" +
+ "payload\030\007 \001(\014\"\265\002\n\021TranslatedMessage\022,\n\004t" +
+ "ype\030\001 \001(\0162\036.openxc.TranslatedMessage.Typ" +
+ "e\022\014\n\004name\030\002 \001(\t\022\024\n\014string_value\030\003 \001(\t\022\025\n" +
+ "\rnumeric_value\030\004 \001(\001\022\025\n\rboolean_value\030\005 " +
+ "\001(\010\022\024\n\014string_event\030\006 \001(\t\022\025\n\rnumeric_eve" +
+ "nt\030\007 \001(\001\022\025\n\rboolean_event\030\010 \001(\010\"\\\n\004Type\022" +
+ "\n\n\006STRING\020\001\022\007\n\003NUM\020\002\022\010\n\004BOOL\020\003\022\022\n\016EVENTE" +
+ "D_STRING\020\004\022\017\n\013EVENTED_NUM\020\005\022\020\n\014EVENTED_B",
+ "OOL\020\006B\034\n\ncom.openxcB\016BinaryMessages"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -3737,7 +3939,7 @@ public final class BinaryMessages {
internal_static_openxc_VehicleMessage_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_openxc_VehicleMessage_descriptor,
- new java.lang.String[] { "Type", "RawMessage", "TranslatedMessage", });
+ new java.lang.String[] { "Type", "RawMessage", "TranslatedMessage", "DiagnosticMessage", });
internal_static_openxc_RawMessage_descriptor =
getDescriptor().getMessageTypes().get(1);
internal_static_openxc_RawMessage_fieldAccessorTable = new
diff --git a/gen/python/openxc_pb2.py b/gen/python/openxc_pb2.py
index 62918919..56d1539e 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\"\xbc\x01\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\x35\n\x12translated_message\x18\x03 \x01(\x0b\x32\x19.openxc.TranslatedMessage\"\x1f\n\x04Type\x12\x07\n\x03RAW\x10\x01\x12\x0e\n\nTRANSLATED\x10\x02\";\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\"\x91\x01\n\x11\x44iagnosticMessage\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x12\n\nmessage_id\x18\x02 \x01(\r\x12\x0c\n\x04mode\x18\x03 \x01(\r\x12\x0b\n\x03pid\x18\x04 \x01(\r\x12\x0f\n\x07success\x18\x05 \x01(\x08\x12\x1e\n\x16negative_response_code\x18\x06 \x01(\r\x12\x0f\n\x07payload\x18\x07 \x01(\x0c\"\xb5\x02\n\x11TranslatedMessage\x12,\n\x04type\x18\x01 \x01(\x0e\x32\x1e.openxc.TranslatedMessage.Type\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x14\n\x0cstring_value\x18\x03 \x01(\t\x12\x15\n\rnumeric_value\x18\x04 \x01(\x01\x12\x15\n\rboolean_value\x18\x05 \x01(\x08\x12\x14\n\x0cstring_event\x18\x06 \x01(\t\x12\x15\n\rnumeric_event\x18\x07 \x01(\x01\x12\x15\n\rboolean_event\x18\x08 \x01(\x08\"\\\n\x04Type\x12\n\n\x06STRING\x10\x01\x12\x07\n\x03NUM\x10\x02\x12\x08\n\x04\x42OOL\x10\x03\x12\x12\n\x0e\x45VENTED_STRING\x10\x04\x12\x0f\n\x0b\x45VENTED_NUM\x10\x05\x12\x10\n\x0c\x45VENTED_BOOL\x10\x06\x42\x1c\n\ncom.openxcB\x0e\x42inaryMessages')
+ serialized_pb='\n\x0copenxc.proto\x12\x06openxc\"\x83\x02\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\x35\n\x12translated_message\x18\x03 \x01(\x0b\x32\x19.openxc.TranslatedMessage\x12\x35\n\x12\x64iagnostic_message\x18\x04 \x01(\x0b\x32\x19.openxc.DiagnosticMessage\"/\n\x04Type\x12\x07\n\x03RAW\x10\x01\x12\x0e\n\nTRANSLATED\x10\x02\x12\x0e\n\nDIAGNOSTIC\x10\x03\";\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\"\x91\x01\n\x11\x44iagnosticMessage\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x12\n\nmessage_id\x18\x02 \x01(\r\x12\x0c\n\x04mode\x18\x03 \x01(\r\x12\x0b\n\x03pid\x18\x04 \x01(\r\x12\x0f\n\x07success\x18\x05 \x01(\x08\x12\x1e\n\x16negative_response_code\x18\x06 \x01(\r\x12\x0f\n\x07payload\x18\x07 \x01(\x0c\"\xb5\x02\n\x11TranslatedMessage\x12,\n\x04type\x18\x01 \x01(\x0e\x32\x1e.openxc.TranslatedMessage.Type\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x14\n\x0cstring_value\x18\x03 \x01(\t\x12\x15\n\rnumeric_value\x18\x04 \x01(\x01\x12\x15\n\rboolean_value\x18\x05 \x01(\x08\x12\x14\n\x0cstring_event\x18\x06 \x01(\t\x12\x15\n\rnumeric_event\x18\x07 \x01(\x01\x12\x15\n\rboolean_event\x18\x08 \x01(\x08\"\\\n\x04Type\x12\n\n\x06STRING\x10\x01\x12\x07\n\x03NUM\x10\x02\x12\x08\n\x04\x42OOL\x10\x03\x12\x12\n\x0e\x45VENTED_STRING\x10\x04\x12\x0f\n\x0b\x45VENTED_NUM\x10\x05\x12\x10\n\x0c\x45VENTED_BOOL\x10\x06\x42\x1c\n\ncom.openxcB\x0e\x42inaryMessages')
@@ -31,11 +31,15 @@ _VEHICLEMESSAGE_TYPE = _descriptor.EnumDescriptor(
name='TRANSLATED', index=1, number=2,
options=None,
type=None),
+ _descriptor.EnumValueDescriptor(
+ name='DIAGNOSTIC', index=2, number=3,
+ options=None,
+ type=None),
],
containing_type=None,
options=None,
- serialized_start=182,
- serialized_end=213,
+ serialized_start=237,
+ serialized_end=284,
)
_TRANSLATEDMESSAGE_TYPE = _descriptor.EnumDescriptor(
@@ -71,8 +75,8 @@ _TRANSLATEDMESSAGE_TYPE = _descriptor.EnumDescriptor(
],
containing_type=None,
options=None,
- serialized_start=642,
- serialized_end=734,
+ serialized_start=713,
+ serialized_end=805,
)
@@ -104,6 +108,13 @@ _VEHICLEMESSAGE = _descriptor.Descriptor(
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
options=None),
+ _descriptor.FieldDescriptor(
+ name='diagnostic_message', full_name='openxc.VehicleMessage.diagnostic_message', index=3,
+ number=4, type=11, cpp_type=10, label=1,
+ has_default_value=False, default_value=None,
+ message_type=None, enum_type=None, containing_type=None,
+ is_extension=False, extension_scope=None,
+ options=None),
],
extensions=[
],
@@ -115,7 +126,7 @@ _VEHICLEMESSAGE = _descriptor.Descriptor(
is_extendable=False,
extension_ranges=[],
serialized_start=25,
- serialized_end=213,
+ serialized_end=284,
)
@@ -156,8 +167,8 @@ _RAWMESSAGE = _descriptor.Descriptor(
options=None,
is_extendable=False,
extension_ranges=[],
- serialized_start=215,
- serialized_end=274,
+ serialized_start=286,
+ serialized_end=345,
)
@@ -226,8 +237,8 @@ _DIAGNOSTICMESSAGE = _descriptor.Descriptor(
options=None,
is_extendable=False,
extension_ranges=[],
- serialized_start=277,
- serialized_end=422,
+ serialized_start=348,
+ serialized_end=493,
)
@@ -304,13 +315,14 @@ _TRANSLATEDMESSAGE = _descriptor.Descriptor(
options=None,
is_extendable=False,
extension_ranges=[],
- serialized_start=425,
- serialized_end=734,
+ serialized_start=496,
+ serialized_end=805,
)
_VEHICLEMESSAGE.fields_by_name['type'].enum_type = _VEHICLEMESSAGE_TYPE
_VEHICLEMESSAGE.fields_by_name['raw_message'].message_type = _RAWMESSAGE
_VEHICLEMESSAGE.fields_by_name['translated_message'].message_type = _TRANSLATEDMESSAGE
+_VEHICLEMESSAGE.fields_by_name['diagnostic_message'].message_type = _DIAGNOSTICMESSAGE
_VEHICLEMESSAGE_TYPE.containing_type = _VEHICLEMESSAGE;
_TRANSLATEDMESSAGE.fields_by_name['type'].enum_type = _TRANSLATEDMESSAGE_TYPE
_TRANSLATEDMESSAGE_TYPE.containing_type = _TRANSLATEDMESSAGE;