Add a value field to diagnostic responses for parsed payloads.
[apps/agl-service-can-low-level.git] / gen / java / com / openxc / BinaryMessages.java
index 7410c63..3393605 100644 (file)
@@ -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)
     }
 
@@ -902,15 +1103,15 @@ public final class BinaryMessages {
      */
     int getMessageId();
 
-    // optional uint64 data = 3;
+    // optional bytes data = 3;
     /**
-     * <code>optional uint64 data = 3;</code>
+     * <code>optional bytes data = 3;</code>
      */
     boolean hasData();
     /**
-     * <code>optional uint64 data = 3;</code>
+     * <code>optional bytes data = 3;</code>
      */
-    long getData();
+    com.google.protobuf.ByteString getData();
   }
   /**
    * Protobuf type {@code openxc.RawMessage}
@@ -973,9 +1174,9 @@ public final class BinaryMessages {
               messageId_ = input.readUInt32();
               break;
             }
-            case 24: {
+            case 26: {
               bitField0_ |= 0x00000004;
-              data_ = input.readUInt64();
+              data_ = input.readBytes();
               break;
             }
           }
@@ -1050,26 +1251,26 @@ public final class BinaryMessages {
       return messageId_;
     }
 
-    // optional uint64 data = 3;
+    // optional bytes data = 3;
     public static final int DATA_FIELD_NUMBER = 3;
-    private long data_;
+    private com.google.protobuf.ByteString data_;
     /**
-     * <code>optional uint64 data = 3;</code>
+     * <code>optional bytes data = 3;</code>
      */
     public boolean hasData() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
     /**
-     * <code>optional uint64 data = 3;</code>
+     * <code>optional bytes data = 3;</code>
      */
-    public long getData() {
+    public com.google.protobuf.ByteString getData() {
       return data_;
     }
 
     private void initFields() {
       bus_ = 0;
       messageId_ = 0;
-      data_ = 0L;
+      data_ = com.google.protobuf.ByteString.EMPTY;
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -1090,7 +1291,7 @@ public final class BinaryMessages {
         output.writeUInt32(2, messageId_);
       }
       if (((bitField0_ & 0x00000004) == 0x00000004)) {
-        output.writeUInt64(3, data_);
+        output.writeBytes(3, data_);
       }
       getUnknownFields().writeTo(output);
     }
@@ -1111,7 +1312,7 @@ public final class BinaryMessages {
       }
       if (((bitField0_ & 0x00000004) == 0x00000004)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(3, data_);
+          .computeBytesSize(3, data_);
       }
       size += getUnknownFields().getSerializedSize();
       memoizedSerializedSize = size;
@@ -1233,7 +1434,7 @@ public final class BinaryMessages {
         bitField0_ = (bitField0_ & ~0x00000001);
         messageId_ = 0;
         bitField0_ = (bitField0_ & ~0x00000002);
-        data_ = 0L;
+        data_ = com.google.protobuf.ByteString.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
@@ -1393,35 +1594,38 @@ public final class BinaryMessages {
         return this;
       }
 
-      // optional uint64 data = 3;
-      private long data_ ;
+      // optional bytes data = 3;
+      private com.google.protobuf.ByteString data_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>optional uint64 data = 3;</code>
+       * <code>optional bytes data = 3;</code>
        */
       public boolean hasData() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * <code>optional uint64 data = 3;</code>
+       * <code>optional bytes data = 3;</code>
        */
-      public long getData() {
+      public com.google.protobuf.ByteString getData() {
         return data_;
       }
       /**
-       * <code>optional uint64 data = 3;</code>
+       * <code>optional bytes data = 3;</code>
        */
-      public Builder setData(long value) {
-        bitField0_ |= 0x00000004;
+      public Builder setData(com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000004;
         data_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>optional uint64 data = 3;</code>
+       * <code>optional bytes data = 3;</code>
        */
       public Builder clearData() {
         bitField0_ = (bitField0_ & ~0x00000004);
-        data_ = 0L;
+        data_ = getDefaultInstance().getData();
         onChanged();
         return this;
       }
@@ -1437,113 +1641,118 @@ public final class BinaryMessages {
     // @@protoc_insertion_point(class_scope:openxc.RawMessage)
   }
 
-  public interface TranslatedMessageOrBuilder
+  public interface DiagnosticMessageOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // optional string name = 1;
+    // optional int32 bus = 1;
     /**
-     * <code>optional string name = 1;</code>
+     * <code>optional int32 bus = 1;</code>
      */
-    boolean hasName();
+    boolean hasBus();
     /**
-     * <code>optional string name = 1;</code>
+     * <code>optional int32 bus = 1;</code>
      */
-    java.lang.String getName();
+    int getBus();
+
+    // optional uint32 message_id = 2;
     /**
-     * <code>optional string name = 1;</code>
+     * <code>optional uint32 message_id = 2;</code>
      */
-    com.google.protobuf.ByteString
-        getNameBytes();
-
-    // optional string string_value = 2;
+    boolean hasMessageId();
     /**
-     * <code>optional string string_value = 2;</code>
+     * <code>optional uint32 message_id = 2;</code>
      */
-    boolean hasStringValue();
+    int getMessageId();
+
+    // optional uint32 mode = 3;
     /**
-     * <code>optional string string_value = 2;</code>
+     * <code>optional uint32 mode = 3;</code>
      */
-    java.lang.String getStringValue();
+    boolean hasMode();
     /**
-     * <code>optional string string_value = 2;</code>
+     * <code>optional uint32 mode = 3;</code>
      */
-    com.google.protobuf.ByteString
-        getStringValueBytes();
+    int getMode();
 
-    // optional double numerical_value = 3;
+    // optional uint32 pid = 4;
     /**
-     * <code>optional double numerical_value = 3;</code>
+     * <code>optional uint32 pid = 4;</code>
      */
-    boolean hasNumericalValue();
+    boolean hasPid();
     /**
-     * <code>optional double numerical_value = 3;</code>
+     * <code>optional uint32 pid = 4;</code>
      */
-    double getNumericalValue();
+    int getPid();
 
-    // optional bool boolean_value = 4;
+    // optional bool success = 5;
     /**
-     * <code>optional bool boolean_value = 4;</code>
+     * <code>optional bool success = 5;</code>
      */
-    boolean hasBooleanValue();
+    boolean hasSuccess();
     /**
-     * <code>optional bool boolean_value = 4;</code>
+     * <code>optional bool success = 5;</code>
      */
-    boolean getBooleanValue();
+    boolean getSuccess();
 
-    // optional string string_event = 5;
-    /**
-     * <code>optional string string_event = 5;</code>
-     */
-    boolean hasStringEvent();
+    // optional uint32 negative_response_code = 6;
     /**
-     * <code>optional string string_event = 5;</code>
+     * <code>optional uint32 negative_response_code = 6;</code>
      */
-    java.lang.String getStringEvent();
+    boolean hasNegativeResponseCode();
     /**
-     * <code>optional string string_event = 5;</code>
+     * <code>optional uint32 negative_response_code = 6;</code>
      */
-    com.google.protobuf.ByteString
-        getStringEventBytes();
+    int getNegativeResponseCode();
 
-    // optional double numerical_event = 6;
+    // optional bytes payload = 7;
     /**
-     * <code>optional double numerical_event = 6;</code>
+     * <code>optional bytes payload = 7;</code>
+     *
+     * <pre>
+     * TODO we are capping this at 8 bytes for now - need to change when we
+     * support multi-frame responses
+     * </pre>
      */
-    boolean hasNumericalEvent();
+    boolean hasPayload();
     /**
-     * <code>optional double numerical_event = 6;</code>
+     * <code>optional bytes payload = 7;</code>
+     *
+     * <pre>
+     * TODO we are capping this at 8 bytes for now - need to change when we
+     * support multi-frame responses
+     * </pre>
      */
-    double getNumericalEvent();
+    com.google.protobuf.ByteString getPayload();
 
-    // optional bool boolean_event = 7;
+    // optional double value = 8;
     /**
-     * <code>optional bool boolean_event = 7;</code>
+     * <code>optional double value = 8;</code>
      */
-    boolean hasBooleanEvent();
+    boolean hasValue();
     /**
-     * <code>optional bool boolean_event = 7;</code>
+     * <code>optional double value = 8;</code>
      */
-    boolean getBooleanEvent();
+    double getValue();
   }
   /**
-   * Protobuf type {@code openxc.TranslatedMessage}
+   * Protobuf type {@code openxc.DiagnosticMessage}
    */
-  public static final class TranslatedMessage extends
+  public static final class DiagnosticMessage extends
       com.google.protobuf.GeneratedMessage
-      implements TranslatedMessageOrBuilder {
-    // Use TranslatedMessage.newBuilder() to construct.
-    private TranslatedMessage(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+      implements DiagnosticMessageOrBuilder {
+    // Use DiagnosticMessage.newBuilder() to construct.
+    private DiagnosticMessage(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
       this.unknownFields = builder.getUnknownFields();
     }
-    private TranslatedMessage(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+    private DiagnosticMessage(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
 
-    private static final TranslatedMessage defaultInstance;
-    public static TranslatedMessage getDefaultInstance() {
+    private static final DiagnosticMessage defaultInstance;
+    public static DiagnosticMessage getDefaultInstance() {
       return defaultInstance;
     }
 
-    public TranslatedMessage getDefaultInstanceForType() {
+    public DiagnosticMessage getDefaultInstanceForType() {
       return defaultInstance;
     }
 
@@ -1553,7 +1762,7 @@ public final class BinaryMessages {
         getUnknownFields() {
       return this.unknownFields;
     }
-    private TranslatedMessage(
+    private DiagnosticMessage(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -1576,39 +1785,44 @@ public final class BinaryMessages {
               }
               break;
             }
-            case 10: {
+            case 8: {
               bitField0_ |= 0x00000001;
-              name_ = input.readBytes();
+              bus_ = input.readInt32();
               break;
             }
-            case 18: {
+            case 16: {
               bitField0_ |= 0x00000002;
-              stringValue_ = input.readBytes();
+              messageId_ = input.readUInt32();
               break;
             }
-            case 25: {
+            case 24: {
               bitField0_ |= 0x00000004;
-              numericalValue_ = input.readDouble();
+              mode_ = input.readUInt32();
               break;
             }
             case 32: {
               bitField0_ |= 0x00000008;
-              booleanValue_ = input.readBool();
+              pid_ = input.readUInt32();
               break;
             }
-            case 42: {
+            case 40: {
               bitField0_ |= 0x00000010;
-              stringEvent_ = input.readBytes();
+              success_ = input.readBool();
               break;
             }
-            case 49: {
+            case 48: {
               bitField0_ |= 0x00000020;
-              numericalEvent_ = input.readDouble();
+              negativeResponseCode_ = input.readUInt32();
               break;
             }
-            case 56: {
+            case 58: {
               bitField0_ |= 0x00000040;
-              booleanEvent_ = input.readBool();
+              payload_ = input.readBytes();
+              break;
+            }
+            case 65: {
+              bitField0_ |= 0x00000080;
+              value_ = input.readDouble();
               break;
             }
           }
@@ -1625,161 +1839,1312 @@ public final class BinaryMessages {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.openxc.BinaryMessages.internal_static_openxc_TranslatedMessage_descriptor;
+      return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticMessage_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.openxc.BinaryMessages.internal_static_openxc_TranslatedMessage_fieldAccessorTable
+      return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticMessage_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.openxc.BinaryMessages.TranslatedMessage.class, com.openxc.BinaryMessages.TranslatedMessage.Builder.class);
+              com.openxc.BinaryMessages.DiagnosticMessage.class, com.openxc.BinaryMessages.DiagnosticMessage.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<TranslatedMessage> PARSER =
-        new com.google.protobuf.AbstractParser<TranslatedMessage>() {
-      public TranslatedMessage parsePartialFrom(
+    public static com.google.protobuf.Parser<DiagnosticMessage> PARSER =
+        new com.google.protobuf.AbstractParser<DiagnosticMessage>() {
+      public DiagnosticMessage parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new TranslatedMessage(input, extensionRegistry);
+        return new DiagnosticMessage(input, extensionRegistry);
       }
     };
 
     @java.lang.Override
-    public com.google.protobuf.Parser<TranslatedMessage> getParserForType() {
+    public com.google.protobuf.Parser<DiagnosticMessage> getParserForType() {
       return PARSER;
     }
 
     private int bitField0_;
-    // optional string name = 1;
-    public static final int NAME_FIELD_NUMBER = 1;
-    private java.lang.Object name_;
+    // optional int32 bus = 1;
+    public static final int BUS_FIELD_NUMBER = 1;
+    private int bus_;
     /**
-     * <code>optional string name = 1;</code>
+     * <code>optional int32 bus = 1;</code>
      */
-    public boolean hasName() {
+    public boolean hasBus() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * <code>optional string name = 1;</code>
-     */
-    public java.lang.String getName() {
-      java.lang.Object ref = name_;
-      if (ref instanceof java.lang.String) {
-        return (java.lang.String) ref;
-      } else {
-        com.google.protobuf.ByteString bs = 
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        if (bs.isValidUtf8()) {
-          name_ = s;
-        }
-        return s;
-      }
-    }
-    /**
-     * <code>optional string name = 1;</code>
+     * <code>optional int32 bus = 1;</code>
      */
-    public com.google.protobuf.ByteString
-        getNameBytes() {
-      java.lang.Object ref = name_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        name_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
+    public int getBus() {
+      return bus_;
     }
 
-    // optional string string_value = 2;
-    public static final int STRING_VALUE_FIELD_NUMBER = 2;
-    private java.lang.Object stringValue_;
+    // optional uint32 message_id = 2;
+    public static final int MESSAGE_ID_FIELD_NUMBER = 2;
+    private int messageId_;
     /**
-     * <code>optional string string_value = 2;</code>
+     * <code>optional uint32 message_id = 2;</code>
      */
-    public boolean hasStringValue() {
+    public boolean hasMessageId() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * <code>optional string string_value = 2;</code>
-     */
-    public java.lang.String getStringValue() {
-      java.lang.Object ref = stringValue_;
-      if (ref instanceof java.lang.String) {
-        return (java.lang.String) ref;
-      } else {
-        com.google.protobuf.ByteString bs = 
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        if (bs.isValidUtf8()) {
-          stringValue_ = s;
-        }
-        return s;
-      }
-    }
-    /**
-     * <code>optional string string_value = 2;</code>
+     * <code>optional uint32 message_id = 2;</code>
      */
-    public com.google.protobuf.ByteString
-        getStringValueBytes() {
-      java.lang.Object ref = stringValue_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        stringValue_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
+    public int getMessageId() {
+      return messageId_;
     }
 
-    // optional double numerical_value = 3;
-    public static final int NUMERICAL_VALUE_FIELD_NUMBER = 3;
-    private double numericalValue_;
+    // optional uint32 mode = 3;
+    public static final int MODE_FIELD_NUMBER = 3;
+    private int mode_;
     /**
-     * <code>optional double numerical_value = 3;</code>
+     * <code>optional uint32 mode = 3;</code>
      */
-    public boolean hasNumericalValue() {
+    public boolean hasMode() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
     /**
-     * <code>optional double numerical_value = 3;</code>
+     * <code>optional uint32 mode = 3;</code>
      */
-    public double getNumericalValue() {
-      return numericalValue_;
+    public int getMode() {
+      return mode_;
     }
 
-    // optional bool boolean_value = 4;
-    public static final int BOOLEAN_VALUE_FIELD_NUMBER = 4;
-    private boolean booleanValue_;
+    // optional uint32 pid = 4;
+    public static final int PID_FIELD_NUMBER = 4;
+    private int pid_;
     /**
-     * <code>optional bool boolean_value = 4;</code>
+     * <code>optional uint32 pid = 4;</code>
      */
-    public boolean hasBooleanValue() {
+    public boolean hasPid() {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
     /**
-     * <code>optional bool boolean_value = 4;</code>
+     * <code>optional uint32 pid = 4;</code>
      */
-    public boolean getBooleanValue() {
-      return booleanValue_;
+    public int getPid() {
+      return pid_;
     }
 
-    // optional string string_event = 5;
-    public static final int STRING_EVENT_FIELD_NUMBER = 5;
+    // optional bool success = 5;
+    public static final int SUCCESS_FIELD_NUMBER = 5;
+    private boolean success_;
+    /**
+     * <code>optional bool success = 5;</code>
+     */
+    public boolean hasSuccess() {
+      return ((bitField0_ & 0x00000010) == 0x00000010);
+    }
+    /**
+     * <code>optional bool success = 5;</code>
+     */
+    public boolean getSuccess() {
+      return success_;
+    }
+
+    // optional uint32 negative_response_code = 6;
+    public static final int NEGATIVE_RESPONSE_CODE_FIELD_NUMBER = 6;
+    private int negativeResponseCode_;
+    /**
+     * <code>optional uint32 negative_response_code = 6;</code>
+     */
+    public boolean hasNegativeResponseCode() {
+      return ((bitField0_ & 0x00000020) == 0x00000020);
+    }
+    /**
+     * <code>optional uint32 negative_response_code = 6;</code>
+     */
+    public int getNegativeResponseCode() {
+      return negativeResponseCode_;
+    }
+
+    // optional bytes payload = 7;
+    public static final int PAYLOAD_FIELD_NUMBER = 7;
+    private com.google.protobuf.ByteString payload_;
+    /**
+     * <code>optional bytes payload = 7;</code>
+     *
+     * <pre>
+     * TODO we are capping this at 8 bytes for now - need to change when we
+     * support multi-frame responses
+     * </pre>
+     */
+    public boolean hasPayload() {
+      return ((bitField0_ & 0x00000040) == 0x00000040);
+    }
+    /**
+     * <code>optional bytes payload = 7;</code>
+     *
+     * <pre>
+     * TODO we are capping this at 8 bytes for now - need to change when we
+     * support multi-frame responses
+     * </pre>
+     */
+    public com.google.protobuf.ByteString getPayload() {
+      return payload_;
+    }
+
+    // optional double value = 8;
+    public static final int VALUE_FIELD_NUMBER = 8;
+    private double value_;
+    /**
+     * <code>optional double value = 8;</code>
+     */
+    public boolean hasValue() {
+      return ((bitField0_ & 0x00000080) == 0x00000080);
+    }
+    /**
+     * <code>optional double value = 8;</code>
+     */
+    public double getValue() {
+      return value_;
+    }
+
+    private void initFields() {
+      bus_ = 0;
+      messageId_ = 0;
+      mode_ = 0;
+      pid_ = 0;
+      success_ = false;
+      negativeResponseCode_ = 0;
+      payload_ = com.google.protobuf.ByteString.EMPTY;
+      value_ = 0D;
+    }
+    private byte memoizedIsInitialized = -1;
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized != -1) return isInitialized == 1;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      getSerializedSize();
+      if (((bitField0_ & 0x00000001) == 0x00000001)) {
+        output.writeInt32(1, bus_);
+      }
+      if (((bitField0_ & 0x00000002) == 0x00000002)) {
+        output.writeUInt32(2, messageId_);
+      }
+      if (((bitField0_ & 0x00000004) == 0x00000004)) {
+        output.writeUInt32(3, mode_);
+      }
+      if (((bitField0_ & 0x00000008) == 0x00000008)) {
+        output.writeUInt32(4, pid_);
+      }
+      if (((bitField0_ & 0x00000010) == 0x00000010)) {
+        output.writeBool(5, success_);
+      }
+      if (((bitField0_ & 0x00000020) == 0x00000020)) {
+        output.writeUInt32(6, negativeResponseCode_);
+      }
+      if (((bitField0_ & 0x00000040) == 0x00000040)) {
+        output.writeBytes(7, payload_);
+      }
+      if (((bitField0_ & 0x00000080) == 0x00000080)) {
+        output.writeDouble(8, value_);
+      }
+      getUnknownFields().writeTo(output);
+    }
+
+    private int memoizedSerializedSize = -1;
+    public int getSerializedSize() {
+      int size = memoizedSerializedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (((bitField0_ & 0x00000001) == 0x00000001)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(1, bus_);
+      }
+      if (((bitField0_ & 0x00000002) == 0x00000002)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(2, messageId_);
+      }
+      if (((bitField0_ & 0x00000004) == 0x00000004)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(3, mode_);
+      }
+      if (((bitField0_ & 0x00000008) == 0x00000008)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(4, pid_);
+      }
+      if (((bitField0_ & 0x00000010) == 0x00000010)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(5, success_);
+      }
+      if (((bitField0_ & 0x00000020) == 0x00000020)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(6, negativeResponseCode_);
+      }
+      if (((bitField0_ & 0x00000040) == 0x00000040)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(7, payload_);
+      }
+      if (((bitField0_ & 0x00000080) == 0x00000080)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeDoubleSize(8, value_);
+      }
+      size += getUnknownFields().getSerializedSize();
+      memoizedSerializedSize = size;
+      return size;
+    }
+
+    private static final long serialVersionUID = 0L;
+    @java.lang.Override
+    protected java.lang.Object writeReplace()
+        throws java.io.ObjectStreamException {
+      return super.writeReplace();
+    }
+
+    public static com.openxc.BinaryMessages.DiagnosticMessage parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static com.openxc.BinaryMessages.DiagnosticMessage parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static com.openxc.BinaryMessages.DiagnosticMessage parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static com.openxc.BinaryMessages.DiagnosticMessage parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static com.openxc.BinaryMessages.DiagnosticMessage parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input);
+    }
+    public static com.openxc.BinaryMessages.DiagnosticMessage parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input, extensionRegistry);
+    }
+    public static com.openxc.BinaryMessages.DiagnosticMessage parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return PARSER.parseDelimitedFrom(input);
+    }
+    public static com.openxc.BinaryMessages.DiagnosticMessage parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+    }
+    public static com.openxc.BinaryMessages.DiagnosticMessage parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input);
+    }
+    public static com.openxc.BinaryMessages.DiagnosticMessage parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input, extensionRegistry);
+    }
+
+    public static Builder newBuilder() { return Builder.create(); }
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder(com.openxc.BinaryMessages.DiagnosticMessage prototype) {
+      return newBuilder().mergeFrom(prototype);
+    }
+    public Builder toBuilder() { return newBuilder(this); }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code openxc.DiagnosticMessage}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessage.Builder<Builder>
+       implements com.openxc.BinaryMessages.DiagnosticMessageOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticMessage_descriptor;
+      }
+
+      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticMessage_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                com.openxc.BinaryMessages.DiagnosticMessage.class, com.openxc.BinaryMessages.DiagnosticMessage.Builder.class);
+      }
+
+      // Construct using com.openxc.BinaryMessages.DiagnosticMessage.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        }
+      }
+      private static Builder create() {
+        return new Builder();
+      }
+
+      public Builder clear() {
+        super.clear();
+        bus_ = 0;
+        bitField0_ = (bitField0_ & ~0x00000001);
+        messageId_ = 0;
+        bitField0_ = (bitField0_ & ~0x00000002);
+        mode_ = 0;
+        bitField0_ = (bitField0_ & ~0x00000004);
+        pid_ = 0;
+        bitField0_ = (bitField0_ & ~0x00000008);
+        success_ = false;
+        bitField0_ = (bitField0_ & ~0x00000010);
+        negativeResponseCode_ = 0;
+        bitField0_ = (bitField0_ & ~0x00000020);
+        payload_ = com.google.protobuf.ByteString.EMPTY;
+        bitField0_ = (bitField0_ & ~0x00000040);
+        value_ = 0D;
+        bitField0_ = (bitField0_ & ~0x00000080);
+        return this;
+      }
+
+      public Builder clone() {
+        return create().mergeFrom(buildPartial());
+      }
+
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticMessage_descriptor;
+      }
+
+      public com.openxc.BinaryMessages.DiagnosticMessage getDefaultInstanceForType() {
+        return com.openxc.BinaryMessages.DiagnosticMessage.getDefaultInstance();
+      }
+
+      public com.openxc.BinaryMessages.DiagnosticMessage build() {
+        com.openxc.BinaryMessages.DiagnosticMessage result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      public com.openxc.BinaryMessages.DiagnosticMessage buildPartial() {
+        com.openxc.BinaryMessages.DiagnosticMessage result = new com.openxc.BinaryMessages.DiagnosticMessage(this);
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
+          to_bitField0_ |= 0x00000001;
+        }
+        result.bus_ = bus_;
+        if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
+          to_bitField0_ |= 0x00000002;
+        }
+        result.messageId_ = messageId_;
+        if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
+          to_bitField0_ |= 0x00000004;
+        }
+        result.mode_ = mode_;
+        if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
+          to_bitField0_ |= 0x00000008;
+        }
+        result.pid_ = pid_;
+        if (((from_bitField0_ & 0x00000010) == 0x00000010)) {
+          to_bitField0_ |= 0x00000010;
+        }
+        result.success_ = success_;
+        if (((from_bitField0_ & 0x00000020) == 0x00000020)) {
+          to_bitField0_ |= 0x00000020;
+        }
+        result.negativeResponseCode_ = negativeResponseCode_;
+        if (((from_bitField0_ & 0x00000040) == 0x00000040)) {
+          to_bitField0_ |= 0x00000040;
+        }
+        result.payload_ = payload_;
+        if (((from_bitField0_ & 0x00000080) == 0x00000080)) {
+          to_bitField0_ |= 0x00000080;
+        }
+        result.value_ = value_;
+        result.bitField0_ = to_bitField0_;
+        onBuilt();
+        return result;
+      }
+
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof com.openxc.BinaryMessages.DiagnosticMessage) {
+          return mergeFrom((com.openxc.BinaryMessages.DiagnosticMessage)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(com.openxc.BinaryMessages.DiagnosticMessage other) {
+        if (other == com.openxc.BinaryMessages.DiagnosticMessage.getDefaultInstance()) return this;
+        if (other.hasBus()) {
+          setBus(other.getBus());
+        }
+        if (other.hasMessageId()) {
+          setMessageId(other.getMessageId());
+        }
+        if (other.hasMode()) {
+          setMode(other.getMode());
+        }
+        if (other.hasPid()) {
+          setPid(other.getPid());
+        }
+        if (other.hasSuccess()) {
+          setSuccess(other.getSuccess());
+        }
+        if (other.hasNegativeResponseCode()) {
+          setNegativeResponseCode(other.getNegativeResponseCode());
+        }
+        if (other.hasPayload()) {
+          setPayload(other.getPayload());
+        }
+        if (other.hasValue()) {
+          setValue(other.getValue());
+        }
+        this.mergeUnknownFields(other.getUnknownFields());
+        return this;
+      }
+
+      public final boolean isInitialized() {
+        return true;
+      }
+
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        com.openxc.BinaryMessages.DiagnosticMessage parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.openxc.BinaryMessages.DiagnosticMessage) e.getUnfinishedMessage();
+          throw e;
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+      private int bitField0_;
+
+      // optional int32 bus = 1;
+      private int bus_ ;
+      /**
+       * <code>optional int32 bus = 1;</code>
+       */
+      public boolean hasBus() {
+        return ((bitField0_ & 0x00000001) == 0x00000001);
+      }
+      /**
+       * <code>optional int32 bus = 1;</code>
+       */
+      public int getBus() {
+        return bus_;
+      }
+      /**
+       * <code>optional int32 bus = 1;</code>
+       */
+      public Builder setBus(int value) {
+        bitField0_ |= 0x00000001;
+        bus_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional int32 bus = 1;</code>
+       */
+      public Builder clearBus() {
+        bitField0_ = (bitField0_ & ~0x00000001);
+        bus_ = 0;
+        onChanged();
+        return this;
+      }
+
+      // optional uint32 message_id = 2;
+      private int messageId_ ;
+      /**
+       * <code>optional uint32 message_id = 2;</code>
+       */
+      public boolean hasMessageId() {
+        return ((bitField0_ & 0x00000002) == 0x00000002);
+      }
+      /**
+       * <code>optional uint32 message_id = 2;</code>
+       */
+      public int getMessageId() {
+        return messageId_;
+      }
+      /**
+       * <code>optional uint32 message_id = 2;</code>
+       */
+      public Builder setMessageId(int value) {
+        bitField0_ |= 0x00000002;
+        messageId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional uint32 message_id = 2;</code>
+       */
+      public Builder clearMessageId() {
+        bitField0_ = (bitField0_ & ~0x00000002);
+        messageId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      // optional uint32 mode = 3;
+      private int mode_ ;
+      /**
+       * <code>optional uint32 mode = 3;</code>
+       */
+      public boolean hasMode() {
+        return ((bitField0_ & 0x00000004) == 0x00000004);
+      }
+      /**
+       * <code>optional uint32 mode = 3;</code>
+       */
+      public int getMode() {
+        return mode_;
+      }
+      /**
+       * <code>optional uint32 mode = 3;</code>
+       */
+      public Builder setMode(int value) {
+        bitField0_ |= 0x00000004;
+        mode_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional uint32 mode = 3;</code>
+       */
+      public Builder clearMode() {
+        bitField0_ = (bitField0_ & ~0x00000004);
+        mode_ = 0;
+        onChanged();
+        return this;
+      }
+
+      // optional uint32 pid = 4;
+      private int pid_ ;
+      /**
+       * <code>optional uint32 pid = 4;</code>
+       */
+      public boolean hasPid() {
+        return ((bitField0_ & 0x00000008) == 0x00000008);
+      }
+      /**
+       * <code>optional uint32 pid = 4;</code>
+       */
+      public int getPid() {
+        return pid_;
+      }
+      /**
+       * <code>optional uint32 pid = 4;</code>
+       */
+      public Builder setPid(int value) {
+        bitField0_ |= 0x00000008;
+        pid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional uint32 pid = 4;</code>
+       */
+      public Builder clearPid() {
+        bitField0_ = (bitField0_ & ~0x00000008);
+        pid_ = 0;
+        onChanged();
+        return this;
+      }
+
+      // optional bool success = 5;
+      private boolean success_ ;
+      /**
+       * <code>optional bool success = 5;</code>
+       */
+      public boolean hasSuccess() {
+        return ((bitField0_ & 0x00000010) == 0x00000010);
+      }
+      /**
+       * <code>optional bool success = 5;</code>
+       */
+      public boolean getSuccess() {
+        return success_;
+      }
+      /**
+       * <code>optional bool success = 5;</code>
+       */
+      public Builder setSuccess(boolean value) {
+        bitField0_ |= 0x00000010;
+        success_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional bool success = 5;</code>
+       */
+      public Builder clearSuccess() {
+        bitField0_ = (bitField0_ & ~0x00000010);
+        success_ = false;
+        onChanged();
+        return this;
+      }
+
+      // optional uint32 negative_response_code = 6;
+      private int negativeResponseCode_ ;
+      /**
+       * <code>optional uint32 negative_response_code = 6;</code>
+       */
+      public boolean hasNegativeResponseCode() {
+        return ((bitField0_ & 0x00000020) == 0x00000020);
+      }
+      /**
+       * <code>optional uint32 negative_response_code = 6;</code>
+       */
+      public int getNegativeResponseCode() {
+        return negativeResponseCode_;
+      }
+      /**
+       * <code>optional uint32 negative_response_code = 6;</code>
+       */
+      public Builder setNegativeResponseCode(int value) {
+        bitField0_ |= 0x00000020;
+        negativeResponseCode_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional uint32 negative_response_code = 6;</code>
+       */
+      public Builder clearNegativeResponseCode() {
+        bitField0_ = (bitField0_ & ~0x00000020);
+        negativeResponseCode_ = 0;
+        onChanged();
+        return this;
+      }
+
+      // optional bytes payload = 7;
+      private com.google.protobuf.ByteString payload_ = com.google.protobuf.ByteString.EMPTY;
+      /**
+       * <code>optional bytes payload = 7;</code>
+       *
+       * <pre>
+       * TODO we are capping this at 8 bytes for now - need to change when we
+       * support multi-frame responses
+       * </pre>
+       */
+      public boolean hasPayload() {
+        return ((bitField0_ & 0x00000040) == 0x00000040);
+      }
+      /**
+       * <code>optional bytes payload = 7;</code>
+       *
+       * <pre>
+       * TODO we are capping this at 8 bytes for now - need to change when we
+       * support multi-frame responses
+       * </pre>
+       */
+      public com.google.protobuf.ByteString getPayload() {
+        return payload_;
+      }
+      /**
+       * <code>optional bytes payload = 7;</code>
+       *
+       * <pre>
+       * TODO we are capping this at 8 bytes for now - need to change when we
+       * support multi-frame responses
+       * </pre>
+       */
+      public Builder setPayload(com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000040;
+        payload_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional bytes payload = 7;</code>
+       *
+       * <pre>
+       * TODO we are capping this at 8 bytes for now - need to change when we
+       * support multi-frame responses
+       * </pre>
+       */
+      public Builder clearPayload() {
+        bitField0_ = (bitField0_ & ~0x00000040);
+        payload_ = getDefaultInstance().getPayload();
+        onChanged();
+        return this;
+      }
+
+      // optional double value = 8;
+      private double value_ ;
+      /**
+       * <code>optional double value = 8;</code>
+       */
+      public boolean hasValue() {
+        return ((bitField0_ & 0x00000080) == 0x00000080);
+      }
+      /**
+       * <code>optional double value = 8;</code>
+       */
+      public double getValue() {
+        return value_;
+      }
+      /**
+       * <code>optional double value = 8;</code>
+       */
+      public Builder setValue(double value) {
+        bitField0_ |= 0x00000080;
+        value_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional double value = 8;</code>
+       */
+      public Builder clearValue() {
+        bitField0_ = (bitField0_ & ~0x00000080);
+        value_ = 0D;
+        onChanged();
+        return this;
+      }
+
+      // @@protoc_insertion_point(builder_scope:openxc.DiagnosticMessage)
+    }
+
+    static {
+      defaultInstance = new DiagnosticMessage(true);
+      defaultInstance.initFields();
+    }
+
+    // @@protoc_insertion_point(class_scope:openxc.DiagnosticMessage)
+  }
+
+  public interface TranslatedMessageOrBuilder
+      extends com.google.protobuf.MessageOrBuilder {
+
+    // optional .openxc.TranslatedMessage.Type type = 1;
+    /**
+     * <code>optional .openxc.TranslatedMessage.Type type = 1;</code>
+     */
+    boolean hasType();
+    /**
+     * <code>optional .openxc.TranslatedMessage.Type type = 1;</code>
+     */
+    com.openxc.BinaryMessages.TranslatedMessage.Type getType();
+
+    // optional string name = 2;
+    /**
+     * <code>optional string name = 2;</code>
+     */
+    boolean hasName();
+    /**
+     * <code>optional string name = 2;</code>
+     */
+    java.lang.String getName();
+    /**
+     * <code>optional string name = 2;</code>
+     */
+    com.google.protobuf.ByteString
+        getNameBytes();
+
+    // optional string string_value = 3;
+    /**
+     * <code>optional string string_value = 3;</code>
+     */
+    boolean hasStringValue();
+    /**
+     * <code>optional string string_value = 3;</code>
+     */
+    java.lang.String getStringValue();
+    /**
+     * <code>optional string string_value = 3;</code>
+     */
+    com.google.protobuf.ByteString
+        getStringValueBytes();
+
+    // optional double numeric_value = 4;
+    /**
+     * <code>optional double numeric_value = 4;</code>
+     */
+    boolean hasNumericValue();
+    /**
+     * <code>optional double numeric_value = 4;</code>
+     */
+    double getNumericValue();
+
+    // optional bool boolean_value = 5;
+    /**
+     * <code>optional bool boolean_value = 5;</code>
+     */
+    boolean hasBooleanValue();
+    /**
+     * <code>optional bool boolean_value = 5;</code>
+     */
+    boolean getBooleanValue();
+
+    // optional string string_event = 6;
+    /**
+     * <code>optional string string_event = 6;</code>
+     */
+    boolean hasStringEvent();
+    /**
+     * <code>optional string string_event = 6;</code>
+     */
+    java.lang.String getStringEvent();
+    /**
+     * <code>optional string string_event = 6;</code>
+     */
+    com.google.protobuf.ByteString
+        getStringEventBytes();
+
+    // optional double numeric_event = 7;
+    /**
+     * <code>optional double numeric_event = 7;</code>
+     */
+    boolean hasNumericEvent();
+    /**
+     * <code>optional double numeric_event = 7;</code>
+     */
+    double getNumericEvent();
+
+    // optional bool boolean_event = 8;
+    /**
+     * <code>optional bool boolean_event = 8;</code>
+     */
+    boolean hasBooleanEvent();
+    /**
+     * <code>optional bool boolean_event = 8;</code>
+     */
+    boolean getBooleanEvent();
+  }
+  /**
+   * Protobuf type {@code openxc.TranslatedMessage}
+   */
+  public static final class TranslatedMessage extends
+      com.google.protobuf.GeneratedMessage
+      implements TranslatedMessageOrBuilder {
+    // Use TranslatedMessage.newBuilder() to construct.
+    private TranslatedMessage(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+      super(builder);
+      this.unknownFields = builder.getUnknownFields();
+    }
+    private TranslatedMessage(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+
+    private static final TranslatedMessage defaultInstance;
+    public static TranslatedMessage getDefaultInstance() {
+      return defaultInstance;
+    }
+
+    public TranslatedMessage getDefaultInstanceForType() {
+      return defaultInstance;
+    }
+
+    private final com.google.protobuf.UnknownFieldSet unknownFields;
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+        getUnknownFields() {
+      return this.unknownFields;
+    }
+    private TranslatedMessage(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      initFields();
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            default: {
+              if (!parseUnknownField(input, unknownFields,
+                                     extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+            case 8: {
+              int rawValue = input.readEnum();
+              com.openxc.BinaryMessages.TranslatedMessage.Type value = com.openxc.BinaryMessages.TranslatedMessage.Type.valueOf(rawValue);
+              if (value == null) {
+                unknownFields.mergeVarintField(1, rawValue);
+              } else {
+                bitField0_ |= 0x00000001;
+                type_ = value;
+              }
+              break;
+            }
+            case 18: {
+              bitField0_ |= 0x00000002;
+              name_ = input.readBytes();
+              break;
+            }
+            case 26: {
+              bitField0_ |= 0x00000004;
+              stringValue_ = input.readBytes();
+              break;
+            }
+            case 33: {
+              bitField0_ |= 0x00000008;
+              numericValue_ = input.readDouble();
+              break;
+            }
+            case 40: {
+              bitField0_ |= 0x00000010;
+              booleanValue_ = input.readBool();
+              break;
+            }
+            case 50: {
+              bitField0_ |= 0x00000020;
+              stringEvent_ = input.readBytes();
+              break;
+            }
+            case 57: {
+              bitField0_ |= 0x00000040;
+              numericEvent_ = input.readDouble();
+              break;
+            }
+            case 64: {
+              bitField0_ |= 0x00000080;
+              booleanEvent_ = input.readBool();
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e.getMessage()).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.openxc.BinaryMessages.internal_static_openxc_TranslatedMessage_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.openxc.BinaryMessages.internal_static_openxc_TranslatedMessage_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.openxc.BinaryMessages.TranslatedMessage.class, com.openxc.BinaryMessages.TranslatedMessage.Builder.class);
+    }
+
+    public static com.google.protobuf.Parser<TranslatedMessage> PARSER =
+        new com.google.protobuf.AbstractParser<TranslatedMessage>() {
+      public TranslatedMessage parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new TranslatedMessage(input, extensionRegistry);
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<TranslatedMessage> getParserForType() {
+      return PARSER;
+    }
+
+    /**
+     * Protobuf enum {@code openxc.TranslatedMessage.Type}
+     */
+    public enum Type
+        implements com.google.protobuf.ProtocolMessageEnum {
+      /**
+       * <code>STRING = 1;</code>
+       */
+      STRING(0, 1),
+      /**
+       * <code>NUM = 2;</code>
+       */
+      NUM(1, 2),
+      /**
+       * <code>BOOL = 3;</code>
+       */
+      BOOL(2, 3),
+      /**
+       * <code>EVENTED_STRING = 4;</code>
+       */
+      EVENTED_STRING(3, 4),
+      /**
+       * <code>EVENTED_NUM = 5;</code>
+       */
+      EVENTED_NUM(4, 5),
+      /**
+       * <code>EVENTED_BOOL = 6;</code>
+       */
+      EVENTED_BOOL(5, 6),
+      ;
+
+      /**
+       * <code>STRING = 1;</code>
+       */
+      public static final int STRING_VALUE = 1;
+      /**
+       * <code>NUM = 2;</code>
+       */
+      public static final int NUM_VALUE = 2;
+      /**
+       * <code>BOOL = 3;</code>
+       */
+      public static final int BOOL_VALUE = 3;
+      /**
+       * <code>EVENTED_STRING = 4;</code>
+       */
+      public static final int EVENTED_STRING_VALUE = 4;
+      /**
+       * <code>EVENTED_NUM = 5;</code>
+       */
+      public static final int EVENTED_NUM_VALUE = 5;
+      /**
+       * <code>EVENTED_BOOL = 6;</code>
+       */
+      public static final int EVENTED_BOOL_VALUE = 6;
+
+
+      public final int getNumber() { return value; }
+
+      public static Type valueOf(int value) {
+        switch (value) {
+          case 1: return STRING;
+          case 2: return NUM;
+          case 3: return BOOL;
+          case 4: return EVENTED_STRING;
+          case 5: return EVENTED_NUM;
+          case 6: return EVENTED_BOOL;
+          default: return null;
+        }
+      }
+
+      public static com.google.protobuf.Internal.EnumLiteMap<Type>
+          internalGetValueMap() {
+        return internalValueMap;
+      }
+      private static com.google.protobuf.Internal.EnumLiteMap<Type>
+          internalValueMap =
+            new com.google.protobuf.Internal.EnumLiteMap<Type>() {
+              public Type findValueByNumber(int number) {
+                return Type.valueOf(number);
+              }
+            };
+
+      public final com.google.protobuf.Descriptors.EnumValueDescriptor
+          getValueDescriptor() {
+        return getDescriptor().getValues().get(index);
+      }
+      public final com.google.protobuf.Descriptors.EnumDescriptor
+          getDescriptorForType() {
+        return getDescriptor();
+      }
+      public static final com.google.protobuf.Descriptors.EnumDescriptor
+          getDescriptor() {
+        return com.openxc.BinaryMessages.TranslatedMessage.getDescriptor().getEnumTypes().get(0);
+      }
+
+      private static final Type[] VALUES = values();
+
+      public static Type valueOf(
+          com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+        if (desc.getType() != getDescriptor()) {
+          throw new java.lang.IllegalArgumentException(
+            "EnumValueDescriptor is not for this type.");
+        }
+        return VALUES[desc.getIndex()];
+      }
+
+      private final int index;
+      private final int value;
+
+      private Type(int index, int value) {
+        this.index = index;
+        this.value = value;
+      }
+
+      // @@protoc_insertion_point(enum_scope:openxc.TranslatedMessage.Type)
+    }
+
+    private int bitField0_;
+    // optional .openxc.TranslatedMessage.Type type = 1;
+    public static final int TYPE_FIELD_NUMBER = 1;
+    private com.openxc.BinaryMessages.TranslatedMessage.Type type_;
+    /**
+     * <code>optional .openxc.TranslatedMessage.Type type = 1;</code>
+     */
+    public boolean hasType() {
+      return ((bitField0_ & 0x00000001) == 0x00000001);
+    }
+    /**
+     * <code>optional .openxc.TranslatedMessage.Type type = 1;</code>
+     */
+    public com.openxc.BinaryMessages.TranslatedMessage.Type getType() {
+      return type_;
+    }
+
+    // optional string name = 2;
+    public static final int NAME_FIELD_NUMBER = 2;
+    private java.lang.Object name_;
+    /**
+     * <code>optional string name = 2;</code>
+     */
+    public boolean hasName() {
+      return ((bitField0_ & 0x00000002) == 0x00000002);
+    }
+    /**
+     * <code>optional string name = 2;</code>
+     */
+    public java.lang.String getName() {
+      java.lang.Object ref = name_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
+      } else {
+        com.google.protobuf.ByteString bs = 
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        if (bs.isValidUtf8()) {
+          name_ = s;
+        }
+        return s;
+      }
+    }
+    /**
+     * <code>optional string name = 2;</code>
+     */
+    public com.google.protobuf.ByteString
+        getNameBytes() {
+      java.lang.Object ref = name_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        name_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    // optional string string_value = 3;
+    public static final int STRING_VALUE_FIELD_NUMBER = 3;
+    private java.lang.Object stringValue_;
+    /**
+     * <code>optional string string_value = 3;</code>
+     */
+    public boolean hasStringValue() {
+      return ((bitField0_ & 0x00000004) == 0x00000004);
+    }
+    /**
+     * <code>optional string string_value = 3;</code>
+     */
+    public java.lang.String getStringValue() {
+      java.lang.Object ref = stringValue_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
+      } else {
+        com.google.protobuf.ByteString bs = 
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        if (bs.isValidUtf8()) {
+          stringValue_ = s;
+        }
+        return s;
+      }
+    }
+    /**
+     * <code>optional string string_value = 3;</code>
+     */
+    public com.google.protobuf.ByteString
+        getStringValueBytes() {
+      java.lang.Object ref = stringValue_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        stringValue_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    // optional double numeric_value = 4;
+    public static final int NUMERIC_VALUE_FIELD_NUMBER = 4;
+    private double numericValue_;
+    /**
+     * <code>optional double numeric_value = 4;</code>
+     */
+    public boolean hasNumericValue() {
+      return ((bitField0_ & 0x00000008) == 0x00000008);
+    }
+    /**
+     * <code>optional double numeric_value = 4;</code>
+     */
+    public double getNumericValue() {
+      return numericValue_;
+    }
+
+    // optional bool boolean_value = 5;
+    public static final int BOOLEAN_VALUE_FIELD_NUMBER = 5;
+    private boolean booleanValue_;
+    /**
+     * <code>optional bool boolean_value = 5;</code>
+     */
+    public boolean hasBooleanValue() {
+      return ((bitField0_ & 0x00000010) == 0x00000010);
+    }
+    /**
+     * <code>optional bool boolean_value = 5;</code>
+     */
+    public boolean getBooleanValue() {
+      return booleanValue_;
+    }
+
+    // optional string string_event = 6;
+    public static final int STRING_EVENT_FIELD_NUMBER = 6;
     private java.lang.Object stringEvent_;
     /**
-     * <code>optional string string_event = 5;</code>
+     * <code>optional string string_event = 6;</code>
      */
     public boolean hasStringEvent() {
-      return ((bitField0_ & 0x00000010) == 0x00000010);
+      return ((bitField0_ & 0x00000020) == 0x00000020);
     }
     /**
-     * <code>optional string string_event = 5;</code>
+     * <code>optional string string_event = 6;</code>
      */
     public java.lang.String getStringEvent() {
       java.lang.Object ref = stringEvent_;
@@ -1796,7 +3161,7 @@ public final class BinaryMessages {
       }
     }
     /**
-     * <code>optional string string_event = 5;</code>
+     * <code>optional string string_event = 6;</code>
      */
     public com.google.protobuf.ByteString
         getStringEventBytes() {
@@ -1812,45 +3177,46 @@ public final class BinaryMessages {
       }
     }
 
-    // optional double numerical_event = 6;
-    public static final int NUMERICAL_EVENT_FIELD_NUMBER = 6;
-    private double numericalEvent_;
+    // optional double numeric_event = 7;
+    public static final int NUMERIC_EVENT_FIELD_NUMBER = 7;
+    private double numericEvent_;
     /**
-     * <code>optional double numerical_event = 6;</code>
+     * <code>optional double numeric_event = 7;</code>
      */
-    public boolean hasNumericalEvent() {
-      return ((bitField0_ & 0x00000020) == 0x00000020);
+    public boolean hasNumericEvent() {
+      return ((bitField0_ & 0x00000040) == 0x00000040);
     }
     /**
-     * <code>optional double numerical_event = 6;</code>
+     * <code>optional double numeric_event = 7;</code>
      */
-    public double getNumericalEvent() {
-      return numericalEvent_;
+    public double getNumericEvent() {
+      return numericEvent_;
     }
 
-    // optional bool boolean_event = 7;
-    public static final int BOOLEAN_EVENT_FIELD_NUMBER = 7;
+    // optional bool boolean_event = 8;
+    public static final int BOOLEAN_EVENT_FIELD_NUMBER = 8;
     private boolean booleanEvent_;
     /**
-     * <code>optional bool boolean_event = 7;</code>
+     * <code>optional bool boolean_event = 8;</code>
      */
     public boolean hasBooleanEvent() {
-      return ((bitField0_ & 0x00000040) == 0x00000040);
+      return ((bitField0_ & 0x00000080) == 0x00000080);
     }
     /**
-     * <code>optional bool boolean_event = 7;</code>
+     * <code>optional bool boolean_event = 8;</code>
      */
     public boolean getBooleanEvent() {
       return booleanEvent_;
     }
 
     private void initFields() {
+      type_ = com.openxc.BinaryMessages.TranslatedMessage.Type.STRING;
       name_ = "";
       stringValue_ = "";
-      numericalValue_ = 0D;
+      numericValue_ = 0D;
       booleanValue_ = false;
       stringEvent_ = "";
-      numericalEvent_ = 0D;
+      numericEvent_ = 0D;
       booleanEvent_ = false;
     }
     private byte memoizedIsInitialized = -1;
@@ -1866,25 +3232,28 @@ public final class BinaryMessages {
                         throws java.io.IOException {
       getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        output.writeBytes(1, getNameBytes());
+        output.writeEnum(1, type_.getNumber());
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        output.writeBytes(2, getStringValueBytes());
+        output.writeBytes(2, getNameBytes());
       }
       if (((bitField0_ & 0x00000004) == 0x00000004)) {
-        output.writeDouble(3, numericalValue_);
+        output.writeBytes(3, getStringValueBytes());
       }
       if (((bitField0_ & 0x00000008) == 0x00000008)) {
-        output.writeBool(4, booleanValue_);
+        output.writeDouble(4, numericValue_);
       }
       if (((bitField0_ & 0x00000010) == 0x00000010)) {
-        output.writeBytes(5, getStringEventBytes());
+        output.writeBool(5, booleanValue_);
       }
       if (((bitField0_ & 0x00000020) == 0x00000020)) {
-        output.writeDouble(6, numericalEvent_);
+        output.writeBytes(6, getStringEventBytes());
       }
       if (((bitField0_ & 0x00000040) == 0x00000040)) {
-        output.writeBool(7, booleanEvent_);
+        output.writeDouble(7, numericEvent_);
+      }
+      if (((bitField0_ & 0x00000080) == 0x00000080)) {
+        output.writeBool(8, booleanEvent_);
       }
       getUnknownFields().writeTo(output);
     }
@@ -1897,31 +3266,35 @@ public final class BinaryMessages {
       size = 0;
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(1, getNameBytes());
+          .computeEnumSize(1, type_.getNumber());
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(2, getStringValueBytes());
+          .computeBytesSize(2, getNameBytes());
       }
       if (((bitField0_ & 0x00000004) == 0x00000004)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeDoubleSize(3, numericalValue_);
+          .computeBytesSize(3, getStringValueBytes());
       }
       if (((bitField0_ & 0x00000008) == 0x00000008)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(4, booleanValue_);
+          .computeDoubleSize(4, numericValue_);
       }
       if (((bitField0_ & 0x00000010) == 0x00000010)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(5, getStringEventBytes());
+          .computeBoolSize(5, booleanValue_);
       }
       if (((bitField0_ & 0x00000020) == 0x00000020)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeDoubleSize(6, numericalEvent_);
+          .computeBytesSize(6, getStringEventBytes());
       }
       if (((bitField0_ & 0x00000040) == 0x00000040)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(7, booleanEvent_);
+          .computeDoubleSize(7, numericEvent_);
+      }
+      if (((bitField0_ & 0x00000080) == 0x00000080)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(8, booleanEvent_);
       }
       size += getUnknownFields().getSerializedSize();
       memoizedSerializedSize = size;
@@ -2039,20 +3412,22 @@ public final class BinaryMessages {
 
       public Builder clear() {
         super.clear();
-        name_ = "";
+        type_ = com.openxc.BinaryMessages.TranslatedMessage.Type.STRING;
         bitField0_ = (bitField0_ & ~0x00000001);
-        stringValue_ = "";
+        name_ = "";
         bitField0_ = (bitField0_ & ~0x00000002);
-        numericalValue_ = 0D;
+        stringValue_ = "";
         bitField0_ = (bitField0_ & ~0x00000004);
-        booleanValue_ = false;
+        numericValue_ = 0D;
         bitField0_ = (bitField0_ & ~0x00000008);
-        stringEvent_ = "";
+        booleanValue_ = false;
         bitField0_ = (bitField0_ & ~0x00000010);
-        numericalEvent_ = 0D;
+        stringEvent_ = "";
         bitField0_ = (bitField0_ & ~0x00000020);
-        booleanEvent_ = false;
+        numericEvent_ = 0D;
         bitField0_ = (bitField0_ & ~0x00000040);
+        booleanEvent_ = false;
+        bitField0_ = (bitField0_ & ~0x00000080);
         return this;
       }
 
@@ -2084,30 +3459,34 @@ public final class BinaryMessages {
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
           to_bitField0_ |= 0x00000001;
         }
-        result.name_ = name_;
+        result.type_ = type_;
         if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
           to_bitField0_ |= 0x00000002;
         }
-        result.stringValue_ = stringValue_;
+        result.name_ = name_;
         if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
           to_bitField0_ |= 0x00000004;
         }
-        result.numericalValue_ = numericalValue_;
+        result.stringValue_ = stringValue_;
         if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
           to_bitField0_ |= 0x00000008;
         }
-        result.booleanValue_ = booleanValue_;
+        result.numericValue_ = numericValue_;
         if (((from_bitField0_ & 0x00000010) == 0x00000010)) {
           to_bitField0_ |= 0x00000010;
         }
-        result.stringEvent_ = stringEvent_;
+        result.booleanValue_ = booleanValue_;
         if (((from_bitField0_ & 0x00000020) == 0x00000020)) {
           to_bitField0_ |= 0x00000020;
         }
-        result.numericalEvent_ = numericalEvent_;
+        result.stringEvent_ = stringEvent_;
         if (((from_bitField0_ & 0x00000040) == 0x00000040)) {
           to_bitField0_ |= 0x00000040;
         }
+        result.numericEvent_ = numericEvent_;
+        if (((from_bitField0_ & 0x00000080) == 0x00000080)) {
+          to_bitField0_ |= 0x00000080;
+        }
         result.booleanEvent_ = booleanEvent_;
         result.bitField0_ = to_bitField0_;
         onBuilt();
@@ -2125,29 +3504,32 @@ public final class BinaryMessages {
 
       public Builder mergeFrom(com.openxc.BinaryMessages.TranslatedMessage other) {
         if (other == com.openxc.BinaryMessages.TranslatedMessage.getDefaultInstance()) return this;
+        if (other.hasType()) {
+          setType(other.getType());
+        }
         if (other.hasName()) {
-          bitField0_ |= 0x00000001;
+          bitField0_ |= 0x00000002;
           name_ = other.name_;
           onChanged();
         }
         if (other.hasStringValue()) {
-          bitField0_ |= 0x00000002;
+          bitField0_ |= 0x00000004;
           stringValue_ = other.stringValue_;
           onChanged();
         }
-        if (other.hasNumericalValue()) {
-          setNumericalValue(other.getNumericalValue());
+        if (other.hasNumericValue()) {
+          setNumericValue(other.getNumericValue());
         }
         if (other.hasBooleanValue()) {
           setBooleanValue(other.getBooleanValue());
         }
         if (other.hasStringEvent()) {
-          bitField0_ |= 0x00000010;
+          bitField0_ |= 0x00000020;
           stringEvent_ = other.stringEvent_;
           onChanged();
         }
-        if (other.hasNumericalEvent()) {
-          setNumericalEvent(other.getNumericalEvent());
+        if (other.hasNumericEvent()) {
+          setNumericEvent(other.getNumericEvent());
         }
         if (other.hasBooleanEvent()) {
           setBooleanEvent(other.getBooleanEvent());
@@ -2179,16 +3561,52 @@ public final class BinaryMessages {
       }
       private int bitField0_;
 
-      // optional string name = 1;
+      // optional .openxc.TranslatedMessage.Type type = 1;
+      private com.openxc.BinaryMessages.TranslatedMessage.Type type_ = com.openxc.BinaryMessages.TranslatedMessage.Type.STRING;
+      /**
+       * <code>optional .openxc.TranslatedMessage.Type type = 1;</code>
+       */
+      public boolean hasType() {
+        return ((bitField0_ & 0x00000001) == 0x00000001);
+      }
+      /**
+       * <code>optional .openxc.TranslatedMessage.Type type = 1;</code>
+       */
+      public com.openxc.BinaryMessages.TranslatedMessage.Type getType() {
+        return type_;
+      }
+      /**
+       * <code>optional .openxc.TranslatedMessage.Type type = 1;</code>
+       */
+      public Builder setType(com.openxc.BinaryMessages.TranslatedMessage.Type value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        bitField0_ |= 0x00000001;
+        type_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .openxc.TranslatedMessage.Type type = 1;</code>
+       */
+      public Builder clearType() {
+        bitField0_ = (bitField0_ & ~0x00000001);
+        type_ = com.openxc.BinaryMessages.TranslatedMessage.Type.STRING;
+        onChanged();
+        return this;
+      }
+
+      // optional string name = 2;
       private java.lang.Object name_ = "";
       /**
-       * <code>optional string name = 1;</code>
+       * <code>optional string name = 2;</code>
        */
       public boolean hasName() {
-        return ((bitField0_ & 0x00000001) == 0x00000001);
+        return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * <code>optional string name = 1;</code>
+       * <code>optional string name = 2;</code>
        */
       public java.lang.String getName() {
         java.lang.Object ref = name_;
@@ -2202,7 +3620,7 @@ public final class BinaryMessages {
         }
       }
       /**
-       * <code>optional string name = 1;</code>
+       * <code>optional string name = 2;</code>
        */
       public com.google.protobuf.ByteString
           getNameBytes() {
@@ -2218,51 +3636,51 @@ public final class BinaryMessages {
         }
       }
       /**
-       * <code>optional string name = 1;</code>
+       * <code>optional string name = 2;</code>
        */
       public Builder setName(
           java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
   }
-  bitField0_ |= 0x00000001;
+  bitField0_ |= 0x00000002;
         name_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>optional string name = 1;</code>
+       * <code>optional string name = 2;</code>
        */
       public Builder clearName() {
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000002);
         name_ = getDefaultInstance().getName();
         onChanged();
         return this;
       }
       /**
-       * <code>optional string name = 1;</code>
+       * <code>optional string name = 2;</code>
        */
       public Builder setNameBytes(
           com.google.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
-  bitField0_ |= 0x00000001;
+  bitField0_ |= 0x00000002;
         name_ = value;
         onChanged();
         return this;
       }
 
-      // optional string string_value = 2;
+      // optional string string_value = 3;
       private java.lang.Object stringValue_ = "";
       /**
-       * <code>optional string string_value = 2;</code>
+       * <code>optional string string_value = 3;</code>
        */
       public boolean hasStringValue() {
-        return ((bitField0_ & 0x00000002) == 0x00000002);
+        return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * <code>optional string string_value = 2;</code>
+       * <code>optional string string_value = 3;</code>
        */
       public java.lang.String getStringValue() {
         java.lang.Object ref = stringValue_;
@@ -2276,7 +3694,7 @@ public final class BinaryMessages {
         }
       }
       /**
-       * <code>optional string string_value = 2;</code>
+       * <code>optional string string_value = 3;</code>
        */
       public com.google.protobuf.ByteString
           getStringValueBytes() {
@@ -2292,117 +3710,117 @@ public final class BinaryMessages {
         }
       }
       /**
-       * <code>optional string string_value = 2;</code>
+       * <code>optional string string_value = 3;</code>
        */
       public Builder setStringValue(
           java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
   }
-  bitField0_ |= 0x00000002;
+  bitField0_ |= 0x00000004;
         stringValue_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>optional string string_value = 2;</code>
+       * <code>optional string string_value = 3;</code>
        */
       public Builder clearStringValue() {
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000004);
         stringValue_ = getDefaultInstance().getStringValue();
         onChanged();
         return this;
       }
       /**
-       * <code>optional string string_value = 2;</code>
+       * <code>optional string string_value = 3;</code>
        */
       public Builder setStringValueBytes(
           com.google.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
-  bitField0_ |= 0x00000002;
+  bitField0_ |= 0x00000004;
         stringValue_ = value;
         onChanged();
         return this;
       }
 
-      // optional double numerical_value = 3;
-      private double numericalValue_ ;
+      // optional double numeric_value = 4;
+      private double numericValue_ ;
       /**
-       * <code>optional double numerical_value = 3;</code>
+       * <code>optional double numeric_value = 4;</code>
        */
-      public boolean hasNumericalValue() {
-        return ((bitField0_ & 0x00000004) == 0x00000004);
+      public boolean hasNumericValue() {
+        return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * <code>optional double numerical_value = 3;</code>
+       * <code>optional double numeric_value = 4;</code>
        */
-      public double getNumericalValue() {
-        return numericalValue_;
+      public double getNumericValue() {
+        return numericValue_;
       }
       /**
-       * <code>optional double numerical_value = 3;</code>
+       * <code>optional double numeric_value = 4;</code>
        */
-      public Builder setNumericalValue(double value) {
-        bitField0_ |= 0x00000004;
-        numericalValue_ = value;
+      public Builder setNumericValue(double value) {
+        bitField0_ |= 0x00000008;
+        numericValue_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>optional double numerical_value = 3;</code>
+       * <code>optional double numeric_value = 4;</code>
        */
-      public Builder clearNumericalValue() {
-        bitField0_ = (bitField0_ & ~0x00000004);
-        numericalValue_ = 0D;
+      public Builder clearNumericValue() {
+        bitField0_ = (bitField0_ & ~0x00000008);
+        numericValue_ = 0D;
         onChanged();
         return this;
       }
 
-      // optional bool boolean_value = 4;
+      // optional bool boolean_value = 5;
       private boolean booleanValue_ ;
       /**
-       * <code>optional bool boolean_value = 4;</code>
+       * <code>optional bool boolean_value = 5;</code>
        */
       public boolean hasBooleanValue() {
-        return ((bitField0_ & 0x00000008) == 0x00000008);
+        return ((bitField0_ & 0x00000010) == 0x00000010);
       }
       /**
-       * <code>optional bool boolean_value = 4;</code>
+       * <code>optional bool boolean_value = 5;</code>
        */
       public boolean getBooleanValue() {
         return booleanValue_;
       }
       /**
-       * <code>optional bool boolean_value = 4;</code>
+       * <code>optional bool boolean_value = 5;</code>
        */
       public Builder setBooleanValue(boolean value) {
-        bitField0_ |= 0x00000008;
+        bitField0_ |= 0x00000010;
         booleanValue_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>optional bool boolean_value = 4;</code>
+       * <code>optional bool boolean_value = 5;</code>
        */
       public Builder clearBooleanValue() {
-        bitField0_ = (bitField0_ & ~0x00000008);
+        bitField0_ = (bitField0_ & ~0x00000010);
         booleanValue_ = false;
         onChanged();
         return this;
       }
 
-      // optional string string_event = 5;
+      // optional string string_event = 6;
       private java.lang.Object stringEvent_ = "";
       /**
-       * <code>optional string string_event = 5;</code>
+       * <code>optional string string_event = 6;</code>
        */
       public boolean hasStringEvent() {
-        return ((bitField0_ & 0x00000010) == 0x00000010);
+        return ((bitField0_ & 0x00000020) == 0x00000020);
       }
       /**
-       * <code>optional string string_event = 5;</code>
+       * <code>optional string string_event = 6;</code>
        */
       public java.lang.String getStringEvent() {
         java.lang.Object ref = stringEvent_;
@@ -2416,7 +3834,7 @@ public final class BinaryMessages {
         }
       }
       /**
-       * <code>optional string string_event = 5;</code>
+       * <code>optional string string_event = 6;</code>
        */
       public com.google.protobuf.ByteString
           getStringEventBytes() {
@@ -2432,102 +3850,102 @@ public final class BinaryMessages {
         }
       }
       /**
-       * <code>optional string string_event = 5;</code>
+       * <code>optional string string_event = 6;</code>
        */
       public Builder setStringEvent(
           java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
   }
-  bitField0_ |= 0x00000010;
+  bitField0_ |= 0x00000020;
         stringEvent_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>optional string string_event = 5;</code>
+       * <code>optional string string_event = 6;</code>
        */
       public Builder clearStringEvent() {
-        bitField0_ = (bitField0_ & ~0x00000010);
+        bitField0_ = (bitField0_ & ~0x00000020);
         stringEvent_ = getDefaultInstance().getStringEvent();
         onChanged();
         return this;
       }
       /**
-       * <code>optional string string_event = 5;</code>
+       * <code>optional string string_event = 6;</code>
        */
       public Builder setStringEventBytes(
           com.google.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
-  bitField0_ |= 0x00000010;
+  bitField0_ |= 0x00000020;
         stringEvent_ = value;
         onChanged();
         return this;
       }
 
-      // optional double numerical_event = 6;
-      private double numericalEvent_ ;
+      // optional double numeric_event = 7;
+      private double numericEvent_ ;
       /**
-       * <code>optional double numerical_event = 6;</code>
+       * <code>optional double numeric_event = 7;</code>
        */
-      public boolean hasNumericalEvent() {
-        return ((bitField0_ & 0x00000020) == 0x00000020);
+      public boolean hasNumericEvent() {
+        return ((bitField0_ & 0x00000040) == 0x00000040);
       }
       /**
-       * <code>optional double numerical_event = 6;</code>
+       * <code>optional double numeric_event = 7;</code>
        */
-      public double getNumericalEvent() {
-        return numericalEvent_;
+      public double getNumericEvent() {
+        return numericEvent_;
       }
       /**
-       * <code>optional double numerical_event = 6;</code>
+       * <code>optional double numeric_event = 7;</code>
        */
-      public Builder setNumericalEvent(double value) {
-        bitField0_ |= 0x00000020;
-        numericalEvent_ = value;
+      public Builder setNumericEvent(double value) {
+        bitField0_ |= 0x00000040;
+        numericEvent_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>optional double numerical_event = 6;</code>
+       * <code>optional double numeric_event = 7;</code>
        */
-      public Builder clearNumericalEvent() {
-        bitField0_ = (bitField0_ & ~0x00000020);
-        numericalEvent_ = 0D;
+      public Builder clearNumericEvent() {
+        bitField0_ = (bitField0_ & ~0x00000040);
+        numericEvent_ = 0D;
         onChanged();
         return this;
       }
 
-      // optional bool boolean_event = 7;
+      // optional bool boolean_event = 8;
       private boolean booleanEvent_ ;
       /**
-       * <code>optional bool boolean_event = 7;</code>
+       * <code>optional bool boolean_event = 8;</code>
        */
       public boolean hasBooleanEvent() {
-        return ((bitField0_ & 0x00000040) == 0x00000040);
+        return ((bitField0_ & 0x00000080) == 0x00000080);
       }
       /**
-       * <code>optional bool boolean_event = 7;</code>
+       * <code>optional bool boolean_event = 8;</code>
        */
       public boolean getBooleanEvent() {
         return booleanEvent_;
       }
       /**
-       * <code>optional bool boolean_event = 7;</code>
+       * <code>optional bool boolean_event = 8;</code>
        */
       public Builder setBooleanEvent(boolean value) {
-        bitField0_ |= 0x00000040;
+        bitField0_ |= 0x00000080;
         booleanEvent_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>optional bool boolean_event = 7;</code>
+       * <code>optional bool boolean_event = 8;</code>
        */
       public Builder clearBooleanEvent() {
-        bitField0_ = (bitField0_ & ~0x00000040);
+        bitField0_ = (bitField0_ & ~0x00000080);
         booleanEvent_ = false;
         onChanged();
         return this;
@@ -2554,6 +3972,11 @@ public final class BinaryMessages {
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_openxc_RawMessage_fieldAccessorTable;
+  private static com.google.protobuf.Descriptors.Descriptor
+    internal_static_openxc_DiagnosticMessage_descriptor;
+  private static
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_openxc_DiagnosticMessage_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
     internal_static_openxc_TranslatedMessage_descriptor;
   private static
@@ -2568,18 +3991,28 @@ 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\"\255\001\n\021T" +
-      "ranslatedMessage\022\014\n\004name\030\001 \001(\t\022\024\n\014string" +
-      "_value\030\002 \001(\t\022\027\n\017numerical_value\030\003 \001(\001\022\025\n" +
-      "\rboolean_value\030\004 \001(\010\022\024\n\014string_event\030\005 \001",
-      "(\t\022\027\n\017numerical_event\030\006 \001(\001\022\025\n\rboolean_e" +
-      "vent\030\007 \001(\010B\034\n\ncom.openxcB\016BinaryMessages"
+      "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(\014\"\240\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\022\r\n\005value\030\010 \001(\001\"\265\002\n\021Transla" +
+      "tedMessage\022,\n\004type\030\001 \001(\0162\036.openxc.Transl" +
+      "atedMessage.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\rb" +
+      "oolean_value\030\005 \001(\010\022\024\n\014string_event\030\006 \001(\t" +
+      "\022\025\n\rnumeric_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\004B" +
+      "OOL\020\003\022\022\n\016EVENTED_STRING\020\004\022\017\n\013EVENTED_NUM",
+      "\020\005\022\020\n\014EVENTED_BOOL\020\006B\034\n\ncom.openxcB\016Bina" +
+      "ryMessages"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -2591,19 +4024,25 @@ 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
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_openxc_RawMessage_descriptor,
               new java.lang.String[] { "Bus", "MessageId", "Data", });
-          internal_static_openxc_TranslatedMessage_descriptor =
+          internal_static_openxc_DiagnosticMessage_descriptor =
             getDescriptor().getMessageTypes().get(2);
+          internal_static_openxc_DiagnosticMessage_fieldAccessorTable = new
+            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+              internal_static_openxc_DiagnosticMessage_descriptor,
+              new java.lang.String[] { "Bus", "MessageId", "Mode", "Pid", "Success", "NegativeResponseCode", "Payload", "Value", });
+          internal_static_openxc_TranslatedMessage_descriptor =
+            getDescriptor().getMessageTypes().get(3);
           internal_static_openxc_TranslatedMessage_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_openxc_TranslatedMessage_descriptor,
-              new java.lang.String[] { "Name", "StringValue", "NumericalValue", "BooleanValue", "StringEvent", "NumericalEvent", "BooleanEvent", });
+              new java.lang.String[] { "Type", "Name", "StringValue", "NumericValue", "BooleanValue", "StringEvent", "NumericEvent", "BooleanEvent", });
           return null;
         }
       };