added support for timestamp to vehicle messages
[apps/agl-service-can-low-level.git] / gen / java / com / openxc / BinaryMessages.java
index f1f4753..bd84bd1 100644 (file)
@@ -21,33 +21,33 @@ public final class BinaryMessages {
      */
     com.openxc.BinaryMessages.VehicleMessage.Type getType();
 
-    // optional .openxc.RawMessage raw_message = 2;
+    // optional .openxc.CanMessage can_message = 2;
     /**
-     * <code>optional .openxc.RawMessage raw_message = 2;</code>
+     * <code>optional .openxc.CanMessage can_message = 2;</code>
      */
-    boolean hasRawMessage();
+    boolean hasCanMessage();
     /**
-     * <code>optional .openxc.RawMessage raw_message = 2;</code>
+     * <code>optional .openxc.CanMessage can_message = 2;</code>
      */
-    com.openxc.BinaryMessages.RawMessage getRawMessage();
+    com.openxc.BinaryMessages.CanMessage getCanMessage();
     /**
-     * <code>optional .openxc.RawMessage raw_message = 2;</code>
+     * <code>optional .openxc.CanMessage can_message = 2;</code>
      */
-    com.openxc.BinaryMessages.RawMessageOrBuilder getRawMessageOrBuilder();
+    com.openxc.BinaryMessages.CanMessageOrBuilder getCanMessageOrBuilder();
 
-    // optional .openxc.TranslatedMessage translated_message = 3;
+    // optional .openxc.SimpleMessage simple_message = 3;
     /**
-     * <code>optional .openxc.TranslatedMessage translated_message = 3;</code>
+     * <code>optional .openxc.SimpleMessage simple_message = 3;</code>
      */
-    boolean hasTranslatedMessage();
+    boolean hasSimpleMessage();
     /**
-     * <code>optional .openxc.TranslatedMessage translated_message = 3;</code>
+     * <code>optional .openxc.SimpleMessage simple_message = 3;</code>
      */
-    com.openxc.BinaryMessages.TranslatedMessage getTranslatedMessage();
+    com.openxc.BinaryMessages.SimpleMessage getSimpleMessage();
     /**
-     * <code>optional .openxc.TranslatedMessage translated_message = 3;</code>
+     * <code>optional .openxc.SimpleMessage simple_message = 3;</code>
      */
-    com.openxc.BinaryMessages.TranslatedMessageOrBuilder getTranslatedMessageOrBuilder();
+    com.openxc.BinaryMessages.SimpleMessageOrBuilder getSimpleMessageOrBuilder();
 
     // optional .openxc.DiagnosticResponse diagnostic_response = 4;
     /**
@@ -62,6 +62,44 @@ public final class BinaryMessages {
      * <code>optional .openxc.DiagnosticResponse diagnostic_response = 4;</code>
      */
     com.openxc.BinaryMessages.DiagnosticResponseOrBuilder getDiagnosticResponseOrBuilder();
+
+    // optional .openxc.ControlCommand control_command = 5;
+    /**
+     * <code>optional .openxc.ControlCommand control_command = 5;</code>
+     */
+    boolean hasControlCommand();
+    /**
+     * <code>optional .openxc.ControlCommand control_command = 5;</code>
+     */
+    com.openxc.BinaryMessages.ControlCommand getControlCommand();
+    /**
+     * <code>optional .openxc.ControlCommand control_command = 5;</code>
+     */
+    com.openxc.BinaryMessages.ControlCommandOrBuilder getControlCommandOrBuilder();
+
+    // optional .openxc.CommandResponse command_response = 6;
+    /**
+     * <code>optional .openxc.CommandResponse command_response = 6;</code>
+     */
+    boolean hasCommandResponse();
+    /**
+     * <code>optional .openxc.CommandResponse command_response = 6;</code>
+     */
+    com.openxc.BinaryMessages.CommandResponse getCommandResponse();
+    /**
+     * <code>optional .openxc.CommandResponse command_response = 6;</code>
+     */
+    com.openxc.BinaryMessages.CommandResponseOrBuilder getCommandResponseOrBuilder();
+
+    // optional uint64 timestamp = 7;
+    /**
+     * <code>optional uint64 timestamp = 7;</code>
+     */
+    boolean hasTimestamp();
+    /**
+     * <code>optional uint64 timestamp = 7;</code>
+     */
+    long getTimestamp();
   }
   /**
    * Protobuf type {@code openxc.VehicleMessage}
@@ -126,27 +164,27 @@ public final class BinaryMessages {
               break;
             }
             case 18: {
-              com.openxc.BinaryMessages.RawMessage.Builder subBuilder = null;
+              com.openxc.BinaryMessages.CanMessage.Builder subBuilder = null;
               if (((bitField0_ & 0x00000002) == 0x00000002)) {
-                subBuilder = rawMessage_.toBuilder();
+                subBuilder = canMessage_.toBuilder();
               }
-              rawMessage_ = input.readMessage(com.openxc.BinaryMessages.RawMessage.PARSER, extensionRegistry);
+              canMessage_ = input.readMessage(com.openxc.BinaryMessages.CanMessage.PARSER, extensionRegistry);
               if (subBuilder != null) {
-                subBuilder.mergeFrom(rawMessage_);
-                rawMessage_ = subBuilder.buildPartial();
+                subBuilder.mergeFrom(canMessage_);
+                canMessage_ = subBuilder.buildPartial();
               }
               bitField0_ |= 0x00000002;
               break;
             }
             case 26: {
-              com.openxc.BinaryMessages.TranslatedMessage.Builder subBuilder = null;
+              com.openxc.BinaryMessages.SimpleMessage.Builder subBuilder = null;
               if (((bitField0_ & 0x00000004) == 0x00000004)) {
-                subBuilder = translatedMessage_.toBuilder();
+                subBuilder = simpleMessage_.toBuilder();
               }
-              translatedMessage_ = input.readMessage(com.openxc.BinaryMessages.TranslatedMessage.PARSER, extensionRegistry);
+              simpleMessage_ = input.readMessage(com.openxc.BinaryMessages.SimpleMessage.PARSER, extensionRegistry);
               if (subBuilder != null) {
-                subBuilder.mergeFrom(translatedMessage_);
-                translatedMessage_ = subBuilder.buildPartial();
+                subBuilder.mergeFrom(simpleMessage_);
+                simpleMessage_ = subBuilder.buildPartial();
               }
               bitField0_ |= 0x00000004;
               break;
@@ -164,6 +202,37 @@ public final class BinaryMessages {
               bitField0_ |= 0x00000008;
               break;
             }
+            case 42: {
+              com.openxc.BinaryMessages.ControlCommand.Builder subBuilder = null;
+              if (((bitField0_ & 0x00000010) == 0x00000010)) {
+                subBuilder = controlCommand_.toBuilder();
+              }
+              controlCommand_ = input.readMessage(com.openxc.BinaryMessages.ControlCommand.PARSER, extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(controlCommand_);
+                controlCommand_ = subBuilder.buildPartial();
+              }
+              bitField0_ |= 0x00000010;
+              break;
+            }
+            case 50: {
+              com.openxc.BinaryMessages.CommandResponse.Builder subBuilder = null;
+              if (((bitField0_ & 0x00000020) == 0x00000020)) {
+                subBuilder = commandResponse_.toBuilder();
+              }
+              commandResponse_ = input.readMessage(com.openxc.BinaryMessages.CommandResponse.PARSER, extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(commandResponse_);
+                commandResponse_ = subBuilder.buildPartial();
+              }
+              bitField0_ |= 0x00000020;
+              break;
+            }
+            case 56: {
+              bitField0_ |= 0x00000040;
+              timestamp_ = input.readUInt64();
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -209,40 +278,58 @@ public final class BinaryMessages {
     public enum Type
         implements com.google.protobuf.ProtocolMessageEnum {
       /**
-       * <code>RAW = 1;</code>
+       * <code>CAN = 1;</code>
        */
-      RAW(0, 1),
+      CAN(0, 1),
       /**
-       * <code>TRANSLATED = 2;</code>
+       * <code>SIMPLE = 2;</code>
        */
-      TRANSLATED(1, 2),
+      SIMPLE(1, 2),
       /**
        * <code>DIAGNOSTIC = 3;</code>
        */
       DIAGNOSTIC(2, 3),
+      /**
+       * <code>CONTROL_COMMAND = 4;</code>
+       */
+      CONTROL_COMMAND(3, 4),
+      /**
+       * <code>COMMAND_RESPONSE = 5;</code>
+       */
+      COMMAND_RESPONSE(4, 5),
       ;
 
       /**
-       * <code>RAW = 1;</code>
+       * <code>CAN = 1;</code>
        */
-      public static final int RAW_VALUE = 1;
+      public static final int CAN_VALUE = 1;
       /**
-       * <code>TRANSLATED = 2;</code>
+       * <code>SIMPLE = 2;</code>
        */
-      public static final int TRANSLATED_VALUE = 2;
+      public static final int SIMPLE_VALUE = 2;
       /**
        * <code>DIAGNOSTIC = 3;</code>
        */
       public static final int DIAGNOSTIC_VALUE = 3;
+      /**
+       * <code>CONTROL_COMMAND = 4;</code>
+       */
+      public static final int CONTROL_COMMAND_VALUE = 4;
+      /**
+       * <code>COMMAND_RESPONSE = 5;</code>
+       */
+      public static final int COMMAND_RESPONSE_VALUE = 5;
 
 
       public final int getNumber() { return value; }
 
       public static Type valueOf(int value) {
         switch (value) {
-          case 1: return RAW;
-          case 2: return TRANSLATED;
+          case 1: return CAN;
+          case 2: return SIMPLE;
           case 3: return DIAGNOSTIC;
+          case 4: return CONTROL_COMMAND;
+          case 5: return COMMAND_RESPONSE;
           default: return null;
         }
       }
@@ -311,48 +398,48 @@ public final class BinaryMessages {
       return type_;
     }
 
-    // optional .openxc.RawMessage raw_message = 2;
-    public static final int RAW_MESSAGE_FIELD_NUMBER = 2;
-    private com.openxc.BinaryMessages.RawMessage rawMessage_;
+    // optional .openxc.CanMessage can_message = 2;
+    public static final int CAN_MESSAGE_FIELD_NUMBER = 2;
+    private com.openxc.BinaryMessages.CanMessage canMessage_;
     /**
-     * <code>optional .openxc.RawMessage raw_message = 2;</code>
+     * <code>optional .openxc.CanMessage can_message = 2;</code>
      */
-    public boolean hasRawMessage() {
+    public boolean hasCanMessage() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * <code>optional .openxc.RawMessage raw_message = 2;</code>
+     * <code>optional .openxc.CanMessage can_message = 2;</code>
      */
-    public com.openxc.BinaryMessages.RawMessage getRawMessage() {
-      return rawMessage_;
+    public com.openxc.BinaryMessages.CanMessage getCanMessage() {
+      return canMessage_;
     }
     /**
-     * <code>optional .openxc.RawMessage raw_message = 2;</code>
+     * <code>optional .openxc.CanMessage can_message = 2;</code>
      */
-    public com.openxc.BinaryMessages.RawMessageOrBuilder getRawMessageOrBuilder() {
-      return rawMessage_;
+    public com.openxc.BinaryMessages.CanMessageOrBuilder getCanMessageOrBuilder() {
+      return canMessage_;
     }
 
-    // optional .openxc.TranslatedMessage translated_message = 3;
-    public static final int TRANSLATED_MESSAGE_FIELD_NUMBER = 3;
-    private com.openxc.BinaryMessages.TranslatedMessage translatedMessage_;
+    // optional .openxc.SimpleMessage simple_message = 3;
+    public static final int SIMPLE_MESSAGE_FIELD_NUMBER = 3;
+    private com.openxc.BinaryMessages.SimpleMessage simpleMessage_;
     /**
-     * <code>optional .openxc.TranslatedMessage translated_message = 3;</code>
+     * <code>optional .openxc.SimpleMessage simple_message = 3;</code>
      */
-    public boolean hasTranslatedMessage() {
+    public boolean hasSimpleMessage() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
     /**
-     * <code>optional .openxc.TranslatedMessage translated_message = 3;</code>
+     * <code>optional .openxc.SimpleMessage simple_message = 3;</code>
      */
-    public com.openxc.BinaryMessages.TranslatedMessage getTranslatedMessage() {
-      return translatedMessage_;
+    public com.openxc.BinaryMessages.SimpleMessage getSimpleMessage() {
+      return simpleMessage_;
     }
     /**
-     * <code>optional .openxc.TranslatedMessage translated_message = 3;</code>
+     * <code>optional .openxc.SimpleMessage simple_message = 3;</code>
      */
-    public com.openxc.BinaryMessages.TranslatedMessageOrBuilder getTranslatedMessageOrBuilder() {
-      return translatedMessage_;
+    public com.openxc.BinaryMessages.SimpleMessageOrBuilder getSimpleMessageOrBuilder() {
+      return simpleMessage_;
     }
 
     // optional .openxc.DiagnosticResponse diagnostic_response = 4;
@@ -377,11 +464,74 @@ public final class BinaryMessages {
       return diagnosticResponse_;
     }
 
+    // optional .openxc.ControlCommand control_command = 5;
+    public static final int CONTROL_COMMAND_FIELD_NUMBER = 5;
+    private com.openxc.BinaryMessages.ControlCommand controlCommand_;
+    /**
+     * <code>optional .openxc.ControlCommand control_command = 5;</code>
+     */
+    public boolean hasControlCommand() {
+      return ((bitField0_ & 0x00000010) == 0x00000010);
+    }
+    /**
+     * <code>optional .openxc.ControlCommand control_command = 5;</code>
+     */
+    public com.openxc.BinaryMessages.ControlCommand getControlCommand() {
+      return controlCommand_;
+    }
+    /**
+     * <code>optional .openxc.ControlCommand control_command = 5;</code>
+     */
+    public com.openxc.BinaryMessages.ControlCommandOrBuilder getControlCommandOrBuilder() {
+      return controlCommand_;
+    }
+
+    // optional .openxc.CommandResponse command_response = 6;
+    public static final int COMMAND_RESPONSE_FIELD_NUMBER = 6;
+    private com.openxc.BinaryMessages.CommandResponse commandResponse_;
+    /**
+     * <code>optional .openxc.CommandResponse command_response = 6;</code>
+     */
+    public boolean hasCommandResponse() {
+      return ((bitField0_ & 0x00000020) == 0x00000020);
+    }
+    /**
+     * <code>optional .openxc.CommandResponse command_response = 6;</code>
+     */
+    public com.openxc.BinaryMessages.CommandResponse getCommandResponse() {
+      return commandResponse_;
+    }
+    /**
+     * <code>optional .openxc.CommandResponse command_response = 6;</code>
+     */
+    public com.openxc.BinaryMessages.CommandResponseOrBuilder getCommandResponseOrBuilder() {
+      return commandResponse_;
+    }
+
+    // optional uint64 timestamp = 7;
+    public static final int TIMESTAMP_FIELD_NUMBER = 7;
+    private long timestamp_;
+    /**
+     * <code>optional uint64 timestamp = 7;</code>
+     */
+    public boolean hasTimestamp() {
+      return ((bitField0_ & 0x00000040) == 0x00000040);
+    }
+    /**
+     * <code>optional uint64 timestamp = 7;</code>
+     */
+    public long getTimestamp() {
+      return timestamp_;
+    }
+
     private void initFields() {
-      type_ = com.openxc.BinaryMessages.VehicleMessage.Type.RAW;
-      rawMessage_ = com.openxc.BinaryMessages.RawMessage.getDefaultInstance();
-      translatedMessage_ = com.openxc.BinaryMessages.TranslatedMessage.getDefaultInstance();
+      type_ = com.openxc.BinaryMessages.VehicleMessage.Type.CAN;
+      canMessage_ = com.openxc.BinaryMessages.CanMessage.getDefaultInstance();
+      simpleMessage_ = com.openxc.BinaryMessages.SimpleMessage.getDefaultInstance();
       diagnosticResponse_ = com.openxc.BinaryMessages.DiagnosticResponse.getDefaultInstance();
+      controlCommand_ = com.openxc.BinaryMessages.ControlCommand.getDefaultInstance();
+      commandResponse_ = com.openxc.BinaryMessages.CommandResponse.getDefaultInstance();
+      timestamp_ = 0L;
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -399,14 +549,23 @@ public final class BinaryMessages {
         output.writeEnum(1, type_.getNumber());
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        output.writeMessage(2, rawMessage_);
+        output.writeMessage(2, canMessage_);
       }
       if (((bitField0_ & 0x00000004) == 0x00000004)) {
-        output.writeMessage(3, translatedMessage_);
+        output.writeMessage(3, simpleMessage_);
       }
       if (((bitField0_ & 0x00000008) == 0x00000008)) {
         output.writeMessage(4, diagnosticResponse_);
       }
+      if (((bitField0_ & 0x00000010) == 0x00000010)) {
+        output.writeMessage(5, controlCommand_);
+      }
+      if (((bitField0_ & 0x00000020) == 0x00000020)) {
+        output.writeMessage(6, commandResponse_);
+      }
+      if (((bitField0_ & 0x00000040) == 0x00000040)) {
+        output.writeUInt64(7, timestamp_);
+      }
       getUnknownFields().writeTo(output);
     }
 
@@ -422,16 +581,28 @@ public final class BinaryMessages {
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(2, rawMessage_);
+          .computeMessageSize(2, canMessage_);
       }
       if (((bitField0_ & 0x00000004) == 0x00000004)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(3, translatedMessage_);
+          .computeMessageSize(3, simpleMessage_);
       }
       if (((bitField0_ & 0x00000008) == 0x00000008)) {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(4, diagnosticResponse_);
       }
+      if (((bitField0_ & 0x00000010) == 0x00000010)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(5, controlCommand_);
+      }
+      if (((bitField0_ & 0x00000020) == 0x00000020)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(6, commandResponse_);
+      }
+      if (((bitField0_ & 0x00000040) == 0x00000040)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(7, timestamp_);
+      }
       size += getUnknownFields().getSerializedSize();
       memoizedSerializedSize = size;
       return size;
@@ -540,9 +711,11 @@ public final class BinaryMessages {
       }
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
-          getRawMessageFieldBuilder();
-          getTranslatedMessageFieldBuilder();
+          getCanMessageFieldBuilder();
+          getSimpleMessageFieldBuilder();
           getDiagnosticResponseFieldBuilder();
+          getControlCommandFieldBuilder();
+          getCommandResponseFieldBuilder();
         }
       }
       private static Builder create() {
@@ -551,18 +724,18 @@ public final class BinaryMessages {
 
       public Builder clear() {
         super.clear();
-        type_ = com.openxc.BinaryMessages.VehicleMessage.Type.RAW;
+        type_ = com.openxc.BinaryMessages.VehicleMessage.Type.CAN;
         bitField0_ = (bitField0_ & ~0x00000001);
-        if (rawMessageBuilder_ == null) {
-          rawMessage_ = com.openxc.BinaryMessages.RawMessage.getDefaultInstance();
+        if (canMessageBuilder_ == null) {
+          canMessage_ = com.openxc.BinaryMessages.CanMessage.getDefaultInstance();
         } else {
-          rawMessageBuilder_.clear();
+          canMessageBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000002);
-        if (translatedMessageBuilder_ == null) {
-          translatedMessage_ = com.openxc.BinaryMessages.TranslatedMessage.getDefaultInstance();
+        if (simpleMessageBuilder_ == null) {
+          simpleMessage_ = com.openxc.BinaryMessages.SimpleMessage.getDefaultInstance();
         } else {
-          translatedMessageBuilder_.clear();
+          simpleMessageBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000004);
         if (diagnosticResponseBuilder_ == null) {
@@ -571,6 +744,20 @@ public final class BinaryMessages {
           diagnosticResponseBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000008);
+        if (controlCommandBuilder_ == null) {
+          controlCommand_ = com.openxc.BinaryMessages.ControlCommand.getDefaultInstance();
+        } else {
+          controlCommandBuilder_.clear();
+        }
+        bitField0_ = (bitField0_ & ~0x00000010);
+        if (commandResponseBuilder_ == null) {
+          commandResponse_ = com.openxc.BinaryMessages.CommandResponse.getDefaultInstance();
+        } else {
+          commandResponseBuilder_.clear();
+        }
+        bitField0_ = (bitField0_ & ~0x00000020);
+        timestamp_ = 0L;
+        bitField0_ = (bitField0_ & ~0x00000040);
         return this;
       }
 
@@ -606,18 +793,18 @@ public final class BinaryMessages {
         if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
           to_bitField0_ |= 0x00000002;
         }
-        if (rawMessageBuilder_ == null) {
-          result.rawMessage_ = rawMessage_;
+        if (canMessageBuilder_ == null) {
+          result.canMessage_ = canMessage_;
         } else {
-          result.rawMessage_ = rawMessageBuilder_.build();
+          result.canMessage_ = canMessageBuilder_.build();
         }
         if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
           to_bitField0_ |= 0x00000004;
         }
-        if (translatedMessageBuilder_ == null) {
-          result.translatedMessage_ = translatedMessage_;
+        if (simpleMessageBuilder_ == null) {
+          result.simpleMessage_ = simpleMessage_;
         } else {
-          result.translatedMessage_ = translatedMessageBuilder_.build();
+          result.simpleMessage_ = simpleMessageBuilder_.build();
         }
         if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
           to_bitField0_ |= 0x00000008;
@@ -627,6 +814,26 @@ public final class BinaryMessages {
         } else {
           result.diagnosticResponse_ = diagnosticResponseBuilder_.build();
         }
+        if (((from_bitField0_ & 0x00000010) == 0x00000010)) {
+          to_bitField0_ |= 0x00000010;
+        }
+        if (controlCommandBuilder_ == null) {
+          result.controlCommand_ = controlCommand_;
+        } else {
+          result.controlCommand_ = controlCommandBuilder_.build();
+        }
+        if (((from_bitField0_ & 0x00000020) == 0x00000020)) {
+          to_bitField0_ |= 0x00000020;
+        }
+        if (commandResponseBuilder_ == null) {
+          result.commandResponse_ = commandResponse_;
+        } else {
+          result.commandResponse_ = commandResponseBuilder_.build();
+        }
+        if (((from_bitField0_ & 0x00000040) == 0x00000040)) {
+          to_bitField0_ |= 0x00000040;
+        }
+        result.timestamp_ = timestamp_;
         result.bitField0_ = to_bitField0_;
         onBuilt();
         return result;
@@ -646,15 +853,24 @@ public final class BinaryMessages {
         if (other.hasType()) {
           setType(other.getType());
         }
-        if (other.hasRawMessage()) {
-          mergeRawMessage(other.getRawMessage());
+        if (other.hasCanMessage()) {
+          mergeCanMessage(other.getCanMessage());
         }
-        if (other.hasTranslatedMessage()) {
-          mergeTranslatedMessage(other.getTranslatedMessage());
+        if (other.hasSimpleMessage()) {
+          mergeSimpleMessage(other.getSimpleMessage());
         }
         if (other.hasDiagnosticResponse()) {
           mergeDiagnosticResponse(other.getDiagnosticResponse());
         }
+        if (other.hasControlCommand()) {
+          mergeControlCommand(other.getControlCommand());
+        }
+        if (other.hasCommandResponse()) {
+          mergeCommandResponse(other.getCommandResponse());
+        }
+        if (other.hasTimestamp()) {
+          setTimestamp(other.getTimestamp());
+        }
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
       }
@@ -683,7 +899,7 @@ public final class BinaryMessages {
       private int bitField0_;
 
       // optional .openxc.VehicleMessage.Type type = 1;
-      private com.openxc.BinaryMessages.VehicleMessage.Type type_ = com.openxc.BinaryMessages.VehicleMessage.Type.RAW;
+      private com.openxc.BinaryMessages.VehicleMessage.Type type_ = com.openxc.BinaryMessages.VehicleMessage.Type.CAN;
       /**
        * <code>optional .openxc.VehicleMessage.Type type = 1;</code>
        */
@@ -713,243 +929,243 @@ public final class BinaryMessages {
        */
       public Builder clearType() {
         bitField0_ = (bitField0_ & ~0x00000001);
-        type_ = com.openxc.BinaryMessages.VehicleMessage.Type.RAW;
+        type_ = com.openxc.BinaryMessages.VehicleMessage.Type.CAN;
         onChanged();
         return this;
       }
 
-      // optional .openxc.RawMessage raw_message = 2;
-      private com.openxc.BinaryMessages.RawMessage rawMessage_ = com.openxc.BinaryMessages.RawMessage.getDefaultInstance();
+      // optional .openxc.CanMessage can_message = 2;
+      private com.openxc.BinaryMessages.CanMessage canMessage_ = com.openxc.BinaryMessages.CanMessage.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
-          com.openxc.BinaryMessages.RawMessage, com.openxc.BinaryMessages.RawMessage.Builder, com.openxc.BinaryMessages.RawMessageOrBuilder> rawMessageBuilder_;
+          com.openxc.BinaryMessages.CanMessage, com.openxc.BinaryMessages.CanMessage.Builder, com.openxc.BinaryMessages.CanMessageOrBuilder> canMessageBuilder_;
       /**
-       * <code>optional .openxc.RawMessage raw_message = 2;</code>
+       * <code>optional .openxc.CanMessage can_message = 2;</code>
        */
-      public boolean hasRawMessage() {
+      public boolean hasCanMessage() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * <code>optional .openxc.RawMessage raw_message = 2;</code>
+       * <code>optional .openxc.CanMessage can_message = 2;</code>
        */
-      public com.openxc.BinaryMessages.RawMessage getRawMessage() {
-        if (rawMessageBuilder_ == null) {
-          return rawMessage_;
+      public com.openxc.BinaryMessages.CanMessage getCanMessage() {
+        if (canMessageBuilder_ == null) {
+          return canMessage_;
         } else {
-          return rawMessageBuilder_.getMessage();
+          return canMessageBuilder_.getMessage();
         }
       }
       /**
-       * <code>optional .openxc.RawMessage raw_message = 2;</code>
+       * <code>optional .openxc.CanMessage can_message = 2;</code>
        */
-      public Builder setRawMessage(com.openxc.BinaryMessages.RawMessage value) {
-        if (rawMessageBuilder_ == null) {
+      public Builder setCanMessage(com.openxc.BinaryMessages.CanMessage value) {
+        if (canMessageBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          rawMessage_ = value;
+          canMessage_ = value;
           onChanged();
         } else {
-          rawMessageBuilder_.setMessage(value);
+          canMessageBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000002;
         return this;
       }
       /**
-       * <code>optional .openxc.RawMessage raw_message = 2;</code>
+       * <code>optional .openxc.CanMessage can_message = 2;</code>
        */
-      public Builder setRawMessage(
-          com.openxc.BinaryMessages.RawMessage.Builder builderForValue) {
-        if (rawMessageBuilder_ == null) {
-          rawMessage_ = builderForValue.build();
+      public Builder setCanMessage(
+          com.openxc.BinaryMessages.CanMessage.Builder builderForValue) {
+        if (canMessageBuilder_ == null) {
+          canMessage_ = builderForValue.build();
           onChanged();
         } else {
-          rawMessageBuilder_.setMessage(builderForValue.build());
+          canMessageBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000002;
         return this;
       }
       /**
-       * <code>optional .openxc.RawMessage raw_message = 2;</code>
+       * <code>optional .openxc.CanMessage can_message = 2;</code>
        */
-      public Builder mergeRawMessage(com.openxc.BinaryMessages.RawMessage value) {
-        if (rawMessageBuilder_ == null) {
+      public Builder mergeCanMessage(com.openxc.BinaryMessages.CanMessage value) {
+        if (canMessageBuilder_ == null) {
           if (((bitField0_ & 0x00000002) == 0x00000002) &&
-              rawMessage_ != com.openxc.BinaryMessages.RawMessage.getDefaultInstance()) {
-            rawMessage_ =
-              com.openxc.BinaryMessages.RawMessage.newBuilder(rawMessage_).mergeFrom(value).buildPartial();
+              canMessage_ != com.openxc.BinaryMessages.CanMessage.getDefaultInstance()) {
+            canMessage_ =
+              com.openxc.BinaryMessages.CanMessage.newBuilder(canMessage_).mergeFrom(value).buildPartial();
           } else {
-            rawMessage_ = value;
+            canMessage_ = value;
           }
           onChanged();
         } else {
-          rawMessageBuilder_.mergeFrom(value);
+          canMessageBuilder_.mergeFrom(value);
         }
         bitField0_ |= 0x00000002;
         return this;
       }
       /**
-       * <code>optional .openxc.RawMessage raw_message = 2;</code>
+       * <code>optional .openxc.CanMessage can_message = 2;</code>
        */
-      public Builder clearRawMessage() {
-        if (rawMessageBuilder_ == null) {
-          rawMessage_ = com.openxc.BinaryMessages.RawMessage.getDefaultInstance();
+      public Builder clearCanMessage() {
+        if (canMessageBuilder_ == null) {
+          canMessage_ = com.openxc.BinaryMessages.CanMessage.getDefaultInstance();
           onChanged();
         } else {
-          rawMessageBuilder_.clear();
+          canMessageBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
       /**
-       * <code>optional .openxc.RawMessage raw_message = 2;</code>
+       * <code>optional .openxc.CanMessage can_message = 2;</code>
        */
-      public com.openxc.BinaryMessages.RawMessage.Builder getRawMessageBuilder() {
+      public com.openxc.BinaryMessages.CanMessage.Builder getCanMessageBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
-        return getRawMessageFieldBuilder().getBuilder();
+        return getCanMessageFieldBuilder().getBuilder();
       }
       /**
-       * <code>optional .openxc.RawMessage raw_message = 2;</code>
+       * <code>optional .openxc.CanMessage can_message = 2;</code>
        */
-      public com.openxc.BinaryMessages.RawMessageOrBuilder getRawMessageOrBuilder() {
-        if (rawMessageBuilder_ != null) {
-          return rawMessageBuilder_.getMessageOrBuilder();
+      public com.openxc.BinaryMessages.CanMessageOrBuilder getCanMessageOrBuilder() {
+        if (canMessageBuilder_ != null) {
+          return canMessageBuilder_.getMessageOrBuilder();
         } else {
-          return rawMessage_;
+          return canMessage_;
         }
       }
       /**
-       * <code>optional .openxc.RawMessage raw_message = 2;</code>
+       * <code>optional .openxc.CanMessage can_message = 2;</code>
        */
       private com.google.protobuf.SingleFieldBuilder<
-          com.openxc.BinaryMessages.RawMessage, com.openxc.BinaryMessages.RawMessage.Builder, com.openxc.BinaryMessages.RawMessageOrBuilder> 
-          getRawMessageFieldBuilder() {
-        if (rawMessageBuilder_ == null) {
-          rawMessageBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              com.openxc.BinaryMessages.RawMessage, com.openxc.BinaryMessages.RawMessage.Builder, com.openxc.BinaryMessages.RawMessageOrBuilder>(
-                  rawMessage_,
+          com.openxc.BinaryMessages.CanMessage, com.openxc.BinaryMessages.CanMessage.Builder, com.openxc.BinaryMessages.CanMessageOrBuilder> 
+          getCanMessageFieldBuilder() {
+        if (canMessageBuilder_ == null) {
+          canMessageBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+              com.openxc.BinaryMessages.CanMessage, com.openxc.BinaryMessages.CanMessage.Builder, com.openxc.BinaryMessages.CanMessageOrBuilder>(
+                  canMessage_,
                   getParentForChildren(),
                   isClean());
-          rawMessage_ = null;
+          canMessage_ = null;
         }
-        return rawMessageBuilder_;
+        return canMessageBuilder_;
       }
 
-      // optional .openxc.TranslatedMessage translated_message = 3;
-      private com.openxc.BinaryMessages.TranslatedMessage translatedMessage_ = com.openxc.BinaryMessages.TranslatedMessage.getDefaultInstance();
+      // optional .openxc.SimpleMessage simple_message = 3;
+      private com.openxc.BinaryMessages.SimpleMessage simpleMessage_ = com.openxc.BinaryMessages.SimpleMessage.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
-          com.openxc.BinaryMessages.TranslatedMessage, com.openxc.BinaryMessages.TranslatedMessage.Builder, com.openxc.BinaryMessages.TranslatedMessageOrBuilder> translatedMessageBuilder_;
+          com.openxc.BinaryMessages.SimpleMessage, com.openxc.BinaryMessages.SimpleMessage.Builder, com.openxc.BinaryMessages.SimpleMessageOrBuilder> simpleMessageBuilder_;
       /**
-       * <code>optional .openxc.TranslatedMessage translated_message = 3;</code>
+       * <code>optional .openxc.SimpleMessage simple_message = 3;</code>
        */
-      public boolean hasTranslatedMessage() {
+      public boolean hasSimpleMessage() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * <code>optional .openxc.TranslatedMessage translated_message = 3;</code>
+       * <code>optional .openxc.SimpleMessage simple_message = 3;</code>
        */
-      public com.openxc.BinaryMessages.TranslatedMessage getTranslatedMessage() {
-        if (translatedMessageBuilder_ == null) {
-          return translatedMessage_;
+      public com.openxc.BinaryMessages.SimpleMessage getSimpleMessage() {
+        if (simpleMessageBuilder_ == null) {
+          return simpleMessage_;
         } else {
-          return translatedMessageBuilder_.getMessage();
+          return simpleMessageBuilder_.getMessage();
         }
       }
       /**
-       * <code>optional .openxc.TranslatedMessage translated_message = 3;</code>
+       * <code>optional .openxc.SimpleMessage simple_message = 3;</code>
        */
-      public Builder setTranslatedMessage(com.openxc.BinaryMessages.TranslatedMessage value) {
-        if (translatedMessageBuilder_ == null) {
+      public Builder setSimpleMessage(com.openxc.BinaryMessages.SimpleMessage value) {
+        if (simpleMessageBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          translatedMessage_ = value;
+          simpleMessage_ = value;
           onChanged();
         } else {
-          translatedMessageBuilder_.setMessage(value);
+          simpleMessageBuilder_.setMessage(value);
         }
         bitField0_ |= 0x00000004;
         return this;
       }
       /**
-       * <code>optional .openxc.TranslatedMessage translated_message = 3;</code>
+       * <code>optional .openxc.SimpleMessage simple_message = 3;</code>
        */
-      public Builder setTranslatedMessage(
-          com.openxc.BinaryMessages.TranslatedMessage.Builder builderForValue) {
-        if (translatedMessageBuilder_ == null) {
-          translatedMessage_ = builderForValue.build();
+      public Builder setSimpleMessage(
+          com.openxc.BinaryMessages.SimpleMessage.Builder builderForValue) {
+        if (simpleMessageBuilder_ == null) {
+          simpleMessage_ = builderForValue.build();
           onChanged();
         } else {
-          translatedMessageBuilder_.setMessage(builderForValue.build());
+          simpleMessageBuilder_.setMessage(builderForValue.build());
         }
         bitField0_ |= 0x00000004;
         return this;
       }
       /**
-       * <code>optional .openxc.TranslatedMessage translated_message = 3;</code>
+       * <code>optional .openxc.SimpleMessage simple_message = 3;</code>
        */
-      public Builder mergeTranslatedMessage(com.openxc.BinaryMessages.TranslatedMessage value) {
-        if (translatedMessageBuilder_ == null) {
+      public Builder mergeSimpleMessage(com.openxc.BinaryMessages.SimpleMessage value) {
+        if (simpleMessageBuilder_ == null) {
           if (((bitField0_ & 0x00000004) == 0x00000004) &&
-              translatedMessage_ != com.openxc.BinaryMessages.TranslatedMessage.getDefaultInstance()) {
-            translatedMessage_ =
-              com.openxc.BinaryMessages.TranslatedMessage.newBuilder(translatedMessage_).mergeFrom(value).buildPartial();
+              simpleMessage_ != com.openxc.BinaryMessages.SimpleMessage.getDefaultInstance()) {
+            simpleMessage_ =
+              com.openxc.BinaryMessages.SimpleMessage.newBuilder(simpleMessage_).mergeFrom(value).buildPartial();
           } else {
-            translatedMessage_ = value;
+            simpleMessage_ = value;
           }
           onChanged();
         } else {
-          translatedMessageBuilder_.mergeFrom(value);
+          simpleMessageBuilder_.mergeFrom(value);
         }
         bitField0_ |= 0x00000004;
         return this;
       }
       /**
-       * <code>optional .openxc.TranslatedMessage translated_message = 3;</code>
+       * <code>optional .openxc.SimpleMessage simple_message = 3;</code>
        */
-      public Builder clearTranslatedMessage() {
-        if (translatedMessageBuilder_ == null) {
-          translatedMessage_ = com.openxc.BinaryMessages.TranslatedMessage.getDefaultInstance();
+      public Builder clearSimpleMessage() {
+        if (simpleMessageBuilder_ == null) {
+          simpleMessage_ = com.openxc.BinaryMessages.SimpleMessage.getDefaultInstance();
           onChanged();
         } else {
-          translatedMessageBuilder_.clear();
+          simpleMessageBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
       /**
-       * <code>optional .openxc.TranslatedMessage translated_message = 3;</code>
+       * <code>optional .openxc.SimpleMessage simple_message = 3;</code>
        */
-      public com.openxc.BinaryMessages.TranslatedMessage.Builder getTranslatedMessageBuilder() {
+      public com.openxc.BinaryMessages.SimpleMessage.Builder getSimpleMessageBuilder() {
         bitField0_ |= 0x00000004;
         onChanged();
-        return getTranslatedMessageFieldBuilder().getBuilder();
+        return getSimpleMessageFieldBuilder().getBuilder();
       }
       /**
-       * <code>optional .openxc.TranslatedMessage translated_message = 3;</code>
+       * <code>optional .openxc.SimpleMessage simple_message = 3;</code>
        */
-      public com.openxc.BinaryMessages.TranslatedMessageOrBuilder getTranslatedMessageOrBuilder() {
-        if (translatedMessageBuilder_ != null) {
-          return translatedMessageBuilder_.getMessageOrBuilder();
+      public com.openxc.BinaryMessages.SimpleMessageOrBuilder getSimpleMessageOrBuilder() {
+        if (simpleMessageBuilder_ != null) {
+          return simpleMessageBuilder_.getMessageOrBuilder();
         } else {
-          return translatedMessage_;
+          return simpleMessage_;
         }
       }
       /**
-       * <code>optional .openxc.TranslatedMessage translated_message = 3;</code>
+       * <code>optional .openxc.SimpleMessage simple_message = 3;</code>
        */
       private com.google.protobuf.SingleFieldBuilder<
-          com.openxc.BinaryMessages.TranslatedMessage, com.openxc.BinaryMessages.TranslatedMessage.Builder, com.openxc.BinaryMessages.TranslatedMessageOrBuilder> 
-          getTranslatedMessageFieldBuilder() {
-        if (translatedMessageBuilder_ == null) {
-          translatedMessageBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              com.openxc.BinaryMessages.TranslatedMessage, com.openxc.BinaryMessages.TranslatedMessage.Builder, com.openxc.BinaryMessages.TranslatedMessageOrBuilder>(
-                  translatedMessage_,
+          com.openxc.BinaryMessages.SimpleMessage, com.openxc.BinaryMessages.SimpleMessage.Builder, com.openxc.BinaryMessages.SimpleMessageOrBuilder> 
+          getSimpleMessageFieldBuilder() {
+        if (simpleMessageBuilder_ == null) {
+          simpleMessageBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+              com.openxc.BinaryMessages.SimpleMessage, com.openxc.BinaryMessages.SimpleMessage.Builder, com.openxc.BinaryMessages.SimpleMessageOrBuilder>(
+                  simpleMessage_,
                   getParentForChildren(),
                   isClean());
-          translatedMessage_ = null;
+          simpleMessage_ = null;
         }
-        return translatedMessageBuilder_;
+        return simpleMessageBuilder_;
       }
 
       // optional .openxc.DiagnosticResponse diagnostic_response = 4;
@@ -1069,208 +1285,9339 @@ public final class BinaryMessages {
         return diagnosticResponseBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:openxc.VehicleMessage)
-    }
-
-    static {
-      defaultInstance = new VehicleMessage(true);
-      defaultInstance.initFields();
-    }
-
-    // @@protoc_insertion_point(class_scope:openxc.VehicleMessage)
-  }
-
-  public interface RawMessageOrBuilder
-      extends com.google.protobuf.MessageOrBuilder {
-
-    // optional int32 bus = 1;
-    /**
-     * <code>optional int32 bus = 1;</code>
-     */
-    boolean hasBus();
-    /**
-     * <code>optional int32 bus = 1;</code>
-     */
-    int getBus();
-
-    // optional uint32 message_id = 2;
-    /**
-     * <code>optional uint32 message_id = 2;</code>
-     */
-    boolean hasMessageId();
-    /**
-     * <code>optional uint32 message_id = 2;</code>
-     */
-    int getMessageId();
-
-    // optional bytes data = 3;
-    /**
-     * <code>optional bytes data = 3;</code>
-     */
-    boolean hasData();
-    /**
-     * <code>optional bytes data = 3;</code>
-     */
-    com.google.protobuf.ByteString getData();
-  }
-  /**
-   * Protobuf type {@code openxc.RawMessage}
-   */
-  public static final class RawMessage extends
-      com.google.protobuf.GeneratedMessage
-      implements RawMessageOrBuilder {
-    // Use RawMessage.newBuilder() to construct.
-    private RawMessage(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
-      super(builder);
-      this.unknownFields = builder.getUnknownFields();
-    }
-    private RawMessage(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final RawMessage defaultInstance;
-    public static RawMessage getDefaultInstance() {
-      return defaultInstance;
-    }
-
-    public RawMessage getDefaultInstanceForType() {
-      return defaultInstance;
-    }
-
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
-      return this.unknownFields;
-    }
-    private RawMessage(
-        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: {
-              bitField0_ |= 0x00000001;
-              bus_ = input.readInt32();
-              break;
-            }
-            case 16: {
-              bitField0_ |= 0x00000002;
-              messageId_ = input.readUInt32();
-              break;
-            }
-            case 26: {
-              bitField0_ |= 0x00000004;
-              data_ = input.readBytes();
-              break;
-            }
-          }
+      // optional .openxc.ControlCommand control_command = 5;
+      private com.openxc.BinaryMessages.ControlCommand controlCommand_ = com.openxc.BinaryMessages.ControlCommand.getDefaultInstance();
+      private com.google.protobuf.SingleFieldBuilder<
+          com.openxc.BinaryMessages.ControlCommand, com.openxc.BinaryMessages.ControlCommand.Builder, com.openxc.BinaryMessages.ControlCommandOrBuilder> controlCommandBuilder_;
+      /**
+       * <code>optional .openxc.ControlCommand control_command = 5;</code>
+       */
+      public boolean hasControlCommand() {
+        return ((bitField0_ & 0x00000010) == 0x00000010);
+      }
+      /**
+       * <code>optional .openxc.ControlCommand control_command = 5;</code>
+       */
+      public com.openxc.BinaryMessages.ControlCommand getControlCommand() {
+        if (controlCommandBuilder_ == null) {
+          return controlCommand_;
+        } else {
+          return controlCommandBuilder_.getMessage();
         }
-      } 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_RawMessage_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.openxc.BinaryMessages.internal_static_openxc_RawMessage_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.openxc.BinaryMessages.RawMessage.class, com.openxc.BinaryMessages.RawMessage.Builder.class);
-    }
-
-    public static com.google.protobuf.Parser<RawMessage> PARSER =
-        new com.google.protobuf.AbstractParser<RawMessage>() {
-      public RawMessage parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new RawMessage(input, extensionRegistry);
+      /**
+       * <code>optional .openxc.ControlCommand control_command = 5;</code>
+       */
+      public Builder setControlCommand(com.openxc.BinaryMessages.ControlCommand value) {
+        if (controlCommandBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          controlCommand_ = value;
+          onChanged();
+        } else {
+          controlCommandBuilder_.setMessage(value);
+        }
+        bitField0_ |= 0x00000010;
+        return this;
       }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<RawMessage> getParserForType() {
-      return PARSER;
-    }
+      /**
+       * <code>optional .openxc.ControlCommand control_command = 5;</code>
+       */
+      public Builder setControlCommand(
+          com.openxc.BinaryMessages.ControlCommand.Builder builderForValue) {
+        if (controlCommandBuilder_ == null) {
+          controlCommand_ = builderForValue.build();
+          onChanged();
+        } else {
+          controlCommandBuilder_.setMessage(builderForValue.build());
+        }
+        bitField0_ |= 0x00000010;
+        return this;
+      }
+      /**
+       * <code>optional .openxc.ControlCommand control_command = 5;</code>
+       */
+      public Builder mergeControlCommand(com.openxc.BinaryMessages.ControlCommand value) {
+        if (controlCommandBuilder_ == null) {
+          if (((bitField0_ & 0x00000010) == 0x00000010) &&
+              controlCommand_ != com.openxc.BinaryMessages.ControlCommand.getDefaultInstance()) {
+            controlCommand_ =
+              com.openxc.BinaryMessages.ControlCommand.newBuilder(controlCommand_).mergeFrom(value).buildPartial();
+          } else {
+            controlCommand_ = value;
+          }
+          onChanged();
+        } else {
+          controlCommandBuilder_.mergeFrom(value);
+        }
+        bitField0_ |= 0x00000010;
+        return this;
+      }
+      /**
+       * <code>optional .openxc.ControlCommand control_command = 5;</code>
+       */
+      public Builder clearControlCommand() {
+        if (controlCommandBuilder_ == null) {
+          controlCommand_ = com.openxc.BinaryMessages.ControlCommand.getDefaultInstance();
+          onChanged();
+        } else {
+          controlCommandBuilder_.clear();
+        }
+        bitField0_ = (bitField0_ & ~0x00000010);
+        return this;
+      }
+      /**
+       * <code>optional .openxc.ControlCommand control_command = 5;</code>
+       */
+      public com.openxc.BinaryMessages.ControlCommand.Builder getControlCommandBuilder() {
+        bitField0_ |= 0x00000010;
+        onChanged();
+        return getControlCommandFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>optional .openxc.ControlCommand control_command = 5;</code>
+       */
+      public com.openxc.BinaryMessages.ControlCommandOrBuilder getControlCommandOrBuilder() {
+        if (controlCommandBuilder_ != null) {
+          return controlCommandBuilder_.getMessageOrBuilder();
+        } else {
+          return controlCommand_;
+        }
+      }
+      /**
+       * <code>optional .openxc.ControlCommand control_command = 5;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilder<
+          com.openxc.BinaryMessages.ControlCommand, com.openxc.BinaryMessages.ControlCommand.Builder, com.openxc.BinaryMessages.ControlCommandOrBuilder> 
+          getControlCommandFieldBuilder() {
+        if (controlCommandBuilder_ == null) {
+          controlCommandBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+              com.openxc.BinaryMessages.ControlCommand, com.openxc.BinaryMessages.ControlCommand.Builder, com.openxc.BinaryMessages.ControlCommandOrBuilder>(
+                  controlCommand_,
+                  getParentForChildren(),
+                  isClean());
+          controlCommand_ = null;
+        }
+        return controlCommandBuilder_;
+      }
+
+      // optional .openxc.CommandResponse command_response = 6;
+      private com.openxc.BinaryMessages.CommandResponse commandResponse_ = com.openxc.BinaryMessages.CommandResponse.getDefaultInstance();
+      private com.google.protobuf.SingleFieldBuilder<
+          com.openxc.BinaryMessages.CommandResponse, com.openxc.BinaryMessages.CommandResponse.Builder, com.openxc.BinaryMessages.CommandResponseOrBuilder> commandResponseBuilder_;
+      /**
+       * <code>optional .openxc.CommandResponse command_response = 6;</code>
+       */
+      public boolean hasCommandResponse() {
+        return ((bitField0_ & 0x00000020) == 0x00000020);
+      }
+      /**
+       * <code>optional .openxc.CommandResponse command_response = 6;</code>
+       */
+      public com.openxc.BinaryMessages.CommandResponse getCommandResponse() {
+        if (commandResponseBuilder_ == null) {
+          return commandResponse_;
+        } else {
+          return commandResponseBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>optional .openxc.CommandResponse command_response = 6;</code>
+       */
+      public Builder setCommandResponse(com.openxc.BinaryMessages.CommandResponse value) {
+        if (commandResponseBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          commandResponse_ = value;
+          onChanged();
+        } else {
+          commandResponseBuilder_.setMessage(value);
+        }
+        bitField0_ |= 0x00000020;
+        return this;
+      }
+      /**
+       * <code>optional .openxc.CommandResponse command_response = 6;</code>
+       */
+      public Builder setCommandResponse(
+          com.openxc.BinaryMessages.CommandResponse.Builder builderForValue) {
+        if (commandResponseBuilder_ == null) {
+          commandResponse_ = builderForValue.build();
+          onChanged();
+        } else {
+          commandResponseBuilder_.setMessage(builderForValue.build());
+        }
+        bitField0_ |= 0x00000020;
+        return this;
+      }
+      /**
+       * <code>optional .openxc.CommandResponse command_response = 6;</code>
+       */
+      public Builder mergeCommandResponse(com.openxc.BinaryMessages.CommandResponse value) {
+        if (commandResponseBuilder_ == null) {
+          if (((bitField0_ & 0x00000020) == 0x00000020) &&
+              commandResponse_ != com.openxc.BinaryMessages.CommandResponse.getDefaultInstance()) {
+            commandResponse_ =
+              com.openxc.BinaryMessages.CommandResponse.newBuilder(commandResponse_).mergeFrom(value).buildPartial();
+          } else {
+            commandResponse_ = value;
+          }
+          onChanged();
+        } else {
+          commandResponseBuilder_.mergeFrom(value);
+        }
+        bitField0_ |= 0x00000020;
+        return this;
+      }
+      /**
+       * <code>optional .openxc.CommandResponse command_response = 6;</code>
+       */
+      public Builder clearCommandResponse() {
+        if (commandResponseBuilder_ == null) {
+          commandResponse_ = com.openxc.BinaryMessages.CommandResponse.getDefaultInstance();
+          onChanged();
+        } else {
+          commandResponseBuilder_.clear();
+        }
+        bitField0_ = (bitField0_ & ~0x00000020);
+        return this;
+      }
+      /**
+       * <code>optional .openxc.CommandResponse command_response = 6;</code>
+       */
+      public com.openxc.BinaryMessages.CommandResponse.Builder getCommandResponseBuilder() {
+        bitField0_ |= 0x00000020;
+        onChanged();
+        return getCommandResponseFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>optional .openxc.CommandResponse command_response = 6;</code>
+       */
+      public com.openxc.BinaryMessages.CommandResponseOrBuilder getCommandResponseOrBuilder() {
+        if (commandResponseBuilder_ != null) {
+          return commandResponseBuilder_.getMessageOrBuilder();
+        } else {
+          return commandResponse_;
+        }
+      }
+      /**
+       * <code>optional .openxc.CommandResponse command_response = 6;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilder<
+          com.openxc.BinaryMessages.CommandResponse, com.openxc.BinaryMessages.CommandResponse.Builder, com.openxc.BinaryMessages.CommandResponseOrBuilder> 
+          getCommandResponseFieldBuilder() {
+        if (commandResponseBuilder_ == null) {
+          commandResponseBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+              com.openxc.BinaryMessages.CommandResponse, com.openxc.BinaryMessages.CommandResponse.Builder, com.openxc.BinaryMessages.CommandResponseOrBuilder>(
+                  commandResponse_,
+                  getParentForChildren(),
+                  isClean());
+          commandResponse_ = null;
+        }
+        return commandResponseBuilder_;
+      }
+
+      // optional uint64 timestamp = 7;
+      private long timestamp_ ;
+      /**
+       * <code>optional uint64 timestamp = 7;</code>
+       */
+      public boolean hasTimestamp() {
+        return ((bitField0_ & 0x00000040) == 0x00000040);
+      }
+      /**
+       * <code>optional uint64 timestamp = 7;</code>
+       */
+      public long getTimestamp() {
+        return timestamp_;
+      }
+      /**
+       * <code>optional uint64 timestamp = 7;</code>
+       */
+      public Builder setTimestamp(long value) {
+        bitField0_ |= 0x00000040;
+        timestamp_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional uint64 timestamp = 7;</code>
+       */
+      public Builder clearTimestamp() {
+        bitField0_ = (bitField0_ & ~0x00000040);
+        timestamp_ = 0L;
+        onChanged();
+        return this;
+      }
+
+      // @@protoc_insertion_point(builder_scope:openxc.VehicleMessage)
+    }
+
+    static {
+      defaultInstance = new VehicleMessage(true);
+      defaultInstance.initFields();
+    }
+
+    // @@protoc_insertion_point(class_scope:openxc.VehicleMessage)
+  }
+
+  public interface CanMessageOrBuilder
+      extends com.google.protobuf.MessageOrBuilder {
+
+    // optional int32 bus = 1;
+    /**
+     * <code>optional int32 bus = 1;</code>
+     */
+    boolean hasBus();
+    /**
+     * <code>optional int32 bus = 1;</code>
+     */
+    int getBus();
+
+    // optional uint32 id = 2;
+    /**
+     * <code>optional uint32 id = 2;</code>
+     */
+    boolean hasId();
+    /**
+     * <code>optional uint32 id = 2;</code>
+     */
+    int getId();
+
+    // optional bytes data = 3;
+    /**
+     * <code>optional bytes data = 3;</code>
+     */
+    boolean hasData();
+    /**
+     * <code>optional bytes data = 3;</code>
+     */
+    com.google.protobuf.ByteString getData();
+
+    // optional .openxc.CanMessage.FrameFormat frame_format = 4;
+    /**
+     * <code>optional .openxc.CanMessage.FrameFormat frame_format = 4;</code>
+     */
+    boolean hasFrameFormat();
+    /**
+     * <code>optional .openxc.CanMessage.FrameFormat frame_format = 4;</code>
+     */
+    com.openxc.BinaryMessages.CanMessage.FrameFormat getFrameFormat();
+  }
+  /**
+   * Protobuf type {@code openxc.CanMessage}
+   */
+  public static final class CanMessage extends
+      com.google.protobuf.GeneratedMessage
+      implements CanMessageOrBuilder {
+    // Use CanMessage.newBuilder() to construct.
+    private CanMessage(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+      super(builder);
+      this.unknownFields = builder.getUnknownFields();
+    }
+    private CanMessage(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+
+    private static final CanMessage defaultInstance;
+    public static CanMessage getDefaultInstance() {
+      return defaultInstance;
+    }
+
+    public CanMessage getDefaultInstanceForType() {
+      return defaultInstance;
+    }
+
+    private final com.google.protobuf.UnknownFieldSet unknownFields;
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+        getUnknownFields() {
+      return this.unknownFields;
+    }
+    private CanMessage(
+        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: {
+              bitField0_ |= 0x00000001;
+              bus_ = input.readInt32();
+              break;
+            }
+            case 16: {
+              bitField0_ |= 0x00000002;
+              id_ = input.readUInt32();
+              break;
+            }
+            case 26: {
+              bitField0_ |= 0x00000004;
+              data_ = input.readBytes();
+              break;
+            }
+            case 32: {
+              int rawValue = input.readEnum();
+              com.openxc.BinaryMessages.CanMessage.FrameFormat value = com.openxc.BinaryMessages.CanMessage.FrameFormat.valueOf(rawValue);
+              if (value == null) {
+                unknownFields.mergeVarintField(4, rawValue);
+              } else {
+                bitField0_ |= 0x00000008;
+                frameFormat_ = value;
+              }
+              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_CanMessage_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.openxc.BinaryMessages.internal_static_openxc_CanMessage_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.openxc.BinaryMessages.CanMessage.class, com.openxc.BinaryMessages.CanMessage.Builder.class);
+    }
+
+    public static com.google.protobuf.Parser<CanMessage> PARSER =
+        new com.google.protobuf.AbstractParser<CanMessage>() {
+      public CanMessage parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new CanMessage(input, extensionRegistry);
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<CanMessage> getParserForType() {
+      return PARSER;
+    }
+
+    /**
+     * Protobuf enum {@code openxc.CanMessage.FrameFormat}
+     */
+    public enum FrameFormat
+        implements com.google.protobuf.ProtocolMessageEnum {
+      /**
+       * <code>STANDARD = 1;</code>
+       */
+      STANDARD(0, 1),
+      /**
+       * <code>EXTENDED = 2;</code>
+       */
+      EXTENDED(1, 2),
+      ;
+
+      /**
+       * <code>STANDARD = 1;</code>
+       */
+      public static final int STANDARD_VALUE = 1;
+      /**
+       * <code>EXTENDED = 2;</code>
+       */
+      public static final int EXTENDED_VALUE = 2;
+
+
+      public final int getNumber() { return value; }
+
+      public static FrameFormat valueOf(int value) {
+        switch (value) {
+          case 1: return STANDARD;
+          case 2: return EXTENDED;
+          default: return null;
+        }
+      }
+
+      public static com.google.protobuf.Internal.EnumLiteMap<FrameFormat>
+          internalGetValueMap() {
+        return internalValueMap;
+      }
+      private static com.google.protobuf.Internal.EnumLiteMap<FrameFormat>
+          internalValueMap =
+            new com.google.protobuf.Internal.EnumLiteMap<FrameFormat>() {
+              public FrameFormat findValueByNumber(int number) {
+                return FrameFormat.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.CanMessage.getDescriptor().getEnumTypes().get(0);
+      }
+
+      private static final FrameFormat[] VALUES = values();
+
+      public static FrameFormat 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 FrameFormat(int index, int value) {
+        this.index = index;
+        this.value = value;
+      }
+
+      // @@protoc_insertion_point(enum_scope:openxc.CanMessage.FrameFormat)
+    }
+
+    private int bitField0_;
+    // optional int32 bus = 1;
+    public static final int BUS_FIELD_NUMBER = 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_;
+    }
+
+    // optional uint32 id = 2;
+    public static final int ID_FIELD_NUMBER = 2;
+    private int id_;
+    /**
+     * <code>optional uint32 id = 2;</code>
+     */
+    public boolean hasId() {
+      return ((bitField0_ & 0x00000002) == 0x00000002);
+    }
+    /**
+     * <code>optional uint32 id = 2;</code>
+     */
+    public int getId() {
+      return id_;
+    }
+
+    // optional bytes data = 3;
+    public static final int DATA_FIELD_NUMBER = 3;
+    private com.google.protobuf.ByteString data_;
+    /**
+     * <code>optional bytes data = 3;</code>
+     */
+    public boolean hasData() {
+      return ((bitField0_ & 0x00000004) == 0x00000004);
+    }
+    /**
+     * <code>optional bytes data = 3;</code>
+     */
+    public com.google.protobuf.ByteString getData() {
+      return data_;
+    }
+
+    // optional .openxc.CanMessage.FrameFormat frame_format = 4;
+    public static final int FRAME_FORMAT_FIELD_NUMBER = 4;
+    private com.openxc.BinaryMessages.CanMessage.FrameFormat frameFormat_;
+    /**
+     * <code>optional .openxc.CanMessage.FrameFormat frame_format = 4;</code>
+     */
+    public boolean hasFrameFormat() {
+      return ((bitField0_ & 0x00000008) == 0x00000008);
+    }
+    /**
+     * <code>optional .openxc.CanMessage.FrameFormat frame_format = 4;</code>
+     */
+    public com.openxc.BinaryMessages.CanMessage.FrameFormat getFrameFormat() {
+      return frameFormat_;
+    }
+
+    private void initFields() {
+      bus_ = 0;
+      id_ = 0;
+      data_ = com.google.protobuf.ByteString.EMPTY;
+      frameFormat_ = com.openxc.BinaryMessages.CanMessage.FrameFormat.STANDARD;
+    }
+    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, id_);
+      }
+      if (((bitField0_ & 0x00000004) == 0x00000004)) {
+        output.writeBytes(3, data_);
+      }
+      if (((bitField0_ & 0x00000008) == 0x00000008)) {
+        output.writeEnum(4, frameFormat_.getNumber());
+      }
+      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, id_);
+      }
+      if (((bitField0_ & 0x00000004) == 0x00000004)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(3, data_);
+      }
+      if (((bitField0_ & 0x00000008) == 0x00000008)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(4, frameFormat_.getNumber());
+      }
+      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.CanMessage parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static com.openxc.BinaryMessages.CanMessage 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.CanMessage parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static com.openxc.BinaryMessages.CanMessage parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static com.openxc.BinaryMessages.CanMessage parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input);
+    }
+    public static com.openxc.BinaryMessages.CanMessage parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input, extensionRegistry);
+    }
+    public static com.openxc.BinaryMessages.CanMessage parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return PARSER.parseDelimitedFrom(input);
+    }
+    public static com.openxc.BinaryMessages.CanMessage parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+    }
+    public static com.openxc.BinaryMessages.CanMessage parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input);
+    }
+    public static com.openxc.BinaryMessages.CanMessage 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.CanMessage 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.CanMessage}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessage.Builder<Builder>
+       implements com.openxc.BinaryMessages.CanMessageOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return com.openxc.BinaryMessages.internal_static_openxc_CanMessage_descriptor;
+      }
+
+      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return com.openxc.BinaryMessages.internal_static_openxc_CanMessage_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                com.openxc.BinaryMessages.CanMessage.class, com.openxc.BinaryMessages.CanMessage.Builder.class);
+      }
+
+      // Construct using com.openxc.BinaryMessages.CanMessage.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);
+        id_ = 0;
+        bitField0_ = (bitField0_ & ~0x00000002);
+        data_ = com.google.protobuf.ByteString.EMPTY;
+        bitField0_ = (bitField0_ & ~0x00000004);
+        frameFormat_ = com.openxc.BinaryMessages.CanMessage.FrameFormat.STANDARD;
+        bitField0_ = (bitField0_ & ~0x00000008);
+        return this;
+      }
+
+      public Builder clone() {
+        return create().mergeFrom(buildPartial());
+      }
+
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return com.openxc.BinaryMessages.internal_static_openxc_CanMessage_descriptor;
+      }
+
+      public com.openxc.BinaryMessages.CanMessage getDefaultInstanceForType() {
+        return com.openxc.BinaryMessages.CanMessage.getDefaultInstance();
+      }
+
+      public com.openxc.BinaryMessages.CanMessage build() {
+        com.openxc.BinaryMessages.CanMessage result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      public com.openxc.BinaryMessages.CanMessage buildPartial() {
+        com.openxc.BinaryMessages.CanMessage result = new com.openxc.BinaryMessages.CanMessage(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.id_ = id_;
+        if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
+          to_bitField0_ |= 0x00000004;
+        }
+        result.data_ = data_;
+        if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
+          to_bitField0_ |= 0x00000008;
+        }
+        result.frameFormat_ = frameFormat_;
+        result.bitField0_ = to_bitField0_;
+        onBuilt();
+        return result;
+      }
+
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof com.openxc.BinaryMessages.CanMessage) {
+          return mergeFrom((com.openxc.BinaryMessages.CanMessage)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(com.openxc.BinaryMessages.CanMessage other) {
+        if (other == com.openxc.BinaryMessages.CanMessage.getDefaultInstance()) return this;
+        if (other.hasBus()) {
+          setBus(other.getBus());
+        }
+        if (other.hasId()) {
+          setId(other.getId());
+        }
+        if (other.hasData()) {
+          setData(other.getData());
+        }
+        if (other.hasFrameFormat()) {
+          setFrameFormat(other.getFrameFormat());
+        }
+        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.CanMessage parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.openxc.BinaryMessages.CanMessage) 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 id = 2;
+      private int id_ ;
+      /**
+       * <code>optional uint32 id = 2;</code>
+       */
+      public boolean hasId() {
+        return ((bitField0_ & 0x00000002) == 0x00000002);
+      }
+      /**
+       * <code>optional uint32 id = 2;</code>
+       */
+      public int getId() {
+        return id_;
+      }
+      /**
+       * <code>optional uint32 id = 2;</code>
+       */
+      public Builder setId(int value) {
+        bitField0_ |= 0x00000002;
+        id_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional uint32 id = 2;</code>
+       */
+      public Builder clearId() {
+        bitField0_ = (bitField0_ & ~0x00000002);
+        id_ = 0;
+        onChanged();
+        return this;
+      }
+
+      // optional bytes data = 3;
+      private com.google.protobuf.ByteString data_ = com.google.protobuf.ByteString.EMPTY;
+      /**
+       * <code>optional bytes data = 3;</code>
+       */
+      public boolean hasData() {
+        return ((bitField0_ & 0x00000004) == 0x00000004);
+      }
+      /**
+       * <code>optional bytes data = 3;</code>
+       */
+      public com.google.protobuf.ByteString getData() {
+        return data_;
+      }
+      /**
+       * <code>optional bytes data = 3;</code>
+       */
+      public Builder setData(com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000004;
+        data_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional bytes data = 3;</code>
+       */
+      public Builder clearData() {
+        bitField0_ = (bitField0_ & ~0x00000004);
+        data_ = getDefaultInstance().getData();
+        onChanged();
+        return this;
+      }
+
+      // optional .openxc.CanMessage.FrameFormat frame_format = 4;
+      private com.openxc.BinaryMessages.CanMessage.FrameFormat frameFormat_ = com.openxc.BinaryMessages.CanMessage.FrameFormat.STANDARD;
+      /**
+       * <code>optional .openxc.CanMessage.FrameFormat frame_format = 4;</code>
+       */
+      public boolean hasFrameFormat() {
+        return ((bitField0_ & 0x00000008) == 0x00000008);
+      }
+      /**
+       * <code>optional .openxc.CanMessage.FrameFormat frame_format = 4;</code>
+       */
+      public com.openxc.BinaryMessages.CanMessage.FrameFormat getFrameFormat() {
+        return frameFormat_;
+      }
+      /**
+       * <code>optional .openxc.CanMessage.FrameFormat frame_format = 4;</code>
+       */
+      public Builder setFrameFormat(com.openxc.BinaryMessages.CanMessage.FrameFormat value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        bitField0_ |= 0x00000008;
+        frameFormat_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .openxc.CanMessage.FrameFormat frame_format = 4;</code>
+       */
+      public Builder clearFrameFormat() {
+        bitField0_ = (bitField0_ & ~0x00000008);
+        frameFormat_ = com.openxc.BinaryMessages.CanMessage.FrameFormat.STANDARD;
+        onChanged();
+        return this;
+      }
+
+      // @@protoc_insertion_point(builder_scope:openxc.CanMessage)
+    }
+
+    static {
+      defaultInstance = new CanMessage(true);
+      defaultInstance.initFields();
+    }
+
+    // @@protoc_insertion_point(class_scope:openxc.CanMessage)
+  }
+
+  public interface ControlCommandOrBuilder
+      extends com.google.protobuf.MessageOrBuilder {
+
+    // optional .openxc.ControlCommand.Type type = 1;
+    /**
+     * <code>optional .openxc.ControlCommand.Type type = 1;</code>
+     */
+    boolean hasType();
+    /**
+     * <code>optional .openxc.ControlCommand.Type type = 1;</code>
+     */
+    com.openxc.BinaryMessages.ControlCommand.Type getType();
+
+    // optional .openxc.DiagnosticControlCommand diagnostic_request = 2;
+    /**
+     * <code>optional .openxc.DiagnosticControlCommand diagnostic_request = 2;</code>
+     */
+    boolean hasDiagnosticRequest();
+    /**
+     * <code>optional .openxc.DiagnosticControlCommand diagnostic_request = 2;</code>
+     */
+    com.openxc.BinaryMessages.DiagnosticControlCommand getDiagnosticRequest();
+    /**
+     * <code>optional .openxc.DiagnosticControlCommand diagnostic_request = 2;</code>
+     */
+    com.openxc.BinaryMessages.DiagnosticControlCommandOrBuilder getDiagnosticRequestOrBuilder();
+
+    // optional .openxc.PassthroughModeControlCommand passthrough_mode_request = 3;
+    /**
+     * <code>optional .openxc.PassthroughModeControlCommand passthrough_mode_request = 3;</code>
+     */
+    boolean hasPassthroughModeRequest();
+    /**
+     * <code>optional .openxc.PassthroughModeControlCommand passthrough_mode_request = 3;</code>
+     */
+    com.openxc.BinaryMessages.PassthroughModeControlCommand getPassthroughModeRequest();
+    /**
+     * <code>optional .openxc.PassthroughModeControlCommand passthrough_mode_request = 3;</code>
+     */
+    com.openxc.BinaryMessages.PassthroughModeControlCommandOrBuilder getPassthroughModeRequestOrBuilder();
+
+    // optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4;
+    /**
+     * <code>optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4;</code>
+     */
+    boolean hasAcceptanceFilterBypassCommand();
+    /**
+     * <code>optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4;</code>
+     */
+    com.openxc.BinaryMessages.AcceptanceFilterBypassCommand getAcceptanceFilterBypassCommand();
+    /**
+     * <code>optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4;</code>
+     */
+    com.openxc.BinaryMessages.AcceptanceFilterBypassCommandOrBuilder getAcceptanceFilterBypassCommandOrBuilder();
+
+    // optional .openxc.PayloadFormatCommand payload_format_command = 5;
+    /**
+     * <code>optional .openxc.PayloadFormatCommand payload_format_command = 5;</code>
+     */
+    boolean hasPayloadFormatCommand();
+    /**
+     * <code>optional .openxc.PayloadFormatCommand payload_format_command = 5;</code>
+     */
+    com.openxc.BinaryMessages.PayloadFormatCommand getPayloadFormatCommand();
+    /**
+     * <code>optional .openxc.PayloadFormatCommand payload_format_command = 5;</code>
+     */
+    com.openxc.BinaryMessages.PayloadFormatCommandOrBuilder getPayloadFormatCommandOrBuilder();
+
+    // optional .openxc.PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6;
+    /**
+     * <code>optional .openxc.PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6;</code>
+     */
+    boolean hasPredefinedObd2RequestsCommand();
+    /**
+     * <code>optional .openxc.PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6;</code>
+     */
+    com.openxc.BinaryMessages.PredefinedObd2RequestsCommand getPredefinedObd2RequestsCommand();
+    /**
+     * <code>optional .openxc.PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6;</code>
+     */
+    com.openxc.BinaryMessages.PredefinedObd2RequestsCommandOrBuilder getPredefinedObd2RequestsCommandOrBuilder();
+
+    // optional .openxc.ModemConfigurationCommand modem_configuration_command = 7;
+    /**
+     * <code>optional .openxc.ModemConfigurationCommand modem_configuration_command = 7;</code>
+     */
+    boolean hasModemConfigurationCommand();
+    /**
+     * <code>optional .openxc.ModemConfigurationCommand modem_configuration_command = 7;</code>
+     */
+    com.openxc.BinaryMessages.ModemConfigurationCommand getModemConfigurationCommand();
+    /**
+     * <code>optional .openxc.ModemConfigurationCommand modem_configuration_command = 7;</code>
+     */
+    com.openxc.BinaryMessages.ModemConfigurationCommandOrBuilder getModemConfigurationCommandOrBuilder();
+
+    // optional .openxc.RTCConfigurationCommand rtc_configuration_command = 8;
+    /**
+     * <code>optional .openxc.RTCConfigurationCommand rtc_configuration_command = 8;</code>
+     */
+    boolean hasRtcConfigurationCommand();
+    /**
+     * <code>optional .openxc.RTCConfigurationCommand rtc_configuration_command = 8;</code>
+     */
+    com.openxc.BinaryMessages.RTCConfigurationCommand getRtcConfigurationCommand();
+    /**
+     * <code>optional .openxc.RTCConfigurationCommand rtc_configuration_command = 8;</code>
+     */
+    com.openxc.BinaryMessages.RTCConfigurationCommandOrBuilder getRtcConfigurationCommandOrBuilder();
+  }
+  /**
+   * Protobuf type {@code openxc.ControlCommand}
+   */
+  public static final class ControlCommand extends
+      com.google.protobuf.GeneratedMessage
+      implements ControlCommandOrBuilder {
+    // Use ControlCommand.newBuilder() to construct.
+    private ControlCommand(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+      super(builder);
+      this.unknownFields = builder.getUnknownFields();
+    }
+    private ControlCommand(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+
+    private static final ControlCommand defaultInstance;
+    public static ControlCommand getDefaultInstance() {
+      return defaultInstance;
+    }
+
+    public ControlCommand getDefaultInstanceForType() {
+      return defaultInstance;
+    }
+
+    private final com.google.protobuf.UnknownFieldSet unknownFields;
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+        getUnknownFields() {
+      return this.unknownFields;
+    }
+    private ControlCommand(
+        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.ControlCommand.Type value = com.openxc.BinaryMessages.ControlCommand.Type.valueOf(rawValue);
+              if (value == null) {
+                unknownFields.mergeVarintField(1, rawValue);
+              } else {
+                bitField0_ |= 0x00000001;
+                type_ = value;
+              }
+              break;
+            }
+            case 18: {
+              com.openxc.BinaryMessages.DiagnosticControlCommand.Builder subBuilder = null;
+              if (((bitField0_ & 0x00000002) == 0x00000002)) {
+                subBuilder = diagnosticRequest_.toBuilder();
+              }
+              diagnosticRequest_ = input.readMessage(com.openxc.BinaryMessages.DiagnosticControlCommand.PARSER, extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(diagnosticRequest_);
+                diagnosticRequest_ = subBuilder.buildPartial();
+              }
+              bitField0_ |= 0x00000002;
+              break;
+            }
+            case 26: {
+              com.openxc.BinaryMessages.PassthroughModeControlCommand.Builder subBuilder = null;
+              if (((bitField0_ & 0x00000004) == 0x00000004)) {
+                subBuilder = passthroughModeRequest_.toBuilder();
+              }
+              passthroughModeRequest_ = input.readMessage(com.openxc.BinaryMessages.PassthroughModeControlCommand.PARSER, extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(passthroughModeRequest_);
+                passthroughModeRequest_ = subBuilder.buildPartial();
+              }
+              bitField0_ |= 0x00000004;
+              break;
+            }
+            case 34: {
+              com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.Builder subBuilder = null;
+              if (((bitField0_ & 0x00000008) == 0x00000008)) {
+                subBuilder = acceptanceFilterBypassCommand_.toBuilder();
+              }
+              acceptanceFilterBypassCommand_ = input.readMessage(com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.PARSER, extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(acceptanceFilterBypassCommand_);
+                acceptanceFilterBypassCommand_ = subBuilder.buildPartial();
+              }
+              bitField0_ |= 0x00000008;
+              break;
+            }
+            case 42: {
+              com.openxc.BinaryMessages.PayloadFormatCommand.Builder subBuilder = null;
+              if (((bitField0_ & 0x00000010) == 0x00000010)) {
+                subBuilder = payloadFormatCommand_.toBuilder();
+              }
+              payloadFormatCommand_ = input.readMessage(com.openxc.BinaryMessages.PayloadFormatCommand.PARSER, extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(payloadFormatCommand_);
+                payloadFormatCommand_ = subBuilder.buildPartial();
+              }
+              bitField0_ |= 0x00000010;
+              break;
+            }
+            case 50: {
+              com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.Builder subBuilder = null;
+              if (((bitField0_ & 0x00000020) == 0x00000020)) {
+                subBuilder = predefinedObd2RequestsCommand_.toBuilder();
+              }
+              predefinedObd2RequestsCommand_ = input.readMessage(com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.PARSER, extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(predefinedObd2RequestsCommand_);
+                predefinedObd2RequestsCommand_ = subBuilder.buildPartial();
+              }
+              bitField0_ |= 0x00000020;
+              break;
+            }
+            case 58: {
+              com.openxc.BinaryMessages.ModemConfigurationCommand.Builder subBuilder = null;
+              if (((bitField0_ & 0x00000040) == 0x00000040)) {
+                subBuilder = modemConfigurationCommand_.toBuilder();
+              }
+              modemConfigurationCommand_ = input.readMessage(com.openxc.BinaryMessages.ModemConfigurationCommand.PARSER, extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(modemConfigurationCommand_);
+                modemConfigurationCommand_ = subBuilder.buildPartial();
+              }
+              bitField0_ |= 0x00000040;
+              break;
+            }
+            case 66: {
+              com.openxc.BinaryMessages.RTCConfigurationCommand.Builder subBuilder = null;
+              if (((bitField0_ & 0x00000080) == 0x00000080)) {
+                subBuilder = rtcConfigurationCommand_.toBuilder();
+              }
+              rtcConfigurationCommand_ = input.readMessage(com.openxc.BinaryMessages.RTCConfigurationCommand.PARSER, extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(rtcConfigurationCommand_);
+                rtcConfigurationCommand_ = subBuilder.buildPartial();
+              }
+              bitField0_ |= 0x00000080;
+              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_ControlCommand_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.openxc.BinaryMessages.internal_static_openxc_ControlCommand_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.openxc.BinaryMessages.ControlCommand.class, com.openxc.BinaryMessages.ControlCommand.Builder.class);
+    }
+
+    public static com.google.protobuf.Parser<ControlCommand> PARSER =
+        new com.google.protobuf.AbstractParser<ControlCommand>() {
+      public ControlCommand parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new ControlCommand(input, extensionRegistry);
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<ControlCommand> getParserForType() {
+      return PARSER;
+    }
+
+    /**
+     * Protobuf enum {@code openxc.ControlCommand.Type}
+     */
+    public enum Type
+        implements com.google.protobuf.ProtocolMessageEnum {
+      /**
+       * <code>VERSION = 1;</code>
+       */
+      VERSION(0, 1),
+      /**
+       * <code>DEVICE_ID = 2;</code>
+       */
+      DEVICE_ID(1, 2),
+      /**
+       * <code>DIAGNOSTIC = 3;</code>
+       */
+      DIAGNOSTIC(2, 3),
+      /**
+       * <code>PASSTHROUGH = 4;</code>
+       */
+      PASSTHROUGH(3, 4),
+      /**
+       * <code>ACCEPTANCE_FILTER_BYPASS = 5;</code>
+       */
+      ACCEPTANCE_FILTER_BYPASS(4, 5),
+      /**
+       * <code>PAYLOAD_FORMAT = 6;</code>
+       */
+      PAYLOAD_FORMAT(5, 6),
+      /**
+       * <code>PREDEFINED_OBD2_REQUESTS = 7;</code>
+       */
+      PREDEFINED_OBD2_REQUESTS(6, 7),
+      /**
+       * <code>MODEM_CONFIGURATION = 8;</code>
+       */
+      MODEM_CONFIGURATION(7, 8),
+      /**
+       * <code>RTC_CONFIGURATION = 9;</code>
+       */
+      RTC_CONFIGURATION(8, 9),
+      /**
+       * <code>SD_MOUNT_STATUS = 10;</code>
+       */
+      SD_MOUNT_STATUS(9, 10),
+      ;
+
+      /**
+       * <code>VERSION = 1;</code>
+       */
+      public static final int VERSION_VALUE = 1;
+      /**
+       * <code>DEVICE_ID = 2;</code>
+       */
+      public static final int DEVICE_ID_VALUE = 2;
+      /**
+       * <code>DIAGNOSTIC = 3;</code>
+       */
+      public static final int DIAGNOSTIC_VALUE = 3;
+      /**
+       * <code>PASSTHROUGH = 4;</code>
+       */
+      public static final int PASSTHROUGH_VALUE = 4;
+      /**
+       * <code>ACCEPTANCE_FILTER_BYPASS = 5;</code>
+       */
+      public static final int ACCEPTANCE_FILTER_BYPASS_VALUE = 5;
+      /**
+       * <code>PAYLOAD_FORMAT = 6;</code>
+       */
+      public static final int PAYLOAD_FORMAT_VALUE = 6;
+      /**
+       * <code>PREDEFINED_OBD2_REQUESTS = 7;</code>
+       */
+      public static final int PREDEFINED_OBD2_REQUESTS_VALUE = 7;
+      /**
+       * <code>MODEM_CONFIGURATION = 8;</code>
+       */
+      public static final int MODEM_CONFIGURATION_VALUE = 8;
+      /**
+       * <code>RTC_CONFIGURATION = 9;</code>
+       */
+      public static final int RTC_CONFIGURATION_VALUE = 9;
+      /**
+       * <code>SD_MOUNT_STATUS = 10;</code>
+       */
+      public static final int SD_MOUNT_STATUS_VALUE = 10;
+
+
+      public final int getNumber() { return value; }
+
+      public static Type valueOf(int value) {
+        switch (value) {
+          case 1: return VERSION;
+          case 2: return DEVICE_ID;
+          case 3: return DIAGNOSTIC;
+          case 4: return PASSTHROUGH;
+          case 5: return ACCEPTANCE_FILTER_BYPASS;
+          case 6: return PAYLOAD_FORMAT;
+          case 7: return PREDEFINED_OBD2_REQUESTS;
+          case 8: return MODEM_CONFIGURATION;
+          case 9: return RTC_CONFIGURATION;
+          case 10: return SD_MOUNT_STATUS;
+          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.ControlCommand.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.ControlCommand.Type)
+    }
+
+    private int bitField0_;
+    // optional .openxc.ControlCommand.Type type = 1;
+    public static final int TYPE_FIELD_NUMBER = 1;
+    private com.openxc.BinaryMessages.ControlCommand.Type type_;
+    /**
+     * <code>optional .openxc.ControlCommand.Type type = 1;</code>
+     */
+    public boolean hasType() {
+      return ((bitField0_ & 0x00000001) == 0x00000001);
+    }
+    /**
+     * <code>optional .openxc.ControlCommand.Type type = 1;</code>
+     */
+    public com.openxc.BinaryMessages.ControlCommand.Type getType() {
+      return type_;
+    }
+
+    // optional .openxc.DiagnosticControlCommand diagnostic_request = 2;
+    public static final int DIAGNOSTIC_REQUEST_FIELD_NUMBER = 2;
+    private com.openxc.BinaryMessages.DiagnosticControlCommand diagnosticRequest_;
+    /**
+     * <code>optional .openxc.DiagnosticControlCommand diagnostic_request = 2;</code>
+     */
+    public boolean hasDiagnosticRequest() {
+      return ((bitField0_ & 0x00000002) == 0x00000002);
+    }
+    /**
+     * <code>optional .openxc.DiagnosticControlCommand diagnostic_request = 2;</code>
+     */
+    public com.openxc.BinaryMessages.DiagnosticControlCommand getDiagnosticRequest() {
+      return diagnosticRequest_;
+    }
+    /**
+     * <code>optional .openxc.DiagnosticControlCommand diagnostic_request = 2;</code>
+     */
+    public com.openxc.BinaryMessages.DiagnosticControlCommandOrBuilder getDiagnosticRequestOrBuilder() {
+      return diagnosticRequest_;
+    }
+
+    // optional .openxc.PassthroughModeControlCommand passthrough_mode_request = 3;
+    public static final int PASSTHROUGH_MODE_REQUEST_FIELD_NUMBER = 3;
+    private com.openxc.BinaryMessages.PassthroughModeControlCommand passthroughModeRequest_;
+    /**
+     * <code>optional .openxc.PassthroughModeControlCommand passthrough_mode_request = 3;</code>
+     */
+    public boolean hasPassthroughModeRequest() {
+      return ((bitField0_ & 0x00000004) == 0x00000004);
+    }
+    /**
+     * <code>optional .openxc.PassthroughModeControlCommand passthrough_mode_request = 3;</code>
+     */
+    public com.openxc.BinaryMessages.PassthroughModeControlCommand getPassthroughModeRequest() {
+      return passthroughModeRequest_;
+    }
+    /**
+     * <code>optional .openxc.PassthroughModeControlCommand passthrough_mode_request = 3;</code>
+     */
+    public com.openxc.BinaryMessages.PassthroughModeControlCommandOrBuilder getPassthroughModeRequestOrBuilder() {
+      return passthroughModeRequest_;
+    }
+
+    // optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4;
+    public static final int ACCEPTANCE_FILTER_BYPASS_COMMAND_FIELD_NUMBER = 4;
+    private com.openxc.BinaryMessages.AcceptanceFilterBypassCommand acceptanceFilterBypassCommand_;
+    /**
+     * <code>optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4;</code>
+     */
+    public boolean hasAcceptanceFilterBypassCommand() {
+      return ((bitField0_ & 0x00000008) == 0x00000008);
+    }
+    /**
+     * <code>optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4;</code>
+     */
+    public com.openxc.BinaryMessages.AcceptanceFilterBypassCommand getAcceptanceFilterBypassCommand() {
+      return acceptanceFilterBypassCommand_;
+    }
+    /**
+     * <code>optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4;</code>
+     */
+    public com.openxc.BinaryMessages.AcceptanceFilterBypassCommandOrBuilder getAcceptanceFilterBypassCommandOrBuilder() {
+      return acceptanceFilterBypassCommand_;
+    }
+
+    // optional .openxc.PayloadFormatCommand payload_format_command = 5;
+    public static final int PAYLOAD_FORMAT_COMMAND_FIELD_NUMBER = 5;
+    private com.openxc.BinaryMessages.PayloadFormatCommand payloadFormatCommand_;
+    /**
+     * <code>optional .openxc.PayloadFormatCommand payload_format_command = 5;</code>
+     */
+    public boolean hasPayloadFormatCommand() {
+      return ((bitField0_ & 0x00000010) == 0x00000010);
+    }
+    /**
+     * <code>optional .openxc.PayloadFormatCommand payload_format_command = 5;</code>
+     */
+    public com.openxc.BinaryMessages.PayloadFormatCommand getPayloadFormatCommand() {
+      return payloadFormatCommand_;
+    }
+    /**
+     * <code>optional .openxc.PayloadFormatCommand payload_format_command = 5;</code>
+     */
+    public com.openxc.BinaryMessages.PayloadFormatCommandOrBuilder getPayloadFormatCommandOrBuilder() {
+      return payloadFormatCommand_;
+    }
+
+    // optional .openxc.PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6;
+    public static final int PREDEFINED_OBD2_REQUESTS_COMMAND_FIELD_NUMBER = 6;
+    private com.openxc.BinaryMessages.PredefinedObd2RequestsCommand predefinedObd2RequestsCommand_;
+    /**
+     * <code>optional .openxc.PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6;</code>
+     */
+    public boolean hasPredefinedObd2RequestsCommand() {
+      return ((bitField0_ & 0x00000020) == 0x00000020);
+    }
+    /**
+     * <code>optional .openxc.PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6;</code>
+     */
+    public com.openxc.BinaryMessages.PredefinedObd2RequestsCommand getPredefinedObd2RequestsCommand() {
+      return predefinedObd2RequestsCommand_;
+    }
+    /**
+     * <code>optional .openxc.PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6;</code>
+     */
+    public com.openxc.BinaryMessages.PredefinedObd2RequestsCommandOrBuilder getPredefinedObd2RequestsCommandOrBuilder() {
+      return predefinedObd2RequestsCommand_;
+    }
+
+    // optional .openxc.ModemConfigurationCommand modem_configuration_command = 7;
+    public static final int MODEM_CONFIGURATION_COMMAND_FIELD_NUMBER = 7;
+    private com.openxc.BinaryMessages.ModemConfigurationCommand modemConfigurationCommand_;
+    /**
+     * <code>optional .openxc.ModemConfigurationCommand modem_configuration_command = 7;</code>
+     */
+    public boolean hasModemConfigurationCommand() {
+      return ((bitField0_ & 0x00000040) == 0x00000040);
+    }
+    /**
+     * <code>optional .openxc.ModemConfigurationCommand modem_configuration_command = 7;</code>
+     */
+    public com.openxc.BinaryMessages.ModemConfigurationCommand getModemConfigurationCommand() {
+      return modemConfigurationCommand_;
+    }
+    /**
+     * <code>optional .openxc.ModemConfigurationCommand modem_configuration_command = 7;</code>
+     */
+    public com.openxc.BinaryMessages.ModemConfigurationCommandOrBuilder getModemConfigurationCommandOrBuilder() {
+      return modemConfigurationCommand_;
+    }
+
+    // optional .openxc.RTCConfigurationCommand rtc_configuration_command = 8;
+    public static final int RTC_CONFIGURATION_COMMAND_FIELD_NUMBER = 8;
+    private com.openxc.BinaryMessages.RTCConfigurationCommand rtcConfigurationCommand_;
+    /**
+     * <code>optional .openxc.RTCConfigurationCommand rtc_configuration_command = 8;</code>
+     */
+    public boolean hasRtcConfigurationCommand() {
+      return ((bitField0_ & 0x00000080) == 0x00000080);
+    }
+    /**
+     * <code>optional .openxc.RTCConfigurationCommand rtc_configuration_command = 8;</code>
+     */
+    public com.openxc.BinaryMessages.RTCConfigurationCommand getRtcConfigurationCommand() {
+      return rtcConfigurationCommand_;
+    }
+    /**
+     * <code>optional .openxc.RTCConfigurationCommand rtc_configuration_command = 8;</code>
+     */
+    public com.openxc.BinaryMessages.RTCConfigurationCommandOrBuilder getRtcConfigurationCommandOrBuilder() {
+      return rtcConfigurationCommand_;
+    }
+
+    private void initFields() {
+      type_ = com.openxc.BinaryMessages.ControlCommand.Type.VERSION;
+      diagnosticRequest_ = com.openxc.BinaryMessages.DiagnosticControlCommand.getDefaultInstance();
+      passthroughModeRequest_ = com.openxc.BinaryMessages.PassthroughModeControlCommand.getDefaultInstance();
+      acceptanceFilterBypassCommand_ = com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.getDefaultInstance();
+      payloadFormatCommand_ = com.openxc.BinaryMessages.PayloadFormatCommand.getDefaultInstance();
+      predefinedObd2RequestsCommand_ = com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.getDefaultInstance();
+      modemConfigurationCommand_ = com.openxc.BinaryMessages.ModemConfigurationCommand.getDefaultInstance();
+      rtcConfigurationCommand_ = com.openxc.BinaryMessages.RTCConfigurationCommand.getDefaultInstance();
+    }
+    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.writeEnum(1, type_.getNumber());
+      }
+      if (((bitField0_ & 0x00000002) == 0x00000002)) {
+        output.writeMessage(2, diagnosticRequest_);
+      }
+      if (((bitField0_ & 0x00000004) == 0x00000004)) {
+        output.writeMessage(3, passthroughModeRequest_);
+      }
+      if (((bitField0_ & 0x00000008) == 0x00000008)) {
+        output.writeMessage(4, acceptanceFilterBypassCommand_);
+      }
+      if (((bitField0_ & 0x00000010) == 0x00000010)) {
+        output.writeMessage(5, payloadFormatCommand_);
+      }
+      if (((bitField0_ & 0x00000020) == 0x00000020)) {
+        output.writeMessage(6, predefinedObd2RequestsCommand_);
+      }
+      if (((bitField0_ & 0x00000040) == 0x00000040)) {
+        output.writeMessage(7, modemConfigurationCommand_);
+      }
+      if (((bitField0_ & 0x00000080) == 0x00000080)) {
+        output.writeMessage(8, rtcConfigurationCommand_);
+      }
+      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
+          .computeEnumSize(1, type_.getNumber());
+      }
+      if (((bitField0_ & 0x00000002) == 0x00000002)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(2, diagnosticRequest_);
+      }
+      if (((bitField0_ & 0x00000004) == 0x00000004)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(3, passthroughModeRequest_);
+      }
+      if (((bitField0_ & 0x00000008) == 0x00000008)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(4, acceptanceFilterBypassCommand_);
+      }
+      if (((bitField0_ & 0x00000010) == 0x00000010)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(5, payloadFormatCommand_);
+      }
+      if (((bitField0_ & 0x00000020) == 0x00000020)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(6, predefinedObd2RequestsCommand_);
+      }
+      if (((bitField0_ & 0x00000040) == 0x00000040)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(7, modemConfigurationCommand_);
+      }
+      if (((bitField0_ & 0x00000080) == 0x00000080)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(8, rtcConfigurationCommand_);
+      }
+      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.ControlCommand parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static com.openxc.BinaryMessages.ControlCommand 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.ControlCommand parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static com.openxc.BinaryMessages.ControlCommand parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static com.openxc.BinaryMessages.ControlCommand parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input);
+    }
+    public static com.openxc.BinaryMessages.ControlCommand parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input, extensionRegistry);
+    }
+    public static com.openxc.BinaryMessages.ControlCommand parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return PARSER.parseDelimitedFrom(input);
+    }
+    public static com.openxc.BinaryMessages.ControlCommand parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+    }
+    public static com.openxc.BinaryMessages.ControlCommand parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input);
+    }
+    public static com.openxc.BinaryMessages.ControlCommand 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.ControlCommand 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.ControlCommand}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessage.Builder<Builder>
+       implements com.openxc.BinaryMessages.ControlCommandOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return com.openxc.BinaryMessages.internal_static_openxc_ControlCommand_descriptor;
+      }
+
+      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return com.openxc.BinaryMessages.internal_static_openxc_ControlCommand_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                com.openxc.BinaryMessages.ControlCommand.class, com.openxc.BinaryMessages.ControlCommand.Builder.class);
+      }
+
+      // Construct using com.openxc.BinaryMessages.ControlCommand.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+          getDiagnosticRequestFieldBuilder();
+          getPassthroughModeRequestFieldBuilder();
+          getAcceptanceFilterBypassCommandFieldBuilder();
+          getPayloadFormatCommandFieldBuilder();
+          getPredefinedObd2RequestsCommandFieldBuilder();
+          getModemConfigurationCommandFieldBuilder();
+          getRtcConfigurationCommandFieldBuilder();
+        }
+      }
+      private static Builder create() {
+        return new Builder();
+      }
+
+      public Builder clear() {
+        super.clear();
+        type_ = com.openxc.BinaryMessages.ControlCommand.Type.VERSION;
+        bitField0_ = (bitField0_ & ~0x00000001);
+        if (diagnosticRequestBuilder_ == null) {
+          diagnosticRequest_ = com.openxc.BinaryMessages.DiagnosticControlCommand.getDefaultInstance();
+        } else {
+          diagnosticRequestBuilder_.clear();
+        }
+        bitField0_ = (bitField0_ & ~0x00000002);
+        if (passthroughModeRequestBuilder_ == null) {
+          passthroughModeRequest_ = com.openxc.BinaryMessages.PassthroughModeControlCommand.getDefaultInstance();
+        } else {
+          passthroughModeRequestBuilder_.clear();
+        }
+        bitField0_ = (bitField0_ & ~0x00000004);
+        if (acceptanceFilterBypassCommandBuilder_ == null) {
+          acceptanceFilterBypassCommand_ = com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.getDefaultInstance();
+        } else {
+          acceptanceFilterBypassCommandBuilder_.clear();
+        }
+        bitField0_ = (bitField0_ & ~0x00000008);
+        if (payloadFormatCommandBuilder_ == null) {
+          payloadFormatCommand_ = com.openxc.BinaryMessages.PayloadFormatCommand.getDefaultInstance();
+        } else {
+          payloadFormatCommandBuilder_.clear();
+        }
+        bitField0_ = (bitField0_ & ~0x00000010);
+        if (predefinedObd2RequestsCommandBuilder_ == null) {
+          predefinedObd2RequestsCommand_ = com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.getDefaultInstance();
+        } else {
+          predefinedObd2RequestsCommandBuilder_.clear();
+        }
+        bitField0_ = (bitField0_ & ~0x00000020);
+        if (modemConfigurationCommandBuilder_ == null) {
+          modemConfigurationCommand_ = com.openxc.BinaryMessages.ModemConfigurationCommand.getDefaultInstance();
+        } else {
+          modemConfigurationCommandBuilder_.clear();
+        }
+        bitField0_ = (bitField0_ & ~0x00000040);
+        if (rtcConfigurationCommandBuilder_ == null) {
+          rtcConfigurationCommand_ = com.openxc.BinaryMessages.RTCConfigurationCommand.getDefaultInstance();
+        } else {
+          rtcConfigurationCommandBuilder_.clear();
+        }
+        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_ControlCommand_descriptor;
+      }
+
+      public com.openxc.BinaryMessages.ControlCommand getDefaultInstanceForType() {
+        return com.openxc.BinaryMessages.ControlCommand.getDefaultInstance();
+      }
+
+      public com.openxc.BinaryMessages.ControlCommand build() {
+        com.openxc.BinaryMessages.ControlCommand result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      public com.openxc.BinaryMessages.ControlCommand buildPartial() {
+        com.openxc.BinaryMessages.ControlCommand result = new com.openxc.BinaryMessages.ControlCommand(this);
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
+          to_bitField0_ |= 0x00000001;
+        }
+        result.type_ = type_;
+        if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
+          to_bitField0_ |= 0x00000002;
+        }
+        if (diagnosticRequestBuilder_ == null) {
+          result.diagnosticRequest_ = diagnosticRequest_;
+        } else {
+          result.diagnosticRequest_ = diagnosticRequestBuilder_.build();
+        }
+        if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
+          to_bitField0_ |= 0x00000004;
+        }
+        if (passthroughModeRequestBuilder_ == null) {
+          result.passthroughModeRequest_ = passthroughModeRequest_;
+        } else {
+          result.passthroughModeRequest_ = passthroughModeRequestBuilder_.build();
+        }
+        if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
+          to_bitField0_ |= 0x00000008;
+        }
+        if (acceptanceFilterBypassCommandBuilder_ == null) {
+          result.acceptanceFilterBypassCommand_ = acceptanceFilterBypassCommand_;
+        } else {
+          result.acceptanceFilterBypassCommand_ = acceptanceFilterBypassCommandBuilder_.build();
+        }
+        if (((from_bitField0_ & 0x00000010) == 0x00000010)) {
+          to_bitField0_ |= 0x00000010;
+        }
+        if (payloadFormatCommandBuilder_ == null) {
+          result.payloadFormatCommand_ = payloadFormatCommand_;
+        } else {
+          result.payloadFormatCommand_ = payloadFormatCommandBuilder_.build();
+        }
+        if (((from_bitField0_ & 0x00000020) == 0x00000020)) {
+          to_bitField0_ |= 0x00000020;
+        }
+        if (predefinedObd2RequestsCommandBuilder_ == null) {
+          result.predefinedObd2RequestsCommand_ = predefinedObd2RequestsCommand_;
+        } else {
+          result.predefinedObd2RequestsCommand_ = predefinedObd2RequestsCommandBuilder_.build();
+        }
+        if (((from_bitField0_ & 0x00000040) == 0x00000040)) {
+          to_bitField0_ |= 0x00000040;
+        }
+        if (modemConfigurationCommandBuilder_ == null) {
+          result.modemConfigurationCommand_ = modemConfigurationCommand_;
+        } else {
+          result.modemConfigurationCommand_ = modemConfigurationCommandBuilder_.build();
+        }
+        if (((from_bitField0_ & 0x00000080) == 0x00000080)) {
+          to_bitField0_ |= 0x00000080;
+        }
+        if (rtcConfigurationCommandBuilder_ == null) {
+          result.rtcConfigurationCommand_ = rtcConfigurationCommand_;
+        } else {
+          result.rtcConfigurationCommand_ = rtcConfigurationCommandBuilder_.build();
+        }
+        result.bitField0_ = to_bitField0_;
+        onBuilt();
+        return result;
+      }
+
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof com.openxc.BinaryMessages.ControlCommand) {
+          return mergeFrom((com.openxc.BinaryMessages.ControlCommand)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(com.openxc.BinaryMessages.ControlCommand other) {
+        if (other == com.openxc.BinaryMessages.ControlCommand.getDefaultInstance()) return this;
+        if (other.hasType()) {
+          setType(other.getType());
+        }
+        if (other.hasDiagnosticRequest()) {
+          mergeDiagnosticRequest(other.getDiagnosticRequest());
+        }
+        if (other.hasPassthroughModeRequest()) {
+          mergePassthroughModeRequest(other.getPassthroughModeRequest());
+        }
+        if (other.hasAcceptanceFilterBypassCommand()) {
+          mergeAcceptanceFilterBypassCommand(other.getAcceptanceFilterBypassCommand());
+        }
+        if (other.hasPayloadFormatCommand()) {
+          mergePayloadFormatCommand(other.getPayloadFormatCommand());
+        }
+        if (other.hasPredefinedObd2RequestsCommand()) {
+          mergePredefinedObd2RequestsCommand(other.getPredefinedObd2RequestsCommand());
+        }
+        if (other.hasModemConfigurationCommand()) {
+          mergeModemConfigurationCommand(other.getModemConfigurationCommand());
+        }
+        if (other.hasRtcConfigurationCommand()) {
+          mergeRtcConfigurationCommand(other.getRtcConfigurationCommand());
+        }
+        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.ControlCommand parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.openxc.BinaryMessages.ControlCommand) e.getUnfinishedMessage();
+          throw e;
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+      private int bitField0_;
+
+      // optional .openxc.ControlCommand.Type type = 1;
+      private com.openxc.BinaryMessages.ControlCommand.Type type_ = com.openxc.BinaryMessages.ControlCommand.Type.VERSION;
+      /**
+       * <code>optional .openxc.ControlCommand.Type type = 1;</code>
+       */
+      public boolean hasType() {
+        return ((bitField0_ & 0x00000001) == 0x00000001);
+      }
+      /**
+       * <code>optional .openxc.ControlCommand.Type type = 1;</code>
+       */
+      public com.openxc.BinaryMessages.ControlCommand.Type getType() {
+        return type_;
+      }
+      /**
+       * <code>optional .openxc.ControlCommand.Type type = 1;</code>
+       */
+      public Builder setType(com.openxc.BinaryMessages.ControlCommand.Type value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        bitField0_ |= 0x00000001;
+        type_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .openxc.ControlCommand.Type type = 1;</code>
+       */
+      public Builder clearType() {
+        bitField0_ = (bitField0_ & ~0x00000001);
+        type_ = com.openxc.BinaryMessages.ControlCommand.Type.VERSION;
+        onChanged();
+        return this;
+      }
+
+      // optional .openxc.DiagnosticControlCommand diagnostic_request = 2;
+      private com.openxc.BinaryMessages.DiagnosticControlCommand diagnosticRequest_ = com.openxc.BinaryMessages.DiagnosticControlCommand.getDefaultInstance();
+      private com.google.protobuf.SingleFieldBuilder<
+          com.openxc.BinaryMessages.DiagnosticControlCommand, com.openxc.BinaryMessages.DiagnosticControlCommand.Builder, com.openxc.BinaryMessages.DiagnosticControlCommandOrBuilder> diagnosticRequestBuilder_;
+      /**
+       * <code>optional .openxc.DiagnosticControlCommand diagnostic_request = 2;</code>
+       */
+      public boolean hasDiagnosticRequest() {
+        return ((bitField0_ & 0x00000002) == 0x00000002);
+      }
+      /**
+       * <code>optional .openxc.DiagnosticControlCommand diagnostic_request = 2;</code>
+       */
+      public com.openxc.BinaryMessages.DiagnosticControlCommand getDiagnosticRequest() {
+        if (diagnosticRequestBuilder_ == null) {
+          return diagnosticRequest_;
+        } else {
+          return diagnosticRequestBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>optional .openxc.DiagnosticControlCommand diagnostic_request = 2;</code>
+       */
+      public Builder setDiagnosticRequest(com.openxc.BinaryMessages.DiagnosticControlCommand value) {
+        if (diagnosticRequestBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          diagnosticRequest_ = value;
+          onChanged();
+        } else {
+          diagnosticRequestBuilder_.setMessage(value);
+        }
+        bitField0_ |= 0x00000002;
+        return this;
+      }
+      /**
+       * <code>optional .openxc.DiagnosticControlCommand diagnostic_request = 2;</code>
+       */
+      public Builder setDiagnosticRequest(
+          com.openxc.BinaryMessages.DiagnosticControlCommand.Builder builderForValue) {
+        if (diagnosticRequestBuilder_ == null) {
+          diagnosticRequest_ = builderForValue.build();
+          onChanged();
+        } else {
+          diagnosticRequestBuilder_.setMessage(builderForValue.build());
+        }
+        bitField0_ |= 0x00000002;
+        return this;
+      }
+      /**
+       * <code>optional .openxc.DiagnosticControlCommand diagnostic_request = 2;</code>
+       */
+      public Builder mergeDiagnosticRequest(com.openxc.BinaryMessages.DiagnosticControlCommand value) {
+        if (diagnosticRequestBuilder_ == null) {
+          if (((bitField0_ & 0x00000002) == 0x00000002) &&
+              diagnosticRequest_ != com.openxc.BinaryMessages.DiagnosticControlCommand.getDefaultInstance()) {
+            diagnosticRequest_ =
+              com.openxc.BinaryMessages.DiagnosticControlCommand.newBuilder(diagnosticRequest_).mergeFrom(value).buildPartial();
+          } else {
+            diagnosticRequest_ = value;
+          }
+          onChanged();
+        } else {
+          diagnosticRequestBuilder_.mergeFrom(value);
+        }
+        bitField0_ |= 0x00000002;
+        return this;
+      }
+      /**
+       * <code>optional .openxc.DiagnosticControlCommand diagnostic_request = 2;</code>
+       */
+      public Builder clearDiagnosticRequest() {
+        if (diagnosticRequestBuilder_ == null) {
+          diagnosticRequest_ = com.openxc.BinaryMessages.DiagnosticControlCommand.getDefaultInstance();
+          onChanged();
+        } else {
+          diagnosticRequestBuilder_.clear();
+        }
+        bitField0_ = (bitField0_ & ~0x00000002);
+        return this;
+      }
+      /**
+       * <code>optional .openxc.DiagnosticControlCommand diagnostic_request = 2;</code>
+       */
+      public com.openxc.BinaryMessages.DiagnosticControlCommand.Builder getDiagnosticRequestBuilder() {
+        bitField0_ |= 0x00000002;
+        onChanged();
+        return getDiagnosticRequestFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>optional .openxc.DiagnosticControlCommand diagnostic_request = 2;</code>
+       */
+      public com.openxc.BinaryMessages.DiagnosticControlCommandOrBuilder getDiagnosticRequestOrBuilder() {
+        if (diagnosticRequestBuilder_ != null) {
+          return diagnosticRequestBuilder_.getMessageOrBuilder();
+        } else {
+          return diagnosticRequest_;
+        }
+      }
+      /**
+       * <code>optional .openxc.DiagnosticControlCommand diagnostic_request = 2;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilder<
+          com.openxc.BinaryMessages.DiagnosticControlCommand, com.openxc.BinaryMessages.DiagnosticControlCommand.Builder, com.openxc.BinaryMessages.DiagnosticControlCommandOrBuilder> 
+          getDiagnosticRequestFieldBuilder() {
+        if (diagnosticRequestBuilder_ == null) {
+          diagnosticRequestBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+              com.openxc.BinaryMessages.DiagnosticControlCommand, com.openxc.BinaryMessages.DiagnosticControlCommand.Builder, com.openxc.BinaryMessages.DiagnosticControlCommandOrBuilder>(
+                  diagnosticRequest_,
+                  getParentForChildren(),
+                  isClean());
+          diagnosticRequest_ = null;
+        }
+        return diagnosticRequestBuilder_;
+      }
+
+      // optional .openxc.PassthroughModeControlCommand passthrough_mode_request = 3;
+      private com.openxc.BinaryMessages.PassthroughModeControlCommand passthroughModeRequest_ = com.openxc.BinaryMessages.PassthroughModeControlCommand.getDefaultInstance();
+      private com.google.protobuf.SingleFieldBuilder<
+          com.openxc.BinaryMessages.PassthroughModeControlCommand, com.openxc.BinaryMessages.PassthroughModeControlCommand.Builder, com.openxc.BinaryMessages.PassthroughModeControlCommandOrBuilder> passthroughModeRequestBuilder_;
+      /**
+       * <code>optional .openxc.PassthroughModeControlCommand passthrough_mode_request = 3;</code>
+       */
+      public boolean hasPassthroughModeRequest() {
+        return ((bitField0_ & 0x00000004) == 0x00000004);
+      }
+      /**
+       * <code>optional .openxc.PassthroughModeControlCommand passthrough_mode_request = 3;</code>
+       */
+      public com.openxc.BinaryMessages.PassthroughModeControlCommand getPassthroughModeRequest() {
+        if (passthroughModeRequestBuilder_ == null) {
+          return passthroughModeRequest_;
+        } else {
+          return passthroughModeRequestBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>optional .openxc.PassthroughModeControlCommand passthrough_mode_request = 3;</code>
+       */
+      public Builder setPassthroughModeRequest(com.openxc.BinaryMessages.PassthroughModeControlCommand value) {
+        if (passthroughModeRequestBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          passthroughModeRequest_ = value;
+          onChanged();
+        } else {
+          passthroughModeRequestBuilder_.setMessage(value);
+        }
+        bitField0_ |= 0x00000004;
+        return this;
+      }
+      /**
+       * <code>optional .openxc.PassthroughModeControlCommand passthrough_mode_request = 3;</code>
+       */
+      public Builder setPassthroughModeRequest(
+          com.openxc.BinaryMessages.PassthroughModeControlCommand.Builder builderForValue) {
+        if (passthroughModeRequestBuilder_ == null) {
+          passthroughModeRequest_ = builderForValue.build();
+          onChanged();
+        } else {
+          passthroughModeRequestBuilder_.setMessage(builderForValue.build());
+        }
+        bitField0_ |= 0x00000004;
+        return this;
+      }
+      /**
+       * <code>optional .openxc.PassthroughModeControlCommand passthrough_mode_request = 3;</code>
+       */
+      public Builder mergePassthroughModeRequest(com.openxc.BinaryMessages.PassthroughModeControlCommand value) {
+        if (passthroughModeRequestBuilder_ == null) {
+          if (((bitField0_ & 0x00000004) == 0x00000004) &&
+              passthroughModeRequest_ != com.openxc.BinaryMessages.PassthroughModeControlCommand.getDefaultInstance()) {
+            passthroughModeRequest_ =
+              com.openxc.BinaryMessages.PassthroughModeControlCommand.newBuilder(passthroughModeRequest_).mergeFrom(value).buildPartial();
+          } else {
+            passthroughModeRequest_ = value;
+          }
+          onChanged();
+        } else {
+          passthroughModeRequestBuilder_.mergeFrom(value);
+        }
+        bitField0_ |= 0x00000004;
+        return this;
+      }
+      /**
+       * <code>optional .openxc.PassthroughModeControlCommand passthrough_mode_request = 3;</code>
+       */
+      public Builder clearPassthroughModeRequest() {
+        if (passthroughModeRequestBuilder_ == null) {
+          passthroughModeRequest_ = com.openxc.BinaryMessages.PassthroughModeControlCommand.getDefaultInstance();
+          onChanged();
+        } else {
+          passthroughModeRequestBuilder_.clear();
+        }
+        bitField0_ = (bitField0_ & ~0x00000004);
+        return this;
+      }
+      /**
+       * <code>optional .openxc.PassthroughModeControlCommand passthrough_mode_request = 3;</code>
+       */
+      public com.openxc.BinaryMessages.PassthroughModeControlCommand.Builder getPassthroughModeRequestBuilder() {
+        bitField0_ |= 0x00000004;
+        onChanged();
+        return getPassthroughModeRequestFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>optional .openxc.PassthroughModeControlCommand passthrough_mode_request = 3;</code>
+       */
+      public com.openxc.BinaryMessages.PassthroughModeControlCommandOrBuilder getPassthroughModeRequestOrBuilder() {
+        if (passthroughModeRequestBuilder_ != null) {
+          return passthroughModeRequestBuilder_.getMessageOrBuilder();
+        } else {
+          return passthroughModeRequest_;
+        }
+      }
+      /**
+       * <code>optional .openxc.PassthroughModeControlCommand passthrough_mode_request = 3;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilder<
+          com.openxc.BinaryMessages.PassthroughModeControlCommand, com.openxc.BinaryMessages.PassthroughModeControlCommand.Builder, com.openxc.BinaryMessages.PassthroughModeControlCommandOrBuilder> 
+          getPassthroughModeRequestFieldBuilder() {
+        if (passthroughModeRequestBuilder_ == null) {
+          passthroughModeRequestBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+              com.openxc.BinaryMessages.PassthroughModeControlCommand, com.openxc.BinaryMessages.PassthroughModeControlCommand.Builder, com.openxc.BinaryMessages.PassthroughModeControlCommandOrBuilder>(
+                  passthroughModeRequest_,
+                  getParentForChildren(),
+                  isClean());
+          passthroughModeRequest_ = null;
+        }
+        return passthroughModeRequestBuilder_;
+      }
+
+      // optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4;
+      private com.openxc.BinaryMessages.AcceptanceFilterBypassCommand acceptanceFilterBypassCommand_ = com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.getDefaultInstance();
+      private com.google.protobuf.SingleFieldBuilder<
+          com.openxc.BinaryMessages.AcceptanceFilterBypassCommand, com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.Builder, com.openxc.BinaryMessages.AcceptanceFilterBypassCommandOrBuilder> acceptanceFilterBypassCommandBuilder_;
+      /**
+       * <code>optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4;</code>
+       */
+      public boolean hasAcceptanceFilterBypassCommand() {
+        return ((bitField0_ & 0x00000008) == 0x00000008);
+      }
+      /**
+       * <code>optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4;</code>
+       */
+      public com.openxc.BinaryMessages.AcceptanceFilterBypassCommand getAcceptanceFilterBypassCommand() {
+        if (acceptanceFilterBypassCommandBuilder_ == null) {
+          return acceptanceFilterBypassCommand_;
+        } else {
+          return acceptanceFilterBypassCommandBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4;</code>
+       */
+      public Builder setAcceptanceFilterBypassCommand(com.openxc.BinaryMessages.AcceptanceFilterBypassCommand value) {
+        if (acceptanceFilterBypassCommandBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          acceptanceFilterBypassCommand_ = value;
+          onChanged();
+        } else {
+          acceptanceFilterBypassCommandBuilder_.setMessage(value);
+        }
+        bitField0_ |= 0x00000008;
+        return this;
+      }
+      /**
+       * <code>optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4;</code>
+       */
+      public Builder setAcceptanceFilterBypassCommand(
+          com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.Builder builderForValue) {
+        if (acceptanceFilterBypassCommandBuilder_ == null) {
+          acceptanceFilterBypassCommand_ = builderForValue.build();
+          onChanged();
+        } else {
+          acceptanceFilterBypassCommandBuilder_.setMessage(builderForValue.build());
+        }
+        bitField0_ |= 0x00000008;
+        return this;
+      }
+      /**
+       * <code>optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4;</code>
+       */
+      public Builder mergeAcceptanceFilterBypassCommand(com.openxc.BinaryMessages.AcceptanceFilterBypassCommand value) {
+        if (acceptanceFilterBypassCommandBuilder_ == null) {
+          if (((bitField0_ & 0x00000008) == 0x00000008) &&
+              acceptanceFilterBypassCommand_ != com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.getDefaultInstance()) {
+            acceptanceFilterBypassCommand_ =
+              com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.newBuilder(acceptanceFilterBypassCommand_).mergeFrom(value).buildPartial();
+          } else {
+            acceptanceFilterBypassCommand_ = value;
+          }
+          onChanged();
+        } else {
+          acceptanceFilterBypassCommandBuilder_.mergeFrom(value);
+        }
+        bitField0_ |= 0x00000008;
+        return this;
+      }
+      /**
+       * <code>optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4;</code>
+       */
+      public Builder clearAcceptanceFilterBypassCommand() {
+        if (acceptanceFilterBypassCommandBuilder_ == null) {
+          acceptanceFilterBypassCommand_ = com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.getDefaultInstance();
+          onChanged();
+        } else {
+          acceptanceFilterBypassCommandBuilder_.clear();
+        }
+        bitField0_ = (bitField0_ & ~0x00000008);
+        return this;
+      }
+      /**
+       * <code>optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4;</code>
+       */
+      public com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.Builder getAcceptanceFilterBypassCommandBuilder() {
+        bitField0_ |= 0x00000008;
+        onChanged();
+        return getAcceptanceFilterBypassCommandFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4;</code>
+       */
+      public com.openxc.BinaryMessages.AcceptanceFilterBypassCommandOrBuilder getAcceptanceFilterBypassCommandOrBuilder() {
+        if (acceptanceFilterBypassCommandBuilder_ != null) {
+          return acceptanceFilterBypassCommandBuilder_.getMessageOrBuilder();
+        } else {
+          return acceptanceFilterBypassCommand_;
+        }
+      }
+      /**
+       * <code>optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilder<
+          com.openxc.BinaryMessages.AcceptanceFilterBypassCommand, com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.Builder, com.openxc.BinaryMessages.AcceptanceFilterBypassCommandOrBuilder> 
+          getAcceptanceFilterBypassCommandFieldBuilder() {
+        if (acceptanceFilterBypassCommandBuilder_ == null) {
+          acceptanceFilterBypassCommandBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+              com.openxc.BinaryMessages.AcceptanceFilterBypassCommand, com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.Builder, com.openxc.BinaryMessages.AcceptanceFilterBypassCommandOrBuilder>(
+                  acceptanceFilterBypassCommand_,
+                  getParentForChildren(),
+                  isClean());
+          acceptanceFilterBypassCommand_ = null;
+        }
+        return acceptanceFilterBypassCommandBuilder_;
+      }
+
+      // optional .openxc.PayloadFormatCommand payload_format_command = 5;
+      private com.openxc.BinaryMessages.PayloadFormatCommand payloadFormatCommand_ = com.openxc.BinaryMessages.PayloadFormatCommand.getDefaultInstance();
+      private com.google.protobuf.SingleFieldBuilder<
+          com.openxc.BinaryMessages.PayloadFormatCommand, com.openxc.BinaryMessages.PayloadFormatCommand.Builder, com.openxc.BinaryMessages.PayloadFormatCommandOrBuilder> payloadFormatCommandBuilder_;
+      /**
+       * <code>optional .openxc.PayloadFormatCommand payload_format_command = 5;</code>
+       */
+      public boolean hasPayloadFormatCommand() {
+        return ((bitField0_ & 0x00000010) == 0x00000010);
+      }
+      /**
+       * <code>optional .openxc.PayloadFormatCommand payload_format_command = 5;</code>
+       */
+      public com.openxc.BinaryMessages.PayloadFormatCommand getPayloadFormatCommand() {
+        if (payloadFormatCommandBuilder_ == null) {
+          return payloadFormatCommand_;
+        } else {
+          return payloadFormatCommandBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>optional .openxc.PayloadFormatCommand payload_format_command = 5;</code>
+       */
+      public Builder setPayloadFormatCommand(com.openxc.BinaryMessages.PayloadFormatCommand value) {
+        if (payloadFormatCommandBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          payloadFormatCommand_ = value;
+          onChanged();
+        } else {
+          payloadFormatCommandBuilder_.setMessage(value);
+        }
+        bitField0_ |= 0x00000010;
+        return this;
+      }
+      /**
+       * <code>optional .openxc.PayloadFormatCommand payload_format_command = 5;</code>
+       */
+      public Builder setPayloadFormatCommand(
+          com.openxc.BinaryMessages.PayloadFormatCommand.Builder builderForValue) {
+        if (payloadFormatCommandBuilder_ == null) {
+          payloadFormatCommand_ = builderForValue.build();
+          onChanged();
+        } else {
+          payloadFormatCommandBuilder_.setMessage(builderForValue.build());
+        }
+        bitField0_ |= 0x00000010;
+        return this;
+      }
+      /**
+       * <code>optional .openxc.PayloadFormatCommand payload_format_command = 5;</code>
+       */
+      public Builder mergePayloadFormatCommand(com.openxc.BinaryMessages.PayloadFormatCommand value) {
+        if (payloadFormatCommandBuilder_ == null) {
+          if (((bitField0_ & 0x00000010) == 0x00000010) &&
+              payloadFormatCommand_ != com.openxc.BinaryMessages.PayloadFormatCommand.getDefaultInstance()) {
+            payloadFormatCommand_ =
+              com.openxc.BinaryMessages.PayloadFormatCommand.newBuilder(payloadFormatCommand_).mergeFrom(value).buildPartial();
+          } else {
+            payloadFormatCommand_ = value;
+          }
+          onChanged();
+        } else {
+          payloadFormatCommandBuilder_.mergeFrom(value);
+        }
+        bitField0_ |= 0x00000010;
+        return this;
+      }
+      /**
+       * <code>optional .openxc.PayloadFormatCommand payload_format_command = 5;</code>
+       */
+      public Builder clearPayloadFormatCommand() {
+        if (payloadFormatCommandBuilder_ == null) {
+          payloadFormatCommand_ = com.openxc.BinaryMessages.PayloadFormatCommand.getDefaultInstance();
+          onChanged();
+        } else {
+          payloadFormatCommandBuilder_.clear();
+        }
+        bitField0_ = (bitField0_ & ~0x00000010);
+        return this;
+      }
+      /**
+       * <code>optional .openxc.PayloadFormatCommand payload_format_command = 5;</code>
+       */
+      public com.openxc.BinaryMessages.PayloadFormatCommand.Builder getPayloadFormatCommandBuilder() {
+        bitField0_ |= 0x00000010;
+        onChanged();
+        return getPayloadFormatCommandFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>optional .openxc.PayloadFormatCommand payload_format_command = 5;</code>
+       */
+      public com.openxc.BinaryMessages.PayloadFormatCommandOrBuilder getPayloadFormatCommandOrBuilder() {
+        if (payloadFormatCommandBuilder_ != null) {
+          return payloadFormatCommandBuilder_.getMessageOrBuilder();
+        } else {
+          return payloadFormatCommand_;
+        }
+      }
+      /**
+       * <code>optional .openxc.PayloadFormatCommand payload_format_command = 5;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilder<
+          com.openxc.BinaryMessages.PayloadFormatCommand, com.openxc.BinaryMessages.PayloadFormatCommand.Builder, com.openxc.BinaryMessages.PayloadFormatCommandOrBuilder> 
+          getPayloadFormatCommandFieldBuilder() {
+        if (payloadFormatCommandBuilder_ == null) {
+          payloadFormatCommandBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+              com.openxc.BinaryMessages.PayloadFormatCommand, com.openxc.BinaryMessages.PayloadFormatCommand.Builder, com.openxc.BinaryMessages.PayloadFormatCommandOrBuilder>(
+                  payloadFormatCommand_,
+                  getParentForChildren(),
+                  isClean());
+          payloadFormatCommand_ = null;
+        }
+        return payloadFormatCommandBuilder_;
+      }
+
+      // optional .openxc.PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6;
+      private com.openxc.BinaryMessages.PredefinedObd2RequestsCommand predefinedObd2RequestsCommand_ = com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.getDefaultInstance();
+      private com.google.protobuf.SingleFieldBuilder<
+          com.openxc.BinaryMessages.PredefinedObd2RequestsCommand, com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.Builder, com.openxc.BinaryMessages.PredefinedObd2RequestsCommandOrBuilder> predefinedObd2RequestsCommandBuilder_;
+      /**
+       * <code>optional .openxc.PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6;</code>
+       */
+      public boolean hasPredefinedObd2RequestsCommand() {
+        return ((bitField0_ & 0x00000020) == 0x00000020);
+      }
+      /**
+       * <code>optional .openxc.PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6;</code>
+       */
+      public com.openxc.BinaryMessages.PredefinedObd2RequestsCommand getPredefinedObd2RequestsCommand() {
+        if (predefinedObd2RequestsCommandBuilder_ == null) {
+          return predefinedObd2RequestsCommand_;
+        } else {
+          return predefinedObd2RequestsCommandBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>optional .openxc.PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6;</code>
+       */
+      public Builder setPredefinedObd2RequestsCommand(com.openxc.BinaryMessages.PredefinedObd2RequestsCommand value) {
+        if (predefinedObd2RequestsCommandBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          predefinedObd2RequestsCommand_ = value;
+          onChanged();
+        } else {
+          predefinedObd2RequestsCommandBuilder_.setMessage(value);
+        }
+        bitField0_ |= 0x00000020;
+        return this;
+      }
+      /**
+       * <code>optional .openxc.PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6;</code>
+       */
+      public Builder setPredefinedObd2RequestsCommand(
+          com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.Builder builderForValue) {
+        if (predefinedObd2RequestsCommandBuilder_ == null) {
+          predefinedObd2RequestsCommand_ = builderForValue.build();
+          onChanged();
+        } else {
+          predefinedObd2RequestsCommandBuilder_.setMessage(builderForValue.build());
+        }
+        bitField0_ |= 0x00000020;
+        return this;
+      }
+      /**
+       * <code>optional .openxc.PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6;</code>
+       */
+      public Builder mergePredefinedObd2RequestsCommand(com.openxc.BinaryMessages.PredefinedObd2RequestsCommand value) {
+        if (predefinedObd2RequestsCommandBuilder_ == null) {
+          if (((bitField0_ & 0x00000020) == 0x00000020) &&
+              predefinedObd2RequestsCommand_ != com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.getDefaultInstance()) {
+            predefinedObd2RequestsCommand_ =
+              com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.newBuilder(predefinedObd2RequestsCommand_).mergeFrom(value).buildPartial();
+          } else {
+            predefinedObd2RequestsCommand_ = value;
+          }
+          onChanged();
+        } else {
+          predefinedObd2RequestsCommandBuilder_.mergeFrom(value);
+        }
+        bitField0_ |= 0x00000020;
+        return this;
+      }
+      /**
+       * <code>optional .openxc.PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6;</code>
+       */
+      public Builder clearPredefinedObd2RequestsCommand() {
+        if (predefinedObd2RequestsCommandBuilder_ == null) {
+          predefinedObd2RequestsCommand_ = com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.getDefaultInstance();
+          onChanged();
+        } else {
+          predefinedObd2RequestsCommandBuilder_.clear();
+        }
+        bitField0_ = (bitField0_ & ~0x00000020);
+        return this;
+      }
+      /**
+       * <code>optional .openxc.PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6;</code>
+       */
+      public com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.Builder getPredefinedObd2RequestsCommandBuilder() {
+        bitField0_ |= 0x00000020;
+        onChanged();
+        return getPredefinedObd2RequestsCommandFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>optional .openxc.PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6;</code>
+       */
+      public com.openxc.BinaryMessages.PredefinedObd2RequestsCommandOrBuilder getPredefinedObd2RequestsCommandOrBuilder() {
+        if (predefinedObd2RequestsCommandBuilder_ != null) {
+          return predefinedObd2RequestsCommandBuilder_.getMessageOrBuilder();
+        } else {
+          return predefinedObd2RequestsCommand_;
+        }
+      }
+      /**
+       * <code>optional .openxc.PredefinedObd2RequestsCommand predefined_obd2_requests_command = 6;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilder<
+          com.openxc.BinaryMessages.PredefinedObd2RequestsCommand, com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.Builder, com.openxc.BinaryMessages.PredefinedObd2RequestsCommandOrBuilder> 
+          getPredefinedObd2RequestsCommandFieldBuilder() {
+        if (predefinedObd2RequestsCommandBuilder_ == null) {
+          predefinedObd2RequestsCommandBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+              com.openxc.BinaryMessages.PredefinedObd2RequestsCommand, com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.Builder, com.openxc.BinaryMessages.PredefinedObd2RequestsCommandOrBuilder>(
+                  predefinedObd2RequestsCommand_,
+                  getParentForChildren(),
+                  isClean());
+          predefinedObd2RequestsCommand_ = null;
+        }
+        return predefinedObd2RequestsCommandBuilder_;
+      }
+
+      // optional .openxc.ModemConfigurationCommand modem_configuration_command = 7;
+      private com.openxc.BinaryMessages.ModemConfigurationCommand modemConfigurationCommand_ = com.openxc.BinaryMessages.ModemConfigurationCommand.getDefaultInstance();
+      private com.google.protobuf.SingleFieldBuilder<
+          com.openxc.BinaryMessages.ModemConfigurationCommand, com.openxc.BinaryMessages.ModemConfigurationCommand.Builder, com.openxc.BinaryMessages.ModemConfigurationCommandOrBuilder> modemConfigurationCommandBuilder_;
+      /**
+       * <code>optional .openxc.ModemConfigurationCommand modem_configuration_command = 7;</code>
+       */
+      public boolean hasModemConfigurationCommand() {
+        return ((bitField0_ & 0x00000040) == 0x00000040);
+      }
+      /**
+       * <code>optional .openxc.ModemConfigurationCommand modem_configuration_command = 7;</code>
+       */
+      public com.openxc.BinaryMessages.ModemConfigurationCommand getModemConfigurationCommand() {
+        if (modemConfigurationCommandBuilder_ == null) {
+          return modemConfigurationCommand_;
+        } else {
+          return modemConfigurationCommandBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>optional .openxc.ModemConfigurationCommand modem_configuration_command = 7;</code>
+       */
+      public Builder setModemConfigurationCommand(com.openxc.BinaryMessages.ModemConfigurationCommand value) {
+        if (modemConfigurationCommandBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          modemConfigurationCommand_ = value;
+          onChanged();
+        } else {
+          modemConfigurationCommandBuilder_.setMessage(value);
+        }
+        bitField0_ |= 0x00000040;
+        return this;
+      }
+      /**
+       * <code>optional .openxc.ModemConfigurationCommand modem_configuration_command = 7;</code>
+       */
+      public Builder setModemConfigurationCommand(
+          com.openxc.BinaryMessages.ModemConfigurationCommand.Builder builderForValue) {
+        if (modemConfigurationCommandBuilder_ == null) {
+          modemConfigurationCommand_ = builderForValue.build();
+          onChanged();
+        } else {
+          modemConfigurationCommandBuilder_.setMessage(builderForValue.build());
+        }
+        bitField0_ |= 0x00000040;
+        return this;
+      }
+      /**
+       * <code>optional .openxc.ModemConfigurationCommand modem_configuration_command = 7;</code>
+       */
+      public Builder mergeModemConfigurationCommand(com.openxc.BinaryMessages.ModemConfigurationCommand value) {
+        if (modemConfigurationCommandBuilder_ == null) {
+          if (((bitField0_ & 0x00000040) == 0x00000040) &&
+              modemConfigurationCommand_ != com.openxc.BinaryMessages.ModemConfigurationCommand.getDefaultInstance()) {
+            modemConfigurationCommand_ =
+              com.openxc.BinaryMessages.ModemConfigurationCommand.newBuilder(modemConfigurationCommand_).mergeFrom(value).buildPartial();
+          } else {
+            modemConfigurationCommand_ = value;
+          }
+          onChanged();
+        } else {
+          modemConfigurationCommandBuilder_.mergeFrom(value);
+        }
+        bitField0_ |= 0x00000040;
+        return this;
+      }
+      /**
+       * <code>optional .openxc.ModemConfigurationCommand modem_configuration_command = 7;</code>
+       */
+      public Builder clearModemConfigurationCommand() {
+        if (modemConfigurationCommandBuilder_ == null) {
+          modemConfigurationCommand_ = com.openxc.BinaryMessages.ModemConfigurationCommand.getDefaultInstance();
+          onChanged();
+        } else {
+          modemConfigurationCommandBuilder_.clear();
+        }
+        bitField0_ = (bitField0_ & ~0x00000040);
+        return this;
+      }
+      /**
+       * <code>optional .openxc.ModemConfigurationCommand modem_configuration_command = 7;</code>
+       */
+      public com.openxc.BinaryMessages.ModemConfigurationCommand.Builder getModemConfigurationCommandBuilder() {
+        bitField0_ |= 0x00000040;
+        onChanged();
+        return getModemConfigurationCommandFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>optional .openxc.ModemConfigurationCommand modem_configuration_command = 7;</code>
+       */
+      public com.openxc.BinaryMessages.ModemConfigurationCommandOrBuilder getModemConfigurationCommandOrBuilder() {
+        if (modemConfigurationCommandBuilder_ != null) {
+          return modemConfigurationCommandBuilder_.getMessageOrBuilder();
+        } else {
+          return modemConfigurationCommand_;
+        }
+      }
+      /**
+       * <code>optional .openxc.ModemConfigurationCommand modem_configuration_command = 7;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilder<
+          com.openxc.BinaryMessages.ModemConfigurationCommand, com.openxc.BinaryMessages.ModemConfigurationCommand.Builder, com.openxc.BinaryMessages.ModemConfigurationCommandOrBuilder> 
+          getModemConfigurationCommandFieldBuilder() {
+        if (modemConfigurationCommandBuilder_ == null) {
+          modemConfigurationCommandBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+              com.openxc.BinaryMessages.ModemConfigurationCommand, com.openxc.BinaryMessages.ModemConfigurationCommand.Builder, com.openxc.BinaryMessages.ModemConfigurationCommandOrBuilder>(
+                  modemConfigurationCommand_,
+                  getParentForChildren(),
+                  isClean());
+          modemConfigurationCommand_ = null;
+        }
+        return modemConfigurationCommandBuilder_;
+      }
+
+      // optional .openxc.RTCConfigurationCommand rtc_configuration_command = 8;
+      private com.openxc.BinaryMessages.RTCConfigurationCommand rtcConfigurationCommand_ = com.openxc.BinaryMessages.RTCConfigurationCommand.getDefaultInstance();
+      private com.google.protobuf.SingleFieldBuilder<
+          com.openxc.BinaryMessages.RTCConfigurationCommand, com.openxc.BinaryMessages.RTCConfigurationCommand.Builder, com.openxc.BinaryMessages.RTCConfigurationCommandOrBuilder> rtcConfigurationCommandBuilder_;
+      /**
+       * <code>optional .openxc.RTCConfigurationCommand rtc_configuration_command = 8;</code>
+       */
+      public boolean hasRtcConfigurationCommand() {
+        return ((bitField0_ & 0x00000080) == 0x00000080);
+      }
+      /**
+       * <code>optional .openxc.RTCConfigurationCommand rtc_configuration_command = 8;</code>
+       */
+      public com.openxc.BinaryMessages.RTCConfigurationCommand getRtcConfigurationCommand() {
+        if (rtcConfigurationCommandBuilder_ == null) {
+          return rtcConfigurationCommand_;
+        } else {
+          return rtcConfigurationCommandBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>optional .openxc.RTCConfigurationCommand rtc_configuration_command = 8;</code>
+       */
+      public Builder setRtcConfigurationCommand(com.openxc.BinaryMessages.RTCConfigurationCommand value) {
+        if (rtcConfigurationCommandBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          rtcConfigurationCommand_ = value;
+          onChanged();
+        } else {
+          rtcConfigurationCommandBuilder_.setMessage(value);
+        }
+        bitField0_ |= 0x00000080;
+        return this;
+      }
+      /**
+       * <code>optional .openxc.RTCConfigurationCommand rtc_configuration_command = 8;</code>
+       */
+      public Builder setRtcConfigurationCommand(
+          com.openxc.BinaryMessages.RTCConfigurationCommand.Builder builderForValue) {
+        if (rtcConfigurationCommandBuilder_ == null) {
+          rtcConfigurationCommand_ = builderForValue.build();
+          onChanged();
+        } else {
+          rtcConfigurationCommandBuilder_.setMessage(builderForValue.build());
+        }
+        bitField0_ |= 0x00000080;
+        return this;
+      }
+      /**
+       * <code>optional .openxc.RTCConfigurationCommand rtc_configuration_command = 8;</code>
+       */
+      public Builder mergeRtcConfigurationCommand(com.openxc.BinaryMessages.RTCConfigurationCommand value) {
+        if (rtcConfigurationCommandBuilder_ == null) {
+          if (((bitField0_ & 0x00000080) == 0x00000080) &&
+              rtcConfigurationCommand_ != com.openxc.BinaryMessages.RTCConfigurationCommand.getDefaultInstance()) {
+            rtcConfigurationCommand_ =
+              com.openxc.BinaryMessages.RTCConfigurationCommand.newBuilder(rtcConfigurationCommand_).mergeFrom(value).buildPartial();
+          } else {
+            rtcConfigurationCommand_ = value;
+          }
+          onChanged();
+        } else {
+          rtcConfigurationCommandBuilder_.mergeFrom(value);
+        }
+        bitField0_ |= 0x00000080;
+        return this;
+      }
+      /**
+       * <code>optional .openxc.RTCConfigurationCommand rtc_configuration_command = 8;</code>
+       */
+      public Builder clearRtcConfigurationCommand() {
+        if (rtcConfigurationCommandBuilder_ == null) {
+          rtcConfigurationCommand_ = com.openxc.BinaryMessages.RTCConfigurationCommand.getDefaultInstance();
+          onChanged();
+        } else {
+          rtcConfigurationCommandBuilder_.clear();
+        }
+        bitField0_ = (bitField0_ & ~0x00000080);
+        return this;
+      }
+      /**
+       * <code>optional .openxc.RTCConfigurationCommand rtc_configuration_command = 8;</code>
+       */
+      public com.openxc.BinaryMessages.RTCConfigurationCommand.Builder getRtcConfigurationCommandBuilder() {
+        bitField0_ |= 0x00000080;
+        onChanged();
+        return getRtcConfigurationCommandFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>optional .openxc.RTCConfigurationCommand rtc_configuration_command = 8;</code>
+       */
+      public com.openxc.BinaryMessages.RTCConfigurationCommandOrBuilder getRtcConfigurationCommandOrBuilder() {
+        if (rtcConfigurationCommandBuilder_ != null) {
+          return rtcConfigurationCommandBuilder_.getMessageOrBuilder();
+        } else {
+          return rtcConfigurationCommand_;
+        }
+      }
+      /**
+       * <code>optional .openxc.RTCConfigurationCommand rtc_configuration_command = 8;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilder<
+          com.openxc.BinaryMessages.RTCConfigurationCommand, com.openxc.BinaryMessages.RTCConfigurationCommand.Builder, com.openxc.BinaryMessages.RTCConfigurationCommandOrBuilder> 
+          getRtcConfigurationCommandFieldBuilder() {
+        if (rtcConfigurationCommandBuilder_ == null) {
+          rtcConfigurationCommandBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+              com.openxc.BinaryMessages.RTCConfigurationCommand, com.openxc.BinaryMessages.RTCConfigurationCommand.Builder, com.openxc.BinaryMessages.RTCConfigurationCommandOrBuilder>(
+                  rtcConfigurationCommand_,
+                  getParentForChildren(),
+                  isClean());
+          rtcConfigurationCommand_ = null;
+        }
+        return rtcConfigurationCommandBuilder_;
+      }
+
+      // @@protoc_insertion_point(builder_scope:openxc.ControlCommand)
+    }
+
+    static {
+      defaultInstance = new ControlCommand(true);
+      defaultInstance.initFields();
+    }
+
+    // @@protoc_insertion_point(class_scope:openxc.ControlCommand)
+  }
+
+  public interface DiagnosticControlCommandOrBuilder
+      extends com.google.protobuf.MessageOrBuilder {
+
+    // optional .openxc.DiagnosticRequest request = 1;
+    /**
+     * <code>optional .openxc.DiagnosticRequest request = 1;</code>
+     */
+    boolean hasRequest();
+    /**
+     * <code>optional .openxc.DiagnosticRequest request = 1;</code>
+     */
+    com.openxc.BinaryMessages.DiagnosticRequest getRequest();
+    /**
+     * <code>optional .openxc.DiagnosticRequest request = 1;</code>
+     */
+    com.openxc.BinaryMessages.DiagnosticRequestOrBuilder getRequestOrBuilder();
+
+    // optional .openxc.DiagnosticControlCommand.Action action = 2;
+    /**
+     * <code>optional .openxc.DiagnosticControlCommand.Action action = 2;</code>
+     */
+    boolean hasAction();
+    /**
+     * <code>optional .openxc.DiagnosticControlCommand.Action action = 2;</code>
+     */
+    com.openxc.BinaryMessages.DiagnosticControlCommand.Action getAction();
+  }
+  /**
+   * Protobuf type {@code openxc.DiagnosticControlCommand}
+   */
+  public static final class DiagnosticControlCommand extends
+      com.google.protobuf.GeneratedMessage
+      implements DiagnosticControlCommandOrBuilder {
+    // Use DiagnosticControlCommand.newBuilder() to construct.
+    private DiagnosticControlCommand(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+      super(builder);
+      this.unknownFields = builder.getUnknownFields();
+    }
+    private DiagnosticControlCommand(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+
+    private static final DiagnosticControlCommand defaultInstance;
+    public static DiagnosticControlCommand getDefaultInstance() {
+      return defaultInstance;
+    }
+
+    public DiagnosticControlCommand getDefaultInstanceForType() {
+      return defaultInstance;
+    }
+
+    private final com.google.protobuf.UnknownFieldSet unknownFields;
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+        getUnknownFields() {
+      return this.unknownFields;
+    }
+    private DiagnosticControlCommand(
+        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 10: {
+              com.openxc.BinaryMessages.DiagnosticRequest.Builder subBuilder = null;
+              if (((bitField0_ & 0x00000001) == 0x00000001)) {
+                subBuilder = request_.toBuilder();
+              }
+              request_ = input.readMessage(com.openxc.BinaryMessages.DiagnosticRequest.PARSER, extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(request_);
+                request_ = subBuilder.buildPartial();
+              }
+              bitField0_ |= 0x00000001;
+              break;
+            }
+            case 16: {
+              int rawValue = input.readEnum();
+              com.openxc.BinaryMessages.DiagnosticControlCommand.Action value = com.openxc.BinaryMessages.DiagnosticControlCommand.Action.valueOf(rawValue);
+              if (value == null) {
+                unknownFields.mergeVarintField(2, rawValue);
+              } else {
+                bitField0_ |= 0x00000002;
+                action_ = value;
+              }
+              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_DiagnosticControlCommand_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticControlCommand_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.openxc.BinaryMessages.DiagnosticControlCommand.class, com.openxc.BinaryMessages.DiagnosticControlCommand.Builder.class);
+    }
+
+    public static com.google.protobuf.Parser<DiagnosticControlCommand> PARSER =
+        new com.google.protobuf.AbstractParser<DiagnosticControlCommand>() {
+      public DiagnosticControlCommand parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new DiagnosticControlCommand(input, extensionRegistry);
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<DiagnosticControlCommand> getParserForType() {
+      return PARSER;
+    }
+
+    /**
+     * Protobuf enum {@code openxc.DiagnosticControlCommand.Action}
+     */
+    public enum Action
+        implements com.google.protobuf.ProtocolMessageEnum {
+      /**
+       * <code>ADD = 1;</code>
+       */
+      ADD(0, 1),
+      /**
+       * <code>CANCEL = 2;</code>
+       */
+      CANCEL(1, 2),
+      ;
+
+      /**
+       * <code>ADD = 1;</code>
+       */
+      public static final int ADD_VALUE = 1;
+      /**
+       * <code>CANCEL = 2;</code>
+       */
+      public static final int CANCEL_VALUE = 2;
+
+
+      public final int getNumber() { return value; }
+
+      public static Action valueOf(int value) {
+        switch (value) {
+          case 1: return ADD;
+          case 2: return CANCEL;
+          default: return null;
+        }
+      }
+
+      public static com.google.protobuf.Internal.EnumLiteMap<Action>
+          internalGetValueMap() {
+        return internalValueMap;
+      }
+      private static com.google.protobuf.Internal.EnumLiteMap<Action>
+          internalValueMap =
+            new com.google.protobuf.Internal.EnumLiteMap<Action>() {
+              public Action findValueByNumber(int number) {
+                return Action.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.DiagnosticControlCommand.getDescriptor().getEnumTypes().get(0);
+      }
+
+      private static final Action[] VALUES = values();
+
+      public static Action 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 Action(int index, int value) {
+        this.index = index;
+        this.value = value;
+      }
+
+      // @@protoc_insertion_point(enum_scope:openxc.DiagnosticControlCommand.Action)
+    }
+
+    private int bitField0_;
+    // optional .openxc.DiagnosticRequest request = 1;
+    public static final int REQUEST_FIELD_NUMBER = 1;
+    private com.openxc.BinaryMessages.DiagnosticRequest request_;
+    /**
+     * <code>optional .openxc.DiagnosticRequest request = 1;</code>
+     */
+    public boolean hasRequest() {
+      return ((bitField0_ & 0x00000001) == 0x00000001);
+    }
+    /**
+     * <code>optional .openxc.DiagnosticRequest request = 1;</code>
+     */
+    public com.openxc.BinaryMessages.DiagnosticRequest getRequest() {
+      return request_;
+    }
+    /**
+     * <code>optional .openxc.DiagnosticRequest request = 1;</code>
+     */
+    public com.openxc.BinaryMessages.DiagnosticRequestOrBuilder getRequestOrBuilder() {
+      return request_;
+    }
+
+    // optional .openxc.DiagnosticControlCommand.Action action = 2;
+    public static final int ACTION_FIELD_NUMBER = 2;
+    private com.openxc.BinaryMessages.DiagnosticControlCommand.Action action_;
+    /**
+     * <code>optional .openxc.DiagnosticControlCommand.Action action = 2;</code>
+     */
+    public boolean hasAction() {
+      return ((bitField0_ & 0x00000002) == 0x00000002);
+    }
+    /**
+     * <code>optional .openxc.DiagnosticControlCommand.Action action = 2;</code>
+     */
+    public com.openxc.BinaryMessages.DiagnosticControlCommand.Action getAction() {
+      return action_;
+    }
+
+    private void initFields() {
+      request_ = com.openxc.BinaryMessages.DiagnosticRequest.getDefaultInstance();
+      action_ = com.openxc.BinaryMessages.DiagnosticControlCommand.Action.ADD;
+    }
+    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.writeMessage(1, request_);
+      }
+      if (((bitField0_ & 0x00000002) == 0x00000002)) {
+        output.writeEnum(2, action_.getNumber());
+      }
+      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
+          .computeMessageSize(1, request_);
+      }
+      if (((bitField0_ & 0x00000002) == 0x00000002)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(2, action_.getNumber());
+      }
+      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.DiagnosticControlCommand parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static com.openxc.BinaryMessages.DiagnosticControlCommand 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.DiagnosticControlCommand parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static com.openxc.BinaryMessages.DiagnosticControlCommand parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static com.openxc.BinaryMessages.DiagnosticControlCommand parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input);
+    }
+    public static com.openxc.BinaryMessages.DiagnosticControlCommand parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input, extensionRegistry);
+    }
+    public static com.openxc.BinaryMessages.DiagnosticControlCommand parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return PARSER.parseDelimitedFrom(input);
+    }
+    public static com.openxc.BinaryMessages.DiagnosticControlCommand parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+    }
+    public static com.openxc.BinaryMessages.DiagnosticControlCommand parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input);
+    }
+    public static com.openxc.BinaryMessages.DiagnosticControlCommand 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.DiagnosticControlCommand 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.DiagnosticControlCommand}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessage.Builder<Builder>
+       implements com.openxc.BinaryMessages.DiagnosticControlCommandOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticControlCommand_descriptor;
+      }
+
+      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticControlCommand_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                com.openxc.BinaryMessages.DiagnosticControlCommand.class, com.openxc.BinaryMessages.DiagnosticControlCommand.Builder.class);
+      }
+
+      // Construct using com.openxc.BinaryMessages.DiagnosticControlCommand.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+          getRequestFieldBuilder();
+        }
+      }
+      private static Builder create() {
+        return new Builder();
+      }
+
+      public Builder clear() {
+        super.clear();
+        if (requestBuilder_ == null) {
+          request_ = com.openxc.BinaryMessages.DiagnosticRequest.getDefaultInstance();
+        } else {
+          requestBuilder_.clear();
+        }
+        bitField0_ = (bitField0_ & ~0x00000001);
+        action_ = com.openxc.BinaryMessages.DiagnosticControlCommand.Action.ADD;
+        bitField0_ = (bitField0_ & ~0x00000002);
+        return this;
+      }
+
+      public Builder clone() {
+        return create().mergeFrom(buildPartial());
+      }
+
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticControlCommand_descriptor;
+      }
+
+      public com.openxc.BinaryMessages.DiagnosticControlCommand getDefaultInstanceForType() {
+        return com.openxc.BinaryMessages.DiagnosticControlCommand.getDefaultInstance();
+      }
+
+      public com.openxc.BinaryMessages.DiagnosticControlCommand build() {
+        com.openxc.BinaryMessages.DiagnosticControlCommand result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      public com.openxc.BinaryMessages.DiagnosticControlCommand buildPartial() {
+        com.openxc.BinaryMessages.DiagnosticControlCommand result = new com.openxc.BinaryMessages.DiagnosticControlCommand(this);
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
+          to_bitField0_ |= 0x00000001;
+        }
+        if (requestBuilder_ == null) {
+          result.request_ = request_;
+        } else {
+          result.request_ = requestBuilder_.build();
+        }
+        if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
+          to_bitField0_ |= 0x00000002;
+        }
+        result.action_ = action_;
+        result.bitField0_ = to_bitField0_;
+        onBuilt();
+        return result;
+      }
+
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof com.openxc.BinaryMessages.DiagnosticControlCommand) {
+          return mergeFrom((com.openxc.BinaryMessages.DiagnosticControlCommand)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(com.openxc.BinaryMessages.DiagnosticControlCommand other) {
+        if (other == com.openxc.BinaryMessages.DiagnosticControlCommand.getDefaultInstance()) return this;
+        if (other.hasRequest()) {
+          mergeRequest(other.getRequest());
+        }
+        if (other.hasAction()) {
+          setAction(other.getAction());
+        }
+        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.DiagnosticControlCommand parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.openxc.BinaryMessages.DiagnosticControlCommand) e.getUnfinishedMessage();
+          throw e;
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+      private int bitField0_;
+
+      // optional .openxc.DiagnosticRequest request = 1;
+      private com.openxc.BinaryMessages.DiagnosticRequest request_ = com.openxc.BinaryMessages.DiagnosticRequest.getDefaultInstance();
+      private com.google.protobuf.SingleFieldBuilder<
+          com.openxc.BinaryMessages.DiagnosticRequest, com.openxc.BinaryMessages.DiagnosticRequest.Builder, com.openxc.BinaryMessages.DiagnosticRequestOrBuilder> requestBuilder_;
+      /**
+       * <code>optional .openxc.DiagnosticRequest request = 1;</code>
+       */
+      public boolean hasRequest() {
+        return ((bitField0_ & 0x00000001) == 0x00000001);
+      }
+      /**
+       * <code>optional .openxc.DiagnosticRequest request = 1;</code>
+       */
+      public com.openxc.BinaryMessages.DiagnosticRequest getRequest() {
+        if (requestBuilder_ == null) {
+          return request_;
+        } else {
+          return requestBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>optional .openxc.DiagnosticRequest request = 1;</code>
+       */
+      public Builder setRequest(com.openxc.BinaryMessages.DiagnosticRequest value) {
+        if (requestBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          request_ = value;
+          onChanged();
+        } else {
+          requestBuilder_.setMessage(value);
+        }
+        bitField0_ |= 0x00000001;
+        return this;
+      }
+      /**
+       * <code>optional .openxc.DiagnosticRequest request = 1;</code>
+       */
+      public Builder setRequest(
+          com.openxc.BinaryMessages.DiagnosticRequest.Builder builderForValue) {
+        if (requestBuilder_ == null) {
+          request_ = builderForValue.build();
+          onChanged();
+        } else {
+          requestBuilder_.setMessage(builderForValue.build());
+        }
+        bitField0_ |= 0x00000001;
+        return this;
+      }
+      /**
+       * <code>optional .openxc.DiagnosticRequest request = 1;</code>
+       */
+      public Builder mergeRequest(com.openxc.BinaryMessages.DiagnosticRequest value) {
+        if (requestBuilder_ == null) {
+          if (((bitField0_ & 0x00000001) == 0x00000001) &&
+              request_ != com.openxc.BinaryMessages.DiagnosticRequest.getDefaultInstance()) {
+            request_ =
+              com.openxc.BinaryMessages.DiagnosticRequest.newBuilder(request_).mergeFrom(value).buildPartial();
+          } else {
+            request_ = value;
+          }
+          onChanged();
+        } else {
+          requestBuilder_.mergeFrom(value);
+        }
+        bitField0_ |= 0x00000001;
+        return this;
+      }
+      /**
+       * <code>optional .openxc.DiagnosticRequest request = 1;</code>
+       */
+      public Builder clearRequest() {
+        if (requestBuilder_ == null) {
+          request_ = com.openxc.BinaryMessages.DiagnosticRequest.getDefaultInstance();
+          onChanged();
+        } else {
+          requestBuilder_.clear();
+        }
+        bitField0_ = (bitField0_ & ~0x00000001);
+        return this;
+      }
+      /**
+       * <code>optional .openxc.DiagnosticRequest request = 1;</code>
+       */
+      public com.openxc.BinaryMessages.DiagnosticRequest.Builder getRequestBuilder() {
+        bitField0_ |= 0x00000001;
+        onChanged();
+        return getRequestFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>optional .openxc.DiagnosticRequest request = 1;</code>
+       */
+      public com.openxc.BinaryMessages.DiagnosticRequestOrBuilder getRequestOrBuilder() {
+        if (requestBuilder_ != null) {
+          return requestBuilder_.getMessageOrBuilder();
+        } else {
+          return request_;
+        }
+      }
+      /**
+       * <code>optional .openxc.DiagnosticRequest request = 1;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilder<
+          com.openxc.BinaryMessages.DiagnosticRequest, com.openxc.BinaryMessages.DiagnosticRequest.Builder, com.openxc.BinaryMessages.DiagnosticRequestOrBuilder> 
+          getRequestFieldBuilder() {
+        if (requestBuilder_ == null) {
+          requestBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+              com.openxc.BinaryMessages.DiagnosticRequest, com.openxc.BinaryMessages.DiagnosticRequest.Builder, com.openxc.BinaryMessages.DiagnosticRequestOrBuilder>(
+                  request_,
+                  getParentForChildren(),
+                  isClean());
+          request_ = null;
+        }
+        return requestBuilder_;
+      }
+
+      // optional .openxc.DiagnosticControlCommand.Action action = 2;
+      private com.openxc.BinaryMessages.DiagnosticControlCommand.Action action_ = com.openxc.BinaryMessages.DiagnosticControlCommand.Action.ADD;
+      /**
+       * <code>optional .openxc.DiagnosticControlCommand.Action action = 2;</code>
+       */
+      public boolean hasAction() {
+        return ((bitField0_ & 0x00000002) == 0x00000002);
+      }
+      /**
+       * <code>optional .openxc.DiagnosticControlCommand.Action action = 2;</code>
+       */
+      public com.openxc.BinaryMessages.DiagnosticControlCommand.Action getAction() {
+        return action_;
+      }
+      /**
+       * <code>optional .openxc.DiagnosticControlCommand.Action action = 2;</code>
+       */
+      public Builder setAction(com.openxc.BinaryMessages.DiagnosticControlCommand.Action value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        bitField0_ |= 0x00000002;
+        action_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .openxc.DiagnosticControlCommand.Action action = 2;</code>
+       */
+      public Builder clearAction() {
+        bitField0_ = (bitField0_ & ~0x00000002);
+        action_ = com.openxc.BinaryMessages.DiagnosticControlCommand.Action.ADD;
+        onChanged();
+        return this;
+      }
+
+      // @@protoc_insertion_point(builder_scope:openxc.DiagnosticControlCommand)
+    }
+
+    static {
+      defaultInstance = new DiagnosticControlCommand(true);
+      defaultInstance.initFields();
+    }
+
+    // @@protoc_insertion_point(class_scope:openxc.DiagnosticControlCommand)
+  }
+
+  public interface PassthroughModeControlCommandOrBuilder
+      extends com.google.protobuf.MessageOrBuilder {
+
+    // optional int32 bus = 1;
+    /**
+     * <code>optional int32 bus = 1;</code>
+     */
+    boolean hasBus();
+    /**
+     * <code>optional int32 bus = 1;</code>
+     */
+    int getBus();
+
+    // optional bool enabled = 2;
+    /**
+     * <code>optional bool enabled = 2;</code>
+     */
+    boolean hasEnabled();
+    /**
+     * <code>optional bool enabled = 2;</code>
+     */
+    boolean getEnabled();
+  }
+  /**
+   * Protobuf type {@code openxc.PassthroughModeControlCommand}
+   */
+  public static final class PassthroughModeControlCommand extends
+      com.google.protobuf.GeneratedMessage
+      implements PassthroughModeControlCommandOrBuilder {
+    // Use PassthroughModeControlCommand.newBuilder() to construct.
+    private PassthroughModeControlCommand(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+      super(builder);
+      this.unknownFields = builder.getUnknownFields();
+    }
+    private PassthroughModeControlCommand(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+
+    private static final PassthroughModeControlCommand defaultInstance;
+    public static PassthroughModeControlCommand getDefaultInstance() {
+      return defaultInstance;
+    }
+
+    public PassthroughModeControlCommand getDefaultInstanceForType() {
+      return defaultInstance;
+    }
+
+    private final com.google.protobuf.UnknownFieldSet unknownFields;
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+        getUnknownFields() {
+      return this.unknownFields;
+    }
+    private PassthroughModeControlCommand(
+        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: {
+              bitField0_ |= 0x00000001;
+              bus_ = input.readInt32();
+              break;
+            }
+            case 16: {
+              bitField0_ |= 0x00000002;
+              enabled_ = 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_PassthroughModeControlCommand_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.openxc.BinaryMessages.internal_static_openxc_PassthroughModeControlCommand_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.openxc.BinaryMessages.PassthroughModeControlCommand.class, com.openxc.BinaryMessages.PassthroughModeControlCommand.Builder.class);
+    }
+
+    public static com.google.protobuf.Parser<PassthroughModeControlCommand> PARSER =
+        new com.google.protobuf.AbstractParser<PassthroughModeControlCommand>() {
+      public PassthroughModeControlCommand parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new PassthroughModeControlCommand(input, extensionRegistry);
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<PassthroughModeControlCommand> getParserForType() {
+      return PARSER;
+    }
+
+    private int bitField0_;
+    // optional int32 bus = 1;
+    public static final int BUS_FIELD_NUMBER = 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_;
+    }
+
+    // optional bool enabled = 2;
+    public static final int ENABLED_FIELD_NUMBER = 2;
+    private boolean enabled_;
+    /**
+     * <code>optional bool enabled = 2;</code>
+     */
+    public boolean hasEnabled() {
+      return ((bitField0_ & 0x00000002) == 0x00000002);
+    }
+    /**
+     * <code>optional bool enabled = 2;</code>
+     */
+    public boolean getEnabled() {
+      return enabled_;
+    }
+
+    private void initFields() {
+      bus_ = 0;
+      enabled_ = false;
+    }
+    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.writeBool(2, enabled_);
+      }
+      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
+          .computeBoolSize(2, enabled_);
+      }
+      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.PassthroughModeControlCommand parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static com.openxc.BinaryMessages.PassthroughModeControlCommand 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.PassthroughModeControlCommand parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static com.openxc.BinaryMessages.PassthroughModeControlCommand parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static com.openxc.BinaryMessages.PassthroughModeControlCommand parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input);
+    }
+    public static com.openxc.BinaryMessages.PassthroughModeControlCommand parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input, extensionRegistry);
+    }
+    public static com.openxc.BinaryMessages.PassthroughModeControlCommand parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return PARSER.parseDelimitedFrom(input);
+    }
+    public static com.openxc.BinaryMessages.PassthroughModeControlCommand parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+    }
+    public static com.openxc.BinaryMessages.PassthroughModeControlCommand parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input);
+    }
+    public static com.openxc.BinaryMessages.PassthroughModeControlCommand 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.PassthroughModeControlCommand 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.PassthroughModeControlCommand}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessage.Builder<Builder>
+       implements com.openxc.BinaryMessages.PassthroughModeControlCommandOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return com.openxc.BinaryMessages.internal_static_openxc_PassthroughModeControlCommand_descriptor;
+      }
+
+      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return com.openxc.BinaryMessages.internal_static_openxc_PassthroughModeControlCommand_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                com.openxc.BinaryMessages.PassthroughModeControlCommand.class, com.openxc.BinaryMessages.PassthroughModeControlCommand.Builder.class);
+      }
+
+      // Construct using com.openxc.BinaryMessages.PassthroughModeControlCommand.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);
+        enabled_ = false;
+        bitField0_ = (bitField0_ & ~0x00000002);
+        return this;
+      }
+
+      public Builder clone() {
+        return create().mergeFrom(buildPartial());
+      }
+
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return com.openxc.BinaryMessages.internal_static_openxc_PassthroughModeControlCommand_descriptor;
+      }
+
+      public com.openxc.BinaryMessages.PassthroughModeControlCommand getDefaultInstanceForType() {
+        return com.openxc.BinaryMessages.PassthroughModeControlCommand.getDefaultInstance();
+      }
+
+      public com.openxc.BinaryMessages.PassthroughModeControlCommand build() {
+        com.openxc.BinaryMessages.PassthroughModeControlCommand result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      public com.openxc.BinaryMessages.PassthroughModeControlCommand buildPartial() {
+        com.openxc.BinaryMessages.PassthroughModeControlCommand result = new com.openxc.BinaryMessages.PassthroughModeControlCommand(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.enabled_ = enabled_;
+        result.bitField0_ = to_bitField0_;
+        onBuilt();
+        return result;
+      }
+
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof com.openxc.BinaryMessages.PassthroughModeControlCommand) {
+          return mergeFrom((com.openxc.BinaryMessages.PassthroughModeControlCommand)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(com.openxc.BinaryMessages.PassthroughModeControlCommand other) {
+        if (other == com.openxc.BinaryMessages.PassthroughModeControlCommand.getDefaultInstance()) return this;
+        if (other.hasBus()) {
+          setBus(other.getBus());
+        }
+        if (other.hasEnabled()) {
+          setEnabled(other.getEnabled());
+        }
+        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.PassthroughModeControlCommand parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.openxc.BinaryMessages.PassthroughModeControlCommand) 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 bool enabled = 2;
+      private boolean enabled_ ;
+      /**
+       * <code>optional bool enabled = 2;</code>
+       */
+      public boolean hasEnabled() {
+        return ((bitField0_ & 0x00000002) == 0x00000002);
+      }
+      /**
+       * <code>optional bool enabled = 2;</code>
+       */
+      public boolean getEnabled() {
+        return enabled_;
+      }
+      /**
+       * <code>optional bool enabled = 2;</code>
+       */
+      public Builder setEnabled(boolean value) {
+        bitField0_ |= 0x00000002;
+        enabled_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional bool enabled = 2;</code>
+       */
+      public Builder clearEnabled() {
+        bitField0_ = (bitField0_ & ~0x00000002);
+        enabled_ = false;
+        onChanged();
+        return this;
+      }
+
+      // @@protoc_insertion_point(builder_scope:openxc.PassthroughModeControlCommand)
+    }
+
+    static {
+      defaultInstance = new PassthroughModeControlCommand(true);
+      defaultInstance.initFields();
+    }
+
+    // @@protoc_insertion_point(class_scope:openxc.PassthroughModeControlCommand)
+  }
+
+  public interface AcceptanceFilterBypassCommandOrBuilder
+      extends com.google.protobuf.MessageOrBuilder {
+
+    // optional int32 bus = 1;
+    /**
+     * <code>optional int32 bus = 1;</code>
+     */
+    boolean hasBus();
+    /**
+     * <code>optional int32 bus = 1;</code>
+     */
+    int getBus();
+
+    // optional bool bypass = 2;
+    /**
+     * <code>optional bool bypass = 2;</code>
+     */
+    boolean hasBypass();
+    /**
+     * <code>optional bool bypass = 2;</code>
+     */
+    boolean getBypass();
+  }
+  /**
+   * Protobuf type {@code openxc.AcceptanceFilterBypassCommand}
+   */
+  public static final class AcceptanceFilterBypassCommand extends
+      com.google.protobuf.GeneratedMessage
+      implements AcceptanceFilterBypassCommandOrBuilder {
+    // Use AcceptanceFilterBypassCommand.newBuilder() to construct.
+    private AcceptanceFilterBypassCommand(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+      super(builder);
+      this.unknownFields = builder.getUnknownFields();
+    }
+    private AcceptanceFilterBypassCommand(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+
+    private static final AcceptanceFilterBypassCommand defaultInstance;
+    public static AcceptanceFilterBypassCommand getDefaultInstance() {
+      return defaultInstance;
+    }
+
+    public AcceptanceFilterBypassCommand getDefaultInstanceForType() {
+      return defaultInstance;
+    }
+
+    private final com.google.protobuf.UnknownFieldSet unknownFields;
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+        getUnknownFields() {
+      return this.unknownFields;
+    }
+    private AcceptanceFilterBypassCommand(
+        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: {
+              bitField0_ |= 0x00000001;
+              bus_ = input.readInt32();
+              break;
+            }
+            case 16: {
+              bitField0_ |= 0x00000002;
+              bypass_ = 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_AcceptanceFilterBypassCommand_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.openxc.BinaryMessages.internal_static_openxc_AcceptanceFilterBypassCommand_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.class, com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.Builder.class);
+    }
+
+    public static com.google.protobuf.Parser<AcceptanceFilterBypassCommand> PARSER =
+        new com.google.protobuf.AbstractParser<AcceptanceFilterBypassCommand>() {
+      public AcceptanceFilterBypassCommand parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new AcceptanceFilterBypassCommand(input, extensionRegistry);
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<AcceptanceFilterBypassCommand> getParserForType() {
+      return PARSER;
+    }
+
+    private int bitField0_;
+    // optional int32 bus = 1;
+    public static final int BUS_FIELD_NUMBER = 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_;
+    }
+
+    // optional bool bypass = 2;
+    public static final int BYPASS_FIELD_NUMBER = 2;
+    private boolean bypass_;
+    /**
+     * <code>optional bool bypass = 2;</code>
+     */
+    public boolean hasBypass() {
+      return ((bitField0_ & 0x00000002) == 0x00000002);
+    }
+    /**
+     * <code>optional bool bypass = 2;</code>
+     */
+    public boolean getBypass() {
+      return bypass_;
+    }
+
+    private void initFields() {
+      bus_ = 0;
+      bypass_ = false;
+    }
+    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.writeBool(2, bypass_);
+      }
+      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
+          .computeBoolSize(2, bypass_);
+      }
+      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.AcceptanceFilterBypassCommand parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static com.openxc.BinaryMessages.AcceptanceFilterBypassCommand 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.AcceptanceFilterBypassCommand parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static com.openxc.BinaryMessages.AcceptanceFilterBypassCommand parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static com.openxc.BinaryMessages.AcceptanceFilterBypassCommand parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input);
+    }
+    public static com.openxc.BinaryMessages.AcceptanceFilterBypassCommand parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input, extensionRegistry);
+    }
+    public static com.openxc.BinaryMessages.AcceptanceFilterBypassCommand parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return PARSER.parseDelimitedFrom(input);
+    }
+    public static com.openxc.BinaryMessages.AcceptanceFilterBypassCommand parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+    }
+    public static com.openxc.BinaryMessages.AcceptanceFilterBypassCommand parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input);
+    }
+    public static com.openxc.BinaryMessages.AcceptanceFilterBypassCommand 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.AcceptanceFilterBypassCommand 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.AcceptanceFilterBypassCommand}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessage.Builder<Builder>
+       implements com.openxc.BinaryMessages.AcceptanceFilterBypassCommandOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return com.openxc.BinaryMessages.internal_static_openxc_AcceptanceFilterBypassCommand_descriptor;
+      }
+
+      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return com.openxc.BinaryMessages.internal_static_openxc_AcceptanceFilterBypassCommand_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.class, com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.Builder.class);
+      }
+
+      // Construct using com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.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);
+        bypass_ = false;
+        bitField0_ = (bitField0_ & ~0x00000002);
+        return this;
+      }
+
+      public Builder clone() {
+        return create().mergeFrom(buildPartial());
+      }
+
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return com.openxc.BinaryMessages.internal_static_openxc_AcceptanceFilterBypassCommand_descriptor;
+      }
+
+      public com.openxc.BinaryMessages.AcceptanceFilterBypassCommand getDefaultInstanceForType() {
+        return com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.getDefaultInstance();
+      }
+
+      public com.openxc.BinaryMessages.AcceptanceFilterBypassCommand build() {
+        com.openxc.BinaryMessages.AcceptanceFilterBypassCommand result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      public com.openxc.BinaryMessages.AcceptanceFilterBypassCommand buildPartial() {
+        com.openxc.BinaryMessages.AcceptanceFilterBypassCommand result = new com.openxc.BinaryMessages.AcceptanceFilterBypassCommand(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.bypass_ = bypass_;
+        result.bitField0_ = to_bitField0_;
+        onBuilt();
+        return result;
+      }
+
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof com.openxc.BinaryMessages.AcceptanceFilterBypassCommand) {
+          return mergeFrom((com.openxc.BinaryMessages.AcceptanceFilterBypassCommand)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(com.openxc.BinaryMessages.AcceptanceFilterBypassCommand other) {
+        if (other == com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.getDefaultInstance()) return this;
+        if (other.hasBus()) {
+          setBus(other.getBus());
+        }
+        if (other.hasBypass()) {
+          setBypass(other.getBypass());
+        }
+        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.AcceptanceFilterBypassCommand parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.openxc.BinaryMessages.AcceptanceFilterBypassCommand) 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 bool bypass = 2;
+      private boolean bypass_ ;
+      /**
+       * <code>optional bool bypass = 2;</code>
+       */
+      public boolean hasBypass() {
+        return ((bitField0_ & 0x00000002) == 0x00000002);
+      }
+      /**
+       * <code>optional bool bypass = 2;</code>
+       */
+      public boolean getBypass() {
+        return bypass_;
+      }
+      /**
+       * <code>optional bool bypass = 2;</code>
+       */
+      public Builder setBypass(boolean value) {
+        bitField0_ |= 0x00000002;
+        bypass_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional bool bypass = 2;</code>
+       */
+      public Builder clearBypass() {
+        bitField0_ = (bitField0_ & ~0x00000002);
+        bypass_ = false;
+        onChanged();
+        return this;
+      }
+
+      // @@protoc_insertion_point(builder_scope:openxc.AcceptanceFilterBypassCommand)
+    }
+
+    static {
+      defaultInstance = new AcceptanceFilterBypassCommand(true);
+      defaultInstance.initFields();
+    }
+
+    // @@protoc_insertion_point(class_scope:openxc.AcceptanceFilterBypassCommand)
+  }
+
+  public interface PayloadFormatCommandOrBuilder
+      extends com.google.protobuf.MessageOrBuilder {
+
+    // optional .openxc.PayloadFormatCommand.PayloadFormat format = 1;
+    /**
+     * <code>optional .openxc.PayloadFormatCommand.PayloadFormat format = 1;</code>
+     */
+    boolean hasFormat();
+    /**
+     * <code>optional .openxc.PayloadFormatCommand.PayloadFormat format = 1;</code>
+     */
+    com.openxc.BinaryMessages.PayloadFormatCommand.PayloadFormat getFormat();
+  }
+  /**
+   * Protobuf type {@code openxc.PayloadFormatCommand}
+   */
+  public static final class PayloadFormatCommand extends
+      com.google.protobuf.GeneratedMessage
+      implements PayloadFormatCommandOrBuilder {
+    // Use PayloadFormatCommand.newBuilder() to construct.
+    private PayloadFormatCommand(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+      super(builder);
+      this.unknownFields = builder.getUnknownFields();
+    }
+    private PayloadFormatCommand(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+
+    private static final PayloadFormatCommand defaultInstance;
+    public static PayloadFormatCommand getDefaultInstance() {
+      return defaultInstance;
+    }
+
+    public PayloadFormatCommand getDefaultInstanceForType() {
+      return defaultInstance;
+    }
+
+    private final com.google.protobuf.UnknownFieldSet unknownFields;
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+        getUnknownFields() {
+      return this.unknownFields;
+    }
+    private PayloadFormatCommand(
+        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.PayloadFormatCommand.PayloadFormat value = com.openxc.BinaryMessages.PayloadFormatCommand.PayloadFormat.valueOf(rawValue);
+              if (value == null) {
+                unknownFields.mergeVarintField(1, rawValue);
+              } else {
+                bitField0_ |= 0x00000001;
+                format_ = value;
+              }
+              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_PayloadFormatCommand_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.openxc.BinaryMessages.internal_static_openxc_PayloadFormatCommand_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.openxc.BinaryMessages.PayloadFormatCommand.class, com.openxc.BinaryMessages.PayloadFormatCommand.Builder.class);
+    }
+
+    public static com.google.protobuf.Parser<PayloadFormatCommand> PARSER =
+        new com.google.protobuf.AbstractParser<PayloadFormatCommand>() {
+      public PayloadFormatCommand parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new PayloadFormatCommand(input, extensionRegistry);
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<PayloadFormatCommand> getParserForType() {
+      return PARSER;
+    }
+
+    /**
+     * Protobuf enum {@code openxc.PayloadFormatCommand.PayloadFormat}
+     */
+    public enum PayloadFormat
+        implements com.google.protobuf.ProtocolMessageEnum {
+      /**
+       * <code>JSON = 1;</code>
+       */
+      JSON(0, 1),
+      /**
+       * <code>PROTOBUF = 2;</code>
+       */
+      PROTOBUF(1, 2),
+      /**
+       * <code>MESSAGEPACK = 3;</code>
+       */
+      MESSAGEPACK(2, 3),
+      ;
+
+      /**
+       * <code>JSON = 1;</code>
+       */
+      public static final int JSON_VALUE = 1;
+      /**
+       * <code>PROTOBUF = 2;</code>
+       */
+      public static final int PROTOBUF_VALUE = 2;
+      /**
+       * <code>MESSAGEPACK = 3;</code>
+       */
+      public static final int MESSAGEPACK_VALUE = 3;
+
+
+      public final int getNumber() { return value; }
+
+      public static PayloadFormat valueOf(int value) {
+        switch (value) {
+          case 1: return JSON;
+          case 2: return PROTOBUF;
+          case 3: return MESSAGEPACK;
+          default: return null;
+        }
+      }
+
+      public static com.google.protobuf.Internal.EnumLiteMap<PayloadFormat>
+          internalGetValueMap() {
+        return internalValueMap;
+      }
+      private static com.google.protobuf.Internal.EnumLiteMap<PayloadFormat>
+          internalValueMap =
+            new com.google.protobuf.Internal.EnumLiteMap<PayloadFormat>() {
+              public PayloadFormat findValueByNumber(int number) {
+                return PayloadFormat.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.PayloadFormatCommand.getDescriptor().getEnumTypes().get(0);
+      }
+
+      private static final PayloadFormat[] VALUES = values();
+
+      public static PayloadFormat 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 PayloadFormat(int index, int value) {
+        this.index = index;
+        this.value = value;
+      }
+
+      // @@protoc_insertion_point(enum_scope:openxc.PayloadFormatCommand.PayloadFormat)
+    }
+
+    private int bitField0_;
+    // optional .openxc.PayloadFormatCommand.PayloadFormat format = 1;
+    public static final int FORMAT_FIELD_NUMBER = 1;
+    private com.openxc.BinaryMessages.PayloadFormatCommand.PayloadFormat format_;
+    /**
+     * <code>optional .openxc.PayloadFormatCommand.PayloadFormat format = 1;</code>
+     */
+    public boolean hasFormat() {
+      return ((bitField0_ & 0x00000001) == 0x00000001);
+    }
+    /**
+     * <code>optional .openxc.PayloadFormatCommand.PayloadFormat format = 1;</code>
+     */
+    public com.openxc.BinaryMessages.PayloadFormatCommand.PayloadFormat getFormat() {
+      return format_;
+    }
+
+    private void initFields() {
+      format_ = com.openxc.BinaryMessages.PayloadFormatCommand.PayloadFormat.JSON;
+    }
+    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.writeEnum(1, format_.getNumber());
+      }
+      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
+          .computeEnumSize(1, format_.getNumber());
+      }
+      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.PayloadFormatCommand parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static com.openxc.BinaryMessages.PayloadFormatCommand 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.PayloadFormatCommand parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static com.openxc.BinaryMessages.PayloadFormatCommand parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static com.openxc.BinaryMessages.PayloadFormatCommand parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input);
+    }
+    public static com.openxc.BinaryMessages.PayloadFormatCommand parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input, extensionRegistry);
+    }
+    public static com.openxc.BinaryMessages.PayloadFormatCommand parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return PARSER.parseDelimitedFrom(input);
+    }
+    public static com.openxc.BinaryMessages.PayloadFormatCommand parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+    }
+    public static com.openxc.BinaryMessages.PayloadFormatCommand parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input);
+    }
+    public static com.openxc.BinaryMessages.PayloadFormatCommand 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.PayloadFormatCommand 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.PayloadFormatCommand}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessage.Builder<Builder>
+       implements com.openxc.BinaryMessages.PayloadFormatCommandOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return com.openxc.BinaryMessages.internal_static_openxc_PayloadFormatCommand_descriptor;
+      }
+
+      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return com.openxc.BinaryMessages.internal_static_openxc_PayloadFormatCommand_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                com.openxc.BinaryMessages.PayloadFormatCommand.class, com.openxc.BinaryMessages.PayloadFormatCommand.Builder.class);
+      }
+
+      // Construct using com.openxc.BinaryMessages.PayloadFormatCommand.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();
+        format_ = com.openxc.BinaryMessages.PayloadFormatCommand.PayloadFormat.JSON;
+        bitField0_ = (bitField0_ & ~0x00000001);
+        return this;
+      }
+
+      public Builder clone() {
+        return create().mergeFrom(buildPartial());
+      }
+
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return com.openxc.BinaryMessages.internal_static_openxc_PayloadFormatCommand_descriptor;
+      }
+
+      public com.openxc.BinaryMessages.PayloadFormatCommand getDefaultInstanceForType() {
+        return com.openxc.BinaryMessages.PayloadFormatCommand.getDefaultInstance();
+      }
+
+      public com.openxc.BinaryMessages.PayloadFormatCommand build() {
+        com.openxc.BinaryMessages.PayloadFormatCommand result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      public com.openxc.BinaryMessages.PayloadFormatCommand buildPartial() {
+        com.openxc.BinaryMessages.PayloadFormatCommand result = new com.openxc.BinaryMessages.PayloadFormatCommand(this);
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
+          to_bitField0_ |= 0x00000001;
+        }
+        result.format_ = format_;
+        result.bitField0_ = to_bitField0_;
+        onBuilt();
+        return result;
+      }
+
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof com.openxc.BinaryMessages.PayloadFormatCommand) {
+          return mergeFrom((com.openxc.BinaryMessages.PayloadFormatCommand)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(com.openxc.BinaryMessages.PayloadFormatCommand other) {
+        if (other == com.openxc.BinaryMessages.PayloadFormatCommand.getDefaultInstance()) return this;
+        if (other.hasFormat()) {
+          setFormat(other.getFormat());
+        }
+        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.PayloadFormatCommand parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.openxc.BinaryMessages.PayloadFormatCommand) e.getUnfinishedMessage();
+          throw e;
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+      private int bitField0_;
+
+      // optional .openxc.PayloadFormatCommand.PayloadFormat format = 1;
+      private com.openxc.BinaryMessages.PayloadFormatCommand.PayloadFormat format_ = com.openxc.BinaryMessages.PayloadFormatCommand.PayloadFormat.JSON;
+      /**
+       * <code>optional .openxc.PayloadFormatCommand.PayloadFormat format = 1;</code>
+       */
+      public boolean hasFormat() {
+        return ((bitField0_ & 0x00000001) == 0x00000001);
+      }
+      /**
+       * <code>optional .openxc.PayloadFormatCommand.PayloadFormat format = 1;</code>
+       */
+      public com.openxc.BinaryMessages.PayloadFormatCommand.PayloadFormat getFormat() {
+        return format_;
+      }
+      /**
+       * <code>optional .openxc.PayloadFormatCommand.PayloadFormat format = 1;</code>
+       */
+      public Builder setFormat(com.openxc.BinaryMessages.PayloadFormatCommand.PayloadFormat value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        bitField0_ |= 0x00000001;
+        format_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .openxc.PayloadFormatCommand.PayloadFormat format = 1;</code>
+       */
+      public Builder clearFormat() {
+        bitField0_ = (bitField0_ & ~0x00000001);
+        format_ = com.openxc.BinaryMessages.PayloadFormatCommand.PayloadFormat.JSON;
+        onChanged();
+        return this;
+      }
+
+      // @@protoc_insertion_point(builder_scope:openxc.PayloadFormatCommand)
+    }
+
+    static {
+      defaultInstance = new PayloadFormatCommand(true);
+      defaultInstance.initFields();
+    }
+
+    // @@protoc_insertion_point(class_scope:openxc.PayloadFormatCommand)
+  }
+
+  public interface PredefinedObd2RequestsCommandOrBuilder
+      extends com.google.protobuf.MessageOrBuilder {
+
+    // optional bool enabled = 1;
+    /**
+     * <code>optional bool enabled = 1;</code>
+     */
+    boolean hasEnabled();
+    /**
+     * <code>optional bool enabled = 1;</code>
+     */
+    boolean getEnabled();
+  }
+  /**
+   * Protobuf type {@code openxc.PredefinedObd2RequestsCommand}
+   */
+  public static final class PredefinedObd2RequestsCommand extends
+      com.google.protobuf.GeneratedMessage
+      implements PredefinedObd2RequestsCommandOrBuilder {
+    // Use PredefinedObd2RequestsCommand.newBuilder() to construct.
+    private PredefinedObd2RequestsCommand(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+      super(builder);
+      this.unknownFields = builder.getUnknownFields();
+    }
+    private PredefinedObd2RequestsCommand(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+
+    private static final PredefinedObd2RequestsCommand defaultInstance;
+    public static PredefinedObd2RequestsCommand getDefaultInstance() {
+      return defaultInstance;
+    }
+
+    public PredefinedObd2RequestsCommand getDefaultInstanceForType() {
+      return defaultInstance;
+    }
+
+    private final com.google.protobuf.UnknownFieldSet unknownFields;
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+        getUnknownFields() {
+      return this.unknownFields;
+    }
+    private PredefinedObd2RequestsCommand(
+        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: {
+              bitField0_ |= 0x00000001;
+              enabled_ = 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_PredefinedObd2RequestsCommand_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.openxc.BinaryMessages.internal_static_openxc_PredefinedObd2RequestsCommand_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.class, com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.Builder.class);
+    }
+
+    public static com.google.protobuf.Parser<PredefinedObd2RequestsCommand> PARSER =
+        new com.google.protobuf.AbstractParser<PredefinedObd2RequestsCommand>() {
+      public PredefinedObd2RequestsCommand parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new PredefinedObd2RequestsCommand(input, extensionRegistry);
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<PredefinedObd2RequestsCommand> getParserForType() {
+      return PARSER;
+    }
+
+    private int bitField0_;
+    // optional bool enabled = 1;
+    public static final int ENABLED_FIELD_NUMBER = 1;
+    private boolean enabled_;
+    /**
+     * <code>optional bool enabled = 1;</code>
+     */
+    public boolean hasEnabled() {
+      return ((bitField0_ & 0x00000001) == 0x00000001);
+    }
+    /**
+     * <code>optional bool enabled = 1;</code>
+     */
+    public boolean getEnabled() {
+      return enabled_;
+    }
+
+    private void initFields() {
+      enabled_ = false;
+    }
+    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.writeBool(1, enabled_);
+      }
+      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
+          .computeBoolSize(1, enabled_);
+      }
+      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.PredefinedObd2RequestsCommand parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static com.openxc.BinaryMessages.PredefinedObd2RequestsCommand 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.PredefinedObd2RequestsCommand parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static com.openxc.BinaryMessages.PredefinedObd2RequestsCommand parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static com.openxc.BinaryMessages.PredefinedObd2RequestsCommand parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input);
+    }
+    public static com.openxc.BinaryMessages.PredefinedObd2RequestsCommand parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input, extensionRegistry);
+    }
+    public static com.openxc.BinaryMessages.PredefinedObd2RequestsCommand parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return PARSER.parseDelimitedFrom(input);
+    }
+    public static com.openxc.BinaryMessages.PredefinedObd2RequestsCommand parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+    }
+    public static com.openxc.BinaryMessages.PredefinedObd2RequestsCommand parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input);
+    }
+    public static com.openxc.BinaryMessages.PredefinedObd2RequestsCommand 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.PredefinedObd2RequestsCommand 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.PredefinedObd2RequestsCommand}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessage.Builder<Builder>
+       implements com.openxc.BinaryMessages.PredefinedObd2RequestsCommandOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return com.openxc.BinaryMessages.internal_static_openxc_PredefinedObd2RequestsCommand_descriptor;
+      }
+
+      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return com.openxc.BinaryMessages.internal_static_openxc_PredefinedObd2RequestsCommand_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.class, com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.Builder.class);
+      }
+
+      // Construct using com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.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();
+        enabled_ = false;
+        bitField0_ = (bitField0_ & ~0x00000001);
+        return this;
+      }
+
+      public Builder clone() {
+        return create().mergeFrom(buildPartial());
+      }
+
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return com.openxc.BinaryMessages.internal_static_openxc_PredefinedObd2RequestsCommand_descriptor;
+      }
+
+      public com.openxc.BinaryMessages.PredefinedObd2RequestsCommand getDefaultInstanceForType() {
+        return com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.getDefaultInstance();
+      }
+
+      public com.openxc.BinaryMessages.PredefinedObd2RequestsCommand build() {
+        com.openxc.BinaryMessages.PredefinedObd2RequestsCommand result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      public com.openxc.BinaryMessages.PredefinedObd2RequestsCommand buildPartial() {
+        com.openxc.BinaryMessages.PredefinedObd2RequestsCommand result = new com.openxc.BinaryMessages.PredefinedObd2RequestsCommand(this);
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
+          to_bitField0_ |= 0x00000001;
+        }
+        result.enabled_ = enabled_;
+        result.bitField0_ = to_bitField0_;
+        onBuilt();
+        return result;
+      }
+
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof com.openxc.BinaryMessages.PredefinedObd2RequestsCommand) {
+          return mergeFrom((com.openxc.BinaryMessages.PredefinedObd2RequestsCommand)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(com.openxc.BinaryMessages.PredefinedObd2RequestsCommand other) {
+        if (other == com.openxc.BinaryMessages.PredefinedObd2RequestsCommand.getDefaultInstance()) return this;
+        if (other.hasEnabled()) {
+          setEnabled(other.getEnabled());
+        }
+        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.PredefinedObd2RequestsCommand parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.openxc.BinaryMessages.PredefinedObd2RequestsCommand) e.getUnfinishedMessage();
+          throw e;
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+      private int bitField0_;
+
+      // optional bool enabled = 1;
+      private boolean enabled_ ;
+      /**
+       * <code>optional bool enabled = 1;</code>
+       */
+      public boolean hasEnabled() {
+        return ((bitField0_ & 0x00000001) == 0x00000001);
+      }
+      /**
+       * <code>optional bool enabled = 1;</code>
+       */
+      public boolean getEnabled() {
+        return enabled_;
+      }
+      /**
+       * <code>optional bool enabled = 1;</code>
+       */
+      public Builder setEnabled(boolean value) {
+        bitField0_ |= 0x00000001;
+        enabled_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional bool enabled = 1;</code>
+       */
+      public Builder clearEnabled() {
+        bitField0_ = (bitField0_ & ~0x00000001);
+        enabled_ = false;
+        onChanged();
+        return this;
+      }
+
+      // @@protoc_insertion_point(builder_scope:openxc.PredefinedObd2RequestsCommand)
+    }
+
+    static {
+      defaultInstance = new PredefinedObd2RequestsCommand(true);
+      defaultInstance.initFields();
+    }
+
+    // @@protoc_insertion_point(class_scope:openxc.PredefinedObd2RequestsCommand)
+  }
+
+  public interface NetworkOperatorSettingsOrBuilder
+      extends com.google.protobuf.MessageOrBuilder {
+
+    // optional bool allowDataRoaming = 1;
+    /**
+     * <code>optional bool allowDataRoaming = 1;</code>
+     */
+    boolean hasAllowDataRoaming();
+    /**
+     * <code>optional bool allowDataRoaming = 1;</code>
+     */
+    boolean getAllowDataRoaming();
+
+    // optional .openxc.NetworkOperatorSettings.OperatorSelectMode operatorSelectMode = 2;
+    /**
+     * <code>optional .openxc.NetworkOperatorSettings.OperatorSelectMode operatorSelectMode = 2;</code>
+     */
+    boolean hasOperatorSelectMode();
+    /**
+     * <code>optional .openxc.NetworkOperatorSettings.OperatorSelectMode operatorSelectMode = 2;</code>
+     */
+    com.openxc.BinaryMessages.NetworkOperatorSettings.OperatorSelectMode getOperatorSelectMode();
+
+    // optional .openxc.NetworkOperatorSettings.NetworkDescriptor networkDescriptor = 3;
+    /**
+     * <code>optional .openxc.NetworkOperatorSettings.NetworkDescriptor networkDescriptor = 3;</code>
+     */
+    boolean hasNetworkDescriptor();
+    /**
+     * <code>optional .openxc.NetworkOperatorSettings.NetworkDescriptor networkDescriptor = 3;</code>
+     */
+    com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor getNetworkDescriptor();
+    /**
+     * <code>optional .openxc.NetworkOperatorSettings.NetworkDescriptor networkDescriptor = 3;</code>
+     */
+    com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptorOrBuilder getNetworkDescriptorOrBuilder();
+  }
+  /**
+   * Protobuf type {@code openxc.NetworkOperatorSettings}
+   */
+  public static final class NetworkOperatorSettings extends
+      com.google.protobuf.GeneratedMessage
+      implements NetworkOperatorSettingsOrBuilder {
+    // Use NetworkOperatorSettings.newBuilder() to construct.
+    private NetworkOperatorSettings(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+      super(builder);
+      this.unknownFields = builder.getUnknownFields();
+    }
+    private NetworkOperatorSettings(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+
+    private static final NetworkOperatorSettings defaultInstance;
+    public static NetworkOperatorSettings getDefaultInstance() {
+      return defaultInstance;
+    }
+
+    public NetworkOperatorSettings getDefaultInstanceForType() {
+      return defaultInstance;
+    }
+
+    private final com.google.protobuf.UnknownFieldSet unknownFields;
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+        getUnknownFields() {
+      return this.unknownFields;
+    }
+    private NetworkOperatorSettings(
+        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: {
+              bitField0_ |= 0x00000001;
+              allowDataRoaming_ = input.readBool();
+              break;
+            }
+            case 16: {
+              int rawValue = input.readEnum();
+              com.openxc.BinaryMessages.NetworkOperatorSettings.OperatorSelectMode value = com.openxc.BinaryMessages.NetworkOperatorSettings.OperatorSelectMode.valueOf(rawValue);
+              if (value == null) {
+                unknownFields.mergeVarintField(2, rawValue);
+              } else {
+                bitField0_ |= 0x00000002;
+                operatorSelectMode_ = value;
+              }
+              break;
+            }
+            case 26: {
+              com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.Builder subBuilder = null;
+              if (((bitField0_ & 0x00000004) == 0x00000004)) {
+                subBuilder = networkDescriptor_.toBuilder();
+              }
+              networkDescriptor_ = input.readMessage(com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.PARSER, extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(networkDescriptor_);
+                networkDescriptor_ = subBuilder.buildPartial();
+              }
+              bitField0_ |= 0x00000004;
+              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_NetworkOperatorSettings_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.openxc.BinaryMessages.internal_static_openxc_NetworkOperatorSettings_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.openxc.BinaryMessages.NetworkOperatorSettings.class, com.openxc.BinaryMessages.NetworkOperatorSettings.Builder.class);
+    }
+
+    public static com.google.protobuf.Parser<NetworkOperatorSettings> PARSER =
+        new com.google.protobuf.AbstractParser<NetworkOperatorSettings>() {
+      public NetworkOperatorSettings parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new NetworkOperatorSettings(input, extensionRegistry);
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<NetworkOperatorSettings> getParserForType() {
+      return PARSER;
+    }
+
+    /**
+     * Protobuf enum {@code openxc.NetworkOperatorSettings.OperatorSelectMode}
+     */
+    public enum OperatorSelectMode
+        implements com.google.protobuf.ProtocolMessageEnum {
+      /**
+       * <code>AUTOMATIC = 0;</code>
+       */
+      AUTOMATIC(0, 0),
+      /**
+       * <code>MANUAL = 1;</code>
+       */
+      MANUAL(1, 1),
+      /**
+       * <code>DEREGISTER = 2;</code>
+       */
+      DEREGISTER(2, 2),
+      /**
+       * <code>SET_ONLY = 3;</code>
+       */
+      SET_ONLY(3, 3),
+      /**
+       * <code>MANUAL_AUTOMATIC = 4;</code>
+       */
+      MANUAL_AUTOMATIC(4, 4),
+      ;
+
+      /**
+       * <code>AUTOMATIC = 0;</code>
+       */
+      public static final int AUTOMATIC_VALUE = 0;
+      /**
+       * <code>MANUAL = 1;</code>
+       */
+      public static final int MANUAL_VALUE = 1;
+      /**
+       * <code>DEREGISTER = 2;</code>
+       */
+      public static final int DEREGISTER_VALUE = 2;
+      /**
+       * <code>SET_ONLY = 3;</code>
+       */
+      public static final int SET_ONLY_VALUE = 3;
+      /**
+       * <code>MANUAL_AUTOMATIC = 4;</code>
+       */
+      public static final int MANUAL_AUTOMATIC_VALUE = 4;
+
+
+      public final int getNumber() { return value; }
+
+      public static OperatorSelectMode valueOf(int value) {
+        switch (value) {
+          case 0: return AUTOMATIC;
+          case 1: return MANUAL;
+          case 2: return DEREGISTER;
+          case 3: return SET_ONLY;
+          case 4: return MANUAL_AUTOMATIC;
+          default: return null;
+        }
+      }
+
+      public static com.google.protobuf.Internal.EnumLiteMap<OperatorSelectMode>
+          internalGetValueMap() {
+        return internalValueMap;
+      }
+      private static com.google.protobuf.Internal.EnumLiteMap<OperatorSelectMode>
+          internalValueMap =
+            new com.google.protobuf.Internal.EnumLiteMap<OperatorSelectMode>() {
+              public OperatorSelectMode findValueByNumber(int number) {
+                return OperatorSelectMode.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.NetworkOperatorSettings.getDescriptor().getEnumTypes().get(0);
+      }
+
+      private static final OperatorSelectMode[] VALUES = values();
+
+      public static OperatorSelectMode 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 OperatorSelectMode(int index, int value) {
+        this.index = index;
+        this.value = value;
+      }
+
+      // @@protoc_insertion_point(enum_scope:openxc.NetworkOperatorSettings.OperatorSelectMode)
+    }
+
+    public interface NetworkDescriptorOrBuilder
+        extends com.google.protobuf.MessageOrBuilder {
+
+      // optional uint32 PLMN = 1;
+      /**
+       * <code>optional uint32 PLMN = 1;</code>
+       */
+      boolean hasPLMN();
+      /**
+       * <code>optional uint32 PLMN = 1;</code>
+       */
+      int getPLMN();
+
+      // optional .openxc.NetworkOperatorSettings.NetworkDescriptor.NetworkType networkType = 2;
+      /**
+       * <code>optional .openxc.NetworkOperatorSettings.NetworkDescriptor.NetworkType networkType = 2;</code>
+       */
+      boolean hasNetworkType();
+      /**
+       * <code>optional .openxc.NetworkOperatorSettings.NetworkDescriptor.NetworkType networkType = 2;</code>
+       */
+      com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.NetworkType getNetworkType();
+    }
+    /**
+     * Protobuf type {@code openxc.NetworkOperatorSettings.NetworkDescriptor}
+     */
+    public static final class NetworkDescriptor extends
+        com.google.protobuf.GeneratedMessage
+        implements NetworkDescriptorOrBuilder {
+      // Use NetworkDescriptor.newBuilder() to construct.
+      private NetworkDescriptor(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+        super(builder);
+        this.unknownFields = builder.getUnknownFields();
+      }
+      private NetworkDescriptor(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+
+      private static final NetworkDescriptor defaultInstance;
+      public static NetworkDescriptor getDefaultInstance() {
+        return defaultInstance;
+      }
+
+      public NetworkDescriptor getDefaultInstanceForType() {
+        return defaultInstance;
+      }
+
+      private final com.google.protobuf.UnknownFieldSet unknownFields;
+      @java.lang.Override
+      public final com.google.protobuf.UnknownFieldSet
+          getUnknownFields() {
+        return this.unknownFields;
+      }
+      private NetworkDescriptor(
+          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: {
+                bitField0_ |= 0x00000001;
+                pLMN_ = input.readUInt32();
+                break;
+              }
+              case 16: {
+                int rawValue = input.readEnum();
+                com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.NetworkType value = com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.NetworkType.valueOf(rawValue);
+                if (value == null) {
+                  unknownFields.mergeVarintField(2, rawValue);
+                } else {
+                  bitField0_ |= 0x00000002;
+                  networkType_ = value;
+                }
+                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_NetworkOperatorSettings_NetworkDescriptor_descriptor;
+      }
+
+      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return com.openxc.BinaryMessages.internal_static_openxc_NetworkOperatorSettings_NetworkDescriptor_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.class, com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.Builder.class);
+      }
+
+      public static com.google.protobuf.Parser<NetworkDescriptor> PARSER =
+          new com.google.protobuf.AbstractParser<NetworkDescriptor>() {
+        public NetworkDescriptor parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new NetworkDescriptor(input, extensionRegistry);
+        }
+      };
+
+      @java.lang.Override
+      public com.google.protobuf.Parser<NetworkDescriptor> getParserForType() {
+        return PARSER;
+      }
+
+      /**
+       * Protobuf enum {@code openxc.NetworkOperatorSettings.NetworkDescriptor.NetworkType}
+       */
+      public enum NetworkType
+          implements com.google.protobuf.ProtocolMessageEnum {
+        /**
+         * <code>GSM = 0;</code>
+         */
+        GSM(0, 0),
+        /**
+         * <code>UTRAN = 2;</code>
+         */
+        UTRAN(1, 2),
+        ;
+
+        /**
+         * <code>GSM = 0;</code>
+         */
+        public static final int GSM_VALUE = 0;
+        /**
+         * <code>UTRAN = 2;</code>
+         */
+        public static final int UTRAN_VALUE = 2;
+
+
+        public final int getNumber() { return value; }
+
+        public static NetworkType valueOf(int value) {
+          switch (value) {
+            case 0: return GSM;
+            case 2: return UTRAN;
+            default: return null;
+          }
+        }
+
+        public static com.google.protobuf.Internal.EnumLiteMap<NetworkType>
+            internalGetValueMap() {
+          return internalValueMap;
+        }
+        private static com.google.protobuf.Internal.EnumLiteMap<NetworkType>
+            internalValueMap =
+              new com.google.protobuf.Internal.EnumLiteMap<NetworkType>() {
+                public NetworkType findValueByNumber(int number) {
+                  return NetworkType.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.NetworkOperatorSettings.NetworkDescriptor.getDescriptor().getEnumTypes().get(0);
+        }
+
+        private static final NetworkType[] VALUES = values();
+
+        public static NetworkType 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 NetworkType(int index, int value) {
+          this.index = index;
+          this.value = value;
+        }
+
+        // @@protoc_insertion_point(enum_scope:openxc.NetworkOperatorSettings.NetworkDescriptor.NetworkType)
+      }
+
+      private int bitField0_;
+      // optional uint32 PLMN = 1;
+      public static final int PLMN_FIELD_NUMBER = 1;
+      private int pLMN_;
+      /**
+       * <code>optional uint32 PLMN = 1;</code>
+       */
+      public boolean hasPLMN() {
+        return ((bitField0_ & 0x00000001) == 0x00000001);
+      }
+      /**
+       * <code>optional uint32 PLMN = 1;</code>
+       */
+      public int getPLMN() {
+        return pLMN_;
+      }
+
+      // optional .openxc.NetworkOperatorSettings.NetworkDescriptor.NetworkType networkType = 2;
+      public static final int NETWORKTYPE_FIELD_NUMBER = 2;
+      private com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.NetworkType networkType_;
+      /**
+       * <code>optional .openxc.NetworkOperatorSettings.NetworkDescriptor.NetworkType networkType = 2;</code>
+       */
+      public boolean hasNetworkType() {
+        return ((bitField0_ & 0x00000002) == 0x00000002);
+      }
+      /**
+       * <code>optional .openxc.NetworkOperatorSettings.NetworkDescriptor.NetworkType networkType = 2;</code>
+       */
+      public com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.NetworkType getNetworkType() {
+        return networkType_;
+      }
+
+      private void initFields() {
+        pLMN_ = 0;
+        networkType_ = com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.NetworkType.GSM;
+      }
+      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.writeUInt32(1, pLMN_);
+        }
+        if (((bitField0_ & 0x00000002) == 0x00000002)) {
+          output.writeEnum(2, networkType_.getNumber());
+        }
+        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
+            .computeUInt32Size(1, pLMN_);
+        }
+        if (((bitField0_ & 0x00000002) == 0x00000002)) {
+          size += com.google.protobuf.CodedOutputStream
+            .computeEnumSize(2, networkType_.getNumber());
+        }
+        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.NetworkOperatorSettings.NetworkDescriptor parseFrom(
+          com.google.protobuf.ByteString data)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data);
+      }
+      public static com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor 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.NetworkOperatorSettings.NetworkDescriptor parseFrom(byte[] data)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data);
+      }
+      public static com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor parseFrom(
+          byte[] data,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data, extensionRegistry);
+      }
+      public static com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor parseFrom(java.io.InputStream input)
+          throws java.io.IOException {
+        return PARSER.parseFrom(input);
+      }
+      public static com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor parseFrom(
+          java.io.InputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        return PARSER.parseFrom(input, extensionRegistry);
+      }
+      public static com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor parseDelimitedFrom(java.io.InputStream input)
+          throws java.io.IOException {
+        return PARSER.parseDelimitedFrom(input);
+      }
+      public static com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor parseDelimitedFrom(
+          java.io.InputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        return PARSER.parseDelimitedFrom(input, extensionRegistry);
+      }
+      public static com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor parseFrom(
+          com.google.protobuf.CodedInputStream input)
+          throws java.io.IOException {
+        return PARSER.parseFrom(input);
+      }
+      public static com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor 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.NetworkOperatorSettings.NetworkDescriptor 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.NetworkOperatorSettings.NetworkDescriptor}
+       */
+      public static final class Builder extends
+          com.google.protobuf.GeneratedMessage.Builder<Builder>
+         implements com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptorOrBuilder {
+        public static final com.google.protobuf.Descriptors.Descriptor
+            getDescriptor() {
+          return com.openxc.BinaryMessages.internal_static_openxc_NetworkOperatorSettings_NetworkDescriptor_descriptor;
+        }
+
+        protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+            internalGetFieldAccessorTable() {
+          return com.openxc.BinaryMessages.internal_static_openxc_NetworkOperatorSettings_NetworkDescriptor_fieldAccessorTable
+              .ensureFieldAccessorsInitialized(
+                  com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.class, com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.Builder.class);
+        }
+
+        // Construct using com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.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();
+          pLMN_ = 0;
+          bitField0_ = (bitField0_ & ~0x00000001);
+          networkType_ = com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.NetworkType.GSM;
+          bitField0_ = (bitField0_ & ~0x00000002);
+          return this;
+        }
+
+        public Builder clone() {
+          return create().mergeFrom(buildPartial());
+        }
+
+        public com.google.protobuf.Descriptors.Descriptor
+            getDescriptorForType() {
+          return com.openxc.BinaryMessages.internal_static_openxc_NetworkOperatorSettings_NetworkDescriptor_descriptor;
+        }
+
+        public com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor getDefaultInstanceForType() {
+          return com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.getDefaultInstance();
+        }
+
+        public com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor build() {
+          com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor result = buildPartial();
+          if (!result.isInitialized()) {
+            throw newUninitializedMessageException(result);
+          }
+          return result;
+        }
+
+        public com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor buildPartial() {
+          com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor result = new com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor(this);
+          int from_bitField0_ = bitField0_;
+          int to_bitField0_ = 0;
+          if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
+            to_bitField0_ |= 0x00000001;
+          }
+          result.pLMN_ = pLMN_;
+          if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
+            to_bitField0_ |= 0x00000002;
+          }
+          result.networkType_ = networkType_;
+          result.bitField0_ = to_bitField0_;
+          onBuilt();
+          return result;
+        }
+
+        public Builder mergeFrom(com.google.protobuf.Message other) {
+          if (other instanceof com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor) {
+            return mergeFrom((com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor)other);
+          } else {
+            super.mergeFrom(other);
+            return this;
+          }
+        }
+
+        public Builder mergeFrom(com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor other) {
+          if (other == com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.getDefaultInstance()) return this;
+          if (other.hasPLMN()) {
+            setPLMN(other.getPLMN());
+          }
+          if (other.hasNetworkType()) {
+            setNetworkType(other.getNetworkType());
+          }
+          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.NetworkOperatorSettings.NetworkDescriptor parsedMessage = null;
+          try {
+            parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            parsedMessage = (com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor) e.getUnfinishedMessage();
+            throw e;
+          } finally {
+            if (parsedMessage != null) {
+              mergeFrom(parsedMessage);
+            }
+          }
+          return this;
+        }
+        private int bitField0_;
+
+        // optional uint32 PLMN = 1;
+        private int pLMN_ ;
+        /**
+         * <code>optional uint32 PLMN = 1;</code>
+         */
+        public boolean hasPLMN() {
+          return ((bitField0_ & 0x00000001) == 0x00000001);
+        }
+        /**
+         * <code>optional uint32 PLMN = 1;</code>
+         */
+        public int getPLMN() {
+          return pLMN_;
+        }
+        /**
+         * <code>optional uint32 PLMN = 1;</code>
+         */
+        public Builder setPLMN(int value) {
+          bitField0_ |= 0x00000001;
+          pLMN_ = value;
+          onChanged();
+          return this;
+        }
+        /**
+         * <code>optional uint32 PLMN = 1;</code>
+         */
+        public Builder clearPLMN() {
+          bitField0_ = (bitField0_ & ~0x00000001);
+          pLMN_ = 0;
+          onChanged();
+          return this;
+        }
+
+        // optional .openxc.NetworkOperatorSettings.NetworkDescriptor.NetworkType networkType = 2;
+        private com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.NetworkType networkType_ = com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.NetworkType.GSM;
+        /**
+         * <code>optional .openxc.NetworkOperatorSettings.NetworkDescriptor.NetworkType networkType = 2;</code>
+         */
+        public boolean hasNetworkType() {
+          return ((bitField0_ & 0x00000002) == 0x00000002);
+        }
+        /**
+         * <code>optional .openxc.NetworkOperatorSettings.NetworkDescriptor.NetworkType networkType = 2;</code>
+         */
+        public com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.NetworkType getNetworkType() {
+          return networkType_;
+        }
+        /**
+         * <code>optional .openxc.NetworkOperatorSettings.NetworkDescriptor.NetworkType networkType = 2;</code>
+         */
+        public Builder setNetworkType(com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.NetworkType value) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          bitField0_ |= 0x00000002;
+          networkType_ = value;
+          onChanged();
+          return this;
+        }
+        /**
+         * <code>optional .openxc.NetworkOperatorSettings.NetworkDescriptor.NetworkType networkType = 2;</code>
+         */
+        public Builder clearNetworkType() {
+          bitField0_ = (bitField0_ & ~0x00000002);
+          networkType_ = com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.NetworkType.GSM;
+          onChanged();
+          return this;
+        }
+
+        // @@protoc_insertion_point(builder_scope:openxc.NetworkOperatorSettings.NetworkDescriptor)
+      }
+
+      static {
+        defaultInstance = new NetworkDescriptor(true);
+        defaultInstance.initFields();
+      }
+
+      // @@protoc_insertion_point(class_scope:openxc.NetworkOperatorSettings.NetworkDescriptor)
+    }
+
+    private int bitField0_;
+    // optional bool allowDataRoaming = 1;
+    public static final int ALLOWDATAROAMING_FIELD_NUMBER = 1;
+    private boolean allowDataRoaming_;
+    /**
+     * <code>optional bool allowDataRoaming = 1;</code>
+     */
+    public boolean hasAllowDataRoaming() {
+      return ((bitField0_ & 0x00000001) == 0x00000001);
+    }
+    /**
+     * <code>optional bool allowDataRoaming = 1;</code>
+     */
+    public boolean getAllowDataRoaming() {
+      return allowDataRoaming_;
+    }
+
+    // optional .openxc.NetworkOperatorSettings.OperatorSelectMode operatorSelectMode = 2;
+    public static final int OPERATORSELECTMODE_FIELD_NUMBER = 2;
+    private com.openxc.BinaryMessages.NetworkOperatorSettings.OperatorSelectMode operatorSelectMode_;
+    /**
+     * <code>optional .openxc.NetworkOperatorSettings.OperatorSelectMode operatorSelectMode = 2;</code>
+     */
+    public boolean hasOperatorSelectMode() {
+      return ((bitField0_ & 0x00000002) == 0x00000002);
+    }
+    /**
+     * <code>optional .openxc.NetworkOperatorSettings.OperatorSelectMode operatorSelectMode = 2;</code>
+     */
+    public com.openxc.BinaryMessages.NetworkOperatorSettings.OperatorSelectMode getOperatorSelectMode() {
+      return operatorSelectMode_;
+    }
+
+    // optional .openxc.NetworkOperatorSettings.NetworkDescriptor networkDescriptor = 3;
+    public static final int NETWORKDESCRIPTOR_FIELD_NUMBER = 3;
+    private com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor networkDescriptor_;
+    /**
+     * <code>optional .openxc.NetworkOperatorSettings.NetworkDescriptor networkDescriptor = 3;</code>
+     */
+    public boolean hasNetworkDescriptor() {
+      return ((bitField0_ & 0x00000004) == 0x00000004);
+    }
+    /**
+     * <code>optional .openxc.NetworkOperatorSettings.NetworkDescriptor networkDescriptor = 3;</code>
+     */
+    public com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor getNetworkDescriptor() {
+      return networkDescriptor_;
+    }
+    /**
+     * <code>optional .openxc.NetworkOperatorSettings.NetworkDescriptor networkDescriptor = 3;</code>
+     */
+    public com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptorOrBuilder getNetworkDescriptorOrBuilder() {
+      return networkDescriptor_;
+    }
+
+    private void initFields() {
+      allowDataRoaming_ = false;
+      operatorSelectMode_ = com.openxc.BinaryMessages.NetworkOperatorSettings.OperatorSelectMode.AUTOMATIC;
+      networkDescriptor_ = com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.getDefaultInstance();
+    }
+    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.writeBool(1, allowDataRoaming_);
+      }
+      if (((bitField0_ & 0x00000002) == 0x00000002)) {
+        output.writeEnum(2, operatorSelectMode_.getNumber());
+      }
+      if (((bitField0_ & 0x00000004) == 0x00000004)) {
+        output.writeMessage(3, networkDescriptor_);
+      }
+      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
+          .computeBoolSize(1, allowDataRoaming_);
+      }
+      if (((bitField0_ & 0x00000002) == 0x00000002)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(2, operatorSelectMode_.getNumber());
+      }
+      if (((bitField0_ & 0x00000004) == 0x00000004)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(3, networkDescriptor_);
+      }
+      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.NetworkOperatorSettings parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static com.openxc.BinaryMessages.NetworkOperatorSettings 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.NetworkOperatorSettings parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static com.openxc.BinaryMessages.NetworkOperatorSettings parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static com.openxc.BinaryMessages.NetworkOperatorSettings parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input);
+    }
+    public static com.openxc.BinaryMessages.NetworkOperatorSettings parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input, extensionRegistry);
+    }
+    public static com.openxc.BinaryMessages.NetworkOperatorSettings parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return PARSER.parseDelimitedFrom(input);
+    }
+    public static com.openxc.BinaryMessages.NetworkOperatorSettings parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+    }
+    public static com.openxc.BinaryMessages.NetworkOperatorSettings parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input);
+    }
+    public static com.openxc.BinaryMessages.NetworkOperatorSettings 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.NetworkOperatorSettings 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.NetworkOperatorSettings}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessage.Builder<Builder>
+       implements com.openxc.BinaryMessages.NetworkOperatorSettingsOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return com.openxc.BinaryMessages.internal_static_openxc_NetworkOperatorSettings_descriptor;
+      }
+
+      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return com.openxc.BinaryMessages.internal_static_openxc_NetworkOperatorSettings_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                com.openxc.BinaryMessages.NetworkOperatorSettings.class, com.openxc.BinaryMessages.NetworkOperatorSettings.Builder.class);
+      }
+
+      // Construct using com.openxc.BinaryMessages.NetworkOperatorSettings.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+          getNetworkDescriptorFieldBuilder();
+        }
+      }
+      private static Builder create() {
+        return new Builder();
+      }
+
+      public Builder clear() {
+        super.clear();
+        allowDataRoaming_ = false;
+        bitField0_ = (bitField0_ & ~0x00000001);
+        operatorSelectMode_ = com.openxc.BinaryMessages.NetworkOperatorSettings.OperatorSelectMode.AUTOMATIC;
+        bitField0_ = (bitField0_ & ~0x00000002);
+        if (networkDescriptorBuilder_ == null) {
+          networkDescriptor_ = com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.getDefaultInstance();
+        } else {
+          networkDescriptorBuilder_.clear();
+        }
+        bitField0_ = (bitField0_ & ~0x00000004);
+        return this;
+      }
+
+      public Builder clone() {
+        return create().mergeFrom(buildPartial());
+      }
+
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return com.openxc.BinaryMessages.internal_static_openxc_NetworkOperatorSettings_descriptor;
+      }
+
+      public com.openxc.BinaryMessages.NetworkOperatorSettings getDefaultInstanceForType() {
+        return com.openxc.BinaryMessages.NetworkOperatorSettings.getDefaultInstance();
+      }
+
+      public com.openxc.BinaryMessages.NetworkOperatorSettings build() {
+        com.openxc.BinaryMessages.NetworkOperatorSettings result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      public com.openxc.BinaryMessages.NetworkOperatorSettings buildPartial() {
+        com.openxc.BinaryMessages.NetworkOperatorSettings result = new com.openxc.BinaryMessages.NetworkOperatorSettings(this);
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
+          to_bitField0_ |= 0x00000001;
+        }
+        result.allowDataRoaming_ = allowDataRoaming_;
+        if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
+          to_bitField0_ |= 0x00000002;
+        }
+        result.operatorSelectMode_ = operatorSelectMode_;
+        if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
+          to_bitField0_ |= 0x00000004;
+        }
+        if (networkDescriptorBuilder_ == null) {
+          result.networkDescriptor_ = networkDescriptor_;
+        } else {
+          result.networkDescriptor_ = networkDescriptorBuilder_.build();
+        }
+        result.bitField0_ = to_bitField0_;
+        onBuilt();
+        return result;
+      }
+
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof com.openxc.BinaryMessages.NetworkOperatorSettings) {
+          return mergeFrom((com.openxc.BinaryMessages.NetworkOperatorSettings)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(com.openxc.BinaryMessages.NetworkOperatorSettings other) {
+        if (other == com.openxc.BinaryMessages.NetworkOperatorSettings.getDefaultInstance()) return this;
+        if (other.hasAllowDataRoaming()) {
+          setAllowDataRoaming(other.getAllowDataRoaming());
+        }
+        if (other.hasOperatorSelectMode()) {
+          setOperatorSelectMode(other.getOperatorSelectMode());
+        }
+        if (other.hasNetworkDescriptor()) {
+          mergeNetworkDescriptor(other.getNetworkDescriptor());
+        }
+        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.NetworkOperatorSettings parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.openxc.BinaryMessages.NetworkOperatorSettings) e.getUnfinishedMessage();
+          throw e;
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+      private int bitField0_;
+
+      // optional bool allowDataRoaming = 1;
+      private boolean allowDataRoaming_ ;
+      /**
+       * <code>optional bool allowDataRoaming = 1;</code>
+       */
+      public boolean hasAllowDataRoaming() {
+        return ((bitField0_ & 0x00000001) == 0x00000001);
+      }
+      /**
+       * <code>optional bool allowDataRoaming = 1;</code>
+       */
+      public boolean getAllowDataRoaming() {
+        return allowDataRoaming_;
+      }
+      /**
+       * <code>optional bool allowDataRoaming = 1;</code>
+       */
+      public Builder setAllowDataRoaming(boolean value) {
+        bitField0_ |= 0x00000001;
+        allowDataRoaming_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional bool allowDataRoaming = 1;</code>
+       */
+      public Builder clearAllowDataRoaming() {
+        bitField0_ = (bitField0_ & ~0x00000001);
+        allowDataRoaming_ = false;
+        onChanged();
+        return this;
+      }
+
+      // optional .openxc.NetworkOperatorSettings.OperatorSelectMode operatorSelectMode = 2;
+      private com.openxc.BinaryMessages.NetworkOperatorSettings.OperatorSelectMode operatorSelectMode_ = com.openxc.BinaryMessages.NetworkOperatorSettings.OperatorSelectMode.AUTOMATIC;
+      /**
+       * <code>optional .openxc.NetworkOperatorSettings.OperatorSelectMode operatorSelectMode = 2;</code>
+       */
+      public boolean hasOperatorSelectMode() {
+        return ((bitField0_ & 0x00000002) == 0x00000002);
+      }
+      /**
+       * <code>optional .openxc.NetworkOperatorSettings.OperatorSelectMode operatorSelectMode = 2;</code>
+       */
+      public com.openxc.BinaryMessages.NetworkOperatorSettings.OperatorSelectMode getOperatorSelectMode() {
+        return operatorSelectMode_;
+      }
+      /**
+       * <code>optional .openxc.NetworkOperatorSettings.OperatorSelectMode operatorSelectMode = 2;</code>
+       */
+      public Builder setOperatorSelectMode(com.openxc.BinaryMessages.NetworkOperatorSettings.OperatorSelectMode value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        bitField0_ |= 0x00000002;
+        operatorSelectMode_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .openxc.NetworkOperatorSettings.OperatorSelectMode operatorSelectMode = 2;</code>
+       */
+      public Builder clearOperatorSelectMode() {
+        bitField0_ = (bitField0_ & ~0x00000002);
+        operatorSelectMode_ = com.openxc.BinaryMessages.NetworkOperatorSettings.OperatorSelectMode.AUTOMATIC;
+        onChanged();
+        return this;
+      }
+
+      // optional .openxc.NetworkOperatorSettings.NetworkDescriptor networkDescriptor = 3;
+      private com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor networkDescriptor_ = com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.getDefaultInstance();
+      private com.google.protobuf.SingleFieldBuilder<
+          com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor, com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.Builder, com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptorOrBuilder> networkDescriptorBuilder_;
+      /**
+       * <code>optional .openxc.NetworkOperatorSettings.NetworkDescriptor networkDescriptor = 3;</code>
+       */
+      public boolean hasNetworkDescriptor() {
+        return ((bitField0_ & 0x00000004) == 0x00000004);
+      }
+      /**
+       * <code>optional .openxc.NetworkOperatorSettings.NetworkDescriptor networkDescriptor = 3;</code>
+       */
+      public com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor getNetworkDescriptor() {
+        if (networkDescriptorBuilder_ == null) {
+          return networkDescriptor_;
+        } else {
+          return networkDescriptorBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>optional .openxc.NetworkOperatorSettings.NetworkDescriptor networkDescriptor = 3;</code>
+       */
+      public Builder setNetworkDescriptor(com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor value) {
+        if (networkDescriptorBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          networkDescriptor_ = value;
+          onChanged();
+        } else {
+          networkDescriptorBuilder_.setMessage(value);
+        }
+        bitField0_ |= 0x00000004;
+        return this;
+      }
+      /**
+       * <code>optional .openxc.NetworkOperatorSettings.NetworkDescriptor networkDescriptor = 3;</code>
+       */
+      public Builder setNetworkDescriptor(
+          com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.Builder builderForValue) {
+        if (networkDescriptorBuilder_ == null) {
+          networkDescriptor_ = builderForValue.build();
+          onChanged();
+        } else {
+          networkDescriptorBuilder_.setMessage(builderForValue.build());
+        }
+        bitField0_ |= 0x00000004;
+        return this;
+      }
+      /**
+       * <code>optional .openxc.NetworkOperatorSettings.NetworkDescriptor networkDescriptor = 3;</code>
+       */
+      public Builder mergeNetworkDescriptor(com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor value) {
+        if (networkDescriptorBuilder_ == null) {
+          if (((bitField0_ & 0x00000004) == 0x00000004) &&
+              networkDescriptor_ != com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.getDefaultInstance()) {
+            networkDescriptor_ =
+              com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.newBuilder(networkDescriptor_).mergeFrom(value).buildPartial();
+          } else {
+            networkDescriptor_ = value;
+          }
+          onChanged();
+        } else {
+          networkDescriptorBuilder_.mergeFrom(value);
+        }
+        bitField0_ |= 0x00000004;
+        return this;
+      }
+      /**
+       * <code>optional .openxc.NetworkOperatorSettings.NetworkDescriptor networkDescriptor = 3;</code>
+       */
+      public Builder clearNetworkDescriptor() {
+        if (networkDescriptorBuilder_ == null) {
+          networkDescriptor_ = com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.getDefaultInstance();
+          onChanged();
+        } else {
+          networkDescriptorBuilder_.clear();
+        }
+        bitField0_ = (bitField0_ & ~0x00000004);
+        return this;
+      }
+      /**
+       * <code>optional .openxc.NetworkOperatorSettings.NetworkDescriptor networkDescriptor = 3;</code>
+       */
+      public com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.Builder getNetworkDescriptorBuilder() {
+        bitField0_ |= 0x00000004;
+        onChanged();
+        return getNetworkDescriptorFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>optional .openxc.NetworkOperatorSettings.NetworkDescriptor networkDescriptor = 3;</code>
+       */
+      public com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptorOrBuilder getNetworkDescriptorOrBuilder() {
+        if (networkDescriptorBuilder_ != null) {
+          return networkDescriptorBuilder_.getMessageOrBuilder();
+        } else {
+          return networkDescriptor_;
+        }
+      }
+      /**
+       * <code>optional .openxc.NetworkOperatorSettings.NetworkDescriptor networkDescriptor = 3;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilder<
+          com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor, com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.Builder, com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptorOrBuilder> 
+          getNetworkDescriptorFieldBuilder() {
+        if (networkDescriptorBuilder_ == null) {
+          networkDescriptorBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+              com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor, com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptor.Builder, com.openxc.BinaryMessages.NetworkOperatorSettings.NetworkDescriptorOrBuilder>(
+                  networkDescriptor_,
+                  getParentForChildren(),
+                  isClean());
+          networkDescriptor_ = null;
+        }
+        return networkDescriptorBuilder_;
+      }
+
+      // @@protoc_insertion_point(builder_scope:openxc.NetworkOperatorSettings)
+    }
+
+    static {
+      defaultInstance = new NetworkOperatorSettings(true);
+      defaultInstance.initFields();
+    }
+
+    // @@protoc_insertion_point(class_scope:openxc.NetworkOperatorSettings)
+  }
+
+  public interface NetworkDataSettingsOrBuilder
+      extends com.google.protobuf.MessageOrBuilder {
+
+    // optional string APN = 1;
+    /**
+     * <code>optional string APN = 1;</code>
+     */
+    boolean hasAPN();
+    /**
+     * <code>optional string APN = 1;</code>
+     */
+    java.lang.String getAPN();
+    /**
+     * <code>optional string APN = 1;</code>
+     */
+    com.google.protobuf.ByteString
+        getAPNBytes();
+  }
+  /**
+   * Protobuf type {@code openxc.NetworkDataSettings}
+   */
+  public static final class NetworkDataSettings extends
+      com.google.protobuf.GeneratedMessage
+      implements NetworkDataSettingsOrBuilder {
+    // Use NetworkDataSettings.newBuilder() to construct.
+    private NetworkDataSettings(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+      super(builder);
+      this.unknownFields = builder.getUnknownFields();
+    }
+    private NetworkDataSettings(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+
+    private static final NetworkDataSettings defaultInstance;
+    public static NetworkDataSettings getDefaultInstance() {
+      return defaultInstance;
+    }
+
+    public NetworkDataSettings getDefaultInstanceForType() {
+      return defaultInstance;
+    }
+
+    private final com.google.protobuf.UnknownFieldSet unknownFields;
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+        getUnknownFields() {
+      return this.unknownFields;
+    }
+    private NetworkDataSettings(
+        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 10: {
+              bitField0_ |= 0x00000001;
+              aPN_ = input.readBytes();
+              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_NetworkDataSettings_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.openxc.BinaryMessages.internal_static_openxc_NetworkDataSettings_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.openxc.BinaryMessages.NetworkDataSettings.class, com.openxc.BinaryMessages.NetworkDataSettings.Builder.class);
+    }
+
+    public static com.google.protobuf.Parser<NetworkDataSettings> PARSER =
+        new com.google.protobuf.AbstractParser<NetworkDataSettings>() {
+      public NetworkDataSettings parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new NetworkDataSettings(input, extensionRegistry);
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<NetworkDataSettings> getParserForType() {
+      return PARSER;
+    }
+
+    private int bitField0_;
+    // optional string APN = 1;
+    public static final int APN_FIELD_NUMBER = 1;
+    private java.lang.Object aPN_;
+    /**
+     * <code>optional string APN = 1;</code>
+     */
+    public boolean hasAPN() {
+      return ((bitField0_ & 0x00000001) == 0x00000001);
+    }
+    /**
+     * <code>optional string APN = 1;</code>
+     */
+    public java.lang.String getAPN() {
+      java.lang.Object ref = aPN_;
+      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()) {
+          aPN_ = s;
+        }
+        return s;
+      }
+    }
+    /**
+     * <code>optional string APN = 1;</code>
+     */
+    public com.google.protobuf.ByteString
+        getAPNBytes() {
+      java.lang.Object ref = aPN_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        aPN_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    private void initFields() {
+      aPN_ = "";
+    }
+    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.writeBytes(1, getAPNBytes());
+      }
+      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
+          .computeBytesSize(1, getAPNBytes());
+      }
+      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.NetworkDataSettings parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static com.openxc.BinaryMessages.NetworkDataSettings 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.NetworkDataSettings parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static com.openxc.BinaryMessages.NetworkDataSettings parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static com.openxc.BinaryMessages.NetworkDataSettings parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input);
+    }
+    public static com.openxc.BinaryMessages.NetworkDataSettings parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input, extensionRegistry);
+    }
+    public static com.openxc.BinaryMessages.NetworkDataSettings parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return PARSER.parseDelimitedFrom(input);
+    }
+    public static com.openxc.BinaryMessages.NetworkDataSettings parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+    }
+    public static com.openxc.BinaryMessages.NetworkDataSettings parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input);
+    }
+    public static com.openxc.BinaryMessages.NetworkDataSettings 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.NetworkDataSettings 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.NetworkDataSettings}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessage.Builder<Builder>
+       implements com.openxc.BinaryMessages.NetworkDataSettingsOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return com.openxc.BinaryMessages.internal_static_openxc_NetworkDataSettings_descriptor;
+      }
+
+      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return com.openxc.BinaryMessages.internal_static_openxc_NetworkDataSettings_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                com.openxc.BinaryMessages.NetworkDataSettings.class, com.openxc.BinaryMessages.NetworkDataSettings.Builder.class);
+      }
+
+      // Construct using com.openxc.BinaryMessages.NetworkDataSettings.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();
+        aPN_ = "";
+        bitField0_ = (bitField0_ & ~0x00000001);
+        return this;
+      }
+
+      public Builder clone() {
+        return create().mergeFrom(buildPartial());
+      }
+
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return com.openxc.BinaryMessages.internal_static_openxc_NetworkDataSettings_descriptor;
+      }
+
+      public com.openxc.BinaryMessages.NetworkDataSettings getDefaultInstanceForType() {
+        return com.openxc.BinaryMessages.NetworkDataSettings.getDefaultInstance();
+      }
+
+      public com.openxc.BinaryMessages.NetworkDataSettings build() {
+        com.openxc.BinaryMessages.NetworkDataSettings result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      public com.openxc.BinaryMessages.NetworkDataSettings buildPartial() {
+        com.openxc.BinaryMessages.NetworkDataSettings result = new com.openxc.BinaryMessages.NetworkDataSettings(this);
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
+          to_bitField0_ |= 0x00000001;
+        }
+        result.aPN_ = aPN_;
+        result.bitField0_ = to_bitField0_;
+        onBuilt();
+        return result;
+      }
+
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof com.openxc.BinaryMessages.NetworkDataSettings) {
+          return mergeFrom((com.openxc.BinaryMessages.NetworkDataSettings)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(com.openxc.BinaryMessages.NetworkDataSettings other) {
+        if (other == com.openxc.BinaryMessages.NetworkDataSettings.getDefaultInstance()) return this;
+        if (other.hasAPN()) {
+          bitField0_ |= 0x00000001;
+          aPN_ = other.aPN_;
+          onChanged();
+        }
+        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.NetworkDataSettings parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.openxc.BinaryMessages.NetworkDataSettings) e.getUnfinishedMessage();
+          throw e;
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+      private int bitField0_;
+
+      // optional string APN = 1;
+      private java.lang.Object aPN_ = "";
+      /**
+       * <code>optional string APN = 1;</code>
+       */
+      public boolean hasAPN() {
+        return ((bitField0_ & 0x00000001) == 0x00000001);
+      }
+      /**
+       * <code>optional string APN = 1;</code>
+       */
+      public java.lang.String getAPN() {
+        java.lang.Object ref = aPN_;
+        if (!(ref instanceof java.lang.String)) {
+          java.lang.String s = ((com.google.protobuf.ByteString) ref)
+              .toStringUtf8();
+          aPN_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>optional string APN = 1;</code>
+       */
+      public com.google.protobuf.ByteString
+          getAPNBytes() {
+        java.lang.Object ref = aPN_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          aPN_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>optional string APN = 1;</code>
+       */
+      public Builder setAPN(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000001;
+        aPN_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional string APN = 1;</code>
+       */
+      public Builder clearAPN() {
+        bitField0_ = (bitField0_ & ~0x00000001);
+        aPN_ = getDefaultInstance().getAPN();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional string APN = 1;</code>
+       */
+      public Builder setAPNBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000001;
+        aPN_ = value;
+        onChanged();
+        return this;
+      }
+
+      // @@protoc_insertion_point(builder_scope:openxc.NetworkDataSettings)
+    }
+
+    static {
+      defaultInstance = new NetworkDataSettings(true);
+      defaultInstance.initFields();
+    }
+
+    // @@protoc_insertion_point(class_scope:openxc.NetworkDataSettings)
+  }
+
+  public interface ServerConnectSettingsOrBuilder
+      extends com.google.protobuf.MessageOrBuilder {
+
+    // optional string host = 1;
+    /**
+     * <code>optional string host = 1;</code>
+     */
+    boolean hasHost();
+    /**
+     * <code>optional string host = 1;</code>
+     */
+    java.lang.String getHost();
+    /**
+     * <code>optional string host = 1;</code>
+     */
+    com.google.protobuf.ByteString
+        getHostBytes();
+
+    // optional uint32 port = 2;
+    /**
+     * <code>optional uint32 port = 2;</code>
+     */
+    boolean hasPort();
+    /**
+     * <code>optional uint32 port = 2;</code>
+     */
+    int getPort();
+  }
+  /**
+   * Protobuf type {@code openxc.ServerConnectSettings}
+   */
+  public static final class ServerConnectSettings extends
+      com.google.protobuf.GeneratedMessage
+      implements ServerConnectSettingsOrBuilder {
+    // Use ServerConnectSettings.newBuilder() to construct.
+    private ServerConnectSettings(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+      super(builder);
+      this.unknownFields = builder.getUnknownFields();
+    }
+    private ServerConnectSettings(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+
+    private static final ServerConnectSettings defaultInstance;
+    public static ServerConnectSettings getDefaultInstance() {
+      return defaultInstance;
+    }
+
+    public ServerConnectSettings getDefaultInstanceForType() {
+      return defaultInstance;
+    }
+
+    private final com.google.protobuf.UnknownFieldSet unknownFields;
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+        getUnknownFields() {
+      return this.unknownFields;
+    }
+    private ServerConnectSettings(
+        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 10: {
+              bitField0_ |= 0x00000001;
+              host_ = input.readBytes();
+              break;
+            }
+            case 16: {
+              bitField0_ |= 0x00000002;
+              port_ = input.readUInt32();
+              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_ServerConnectSettings_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.openxc.BinaryMessages.internal_static_openxc_ServerConnectSettings_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.openxc.BinaryMessages.ServerConnectSettings.class, com.openxc.BinaryMessages.ServerConnectSettings.Builder.class);
+    }
+
+    public static com.google.protobuf.Parser<ServerConnectSettings> PARSER =
+        new com.google.protobuf.AbstractParser<ServerConnectSettings>() {
+      public ServerConnectSettings parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new ServerConnectSettings(input, extensionRegistry);
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<ServerConnectSettings> getParserForType() {
+      return PARSER;
+    }
+
+    private int bitField0_;
+    // optional string host = 1;
+    public static final int HOST_FIELD_NUMBER = 1;
+    private java.lang.Object host_;
+    /**
+     * <code>optional string host = 1;</code>
+     */
+    public boolean hasHost() {
+      return ((bitField0_ & 0x00000001) == 0x00000001);
+    }
+    /**
+     * <code>optional string host = 1;</code>
+     */
+    public java.lang.String getHost() {
+      java.lang.Object ref = host_;
+      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()) {
+          host_ = s;
+        }
+        return s;
+      }
+    }
+    /**
+     * <code>optional string host = 1;</code>
+     */
+    public com.google.protobuf.ByteString
+        getHostBytes() {
+      java.lang.Object ref = host_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        host_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    // optional uint32 port = 2;
+    public static final int PORT_FIELD_NUMBER = 2;
+    private int port_;
+    /**
+     * <code>optional uint32 port = 2;</code>
+     */
+    public boolean hasPort() {
+      return ((bitField0_ & 0x00000002) == 0x00000002);
+    }
+    /**
+     * <code>optional uint32 port = 2;</code>
+     */
+    public int getPort() {
+      return port_;
+    }
+
+    private void initFields() {
+      host_ = "";
+      port_ = 0;
+    }
+    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.writeBytes(1, getHostBytes());
+      }
+      if (((bitField0_ & 0x00000002) == 0x00000002)) {
+        output.writeUInt32(2, port_);
+      }
+      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
+          .computeBytesSize(1, getHostBytes());
+      }
+      if (((bitField0_ & 0x00000002) == 0x00000002)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(2, port_);
+      }
+      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.ServerConnectSettings parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static com.openxc.BinaryMessages.ServerConnectSettings 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.ServerConnectSettings parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static com.openxc.BinaryMessages.ServerConnectSettings parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static com.openxc.BinaryMessages.ServerConnectSettings parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input);
+    }
+    public static com.openxc.BinaryMessages.ServerConnectSettings parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input, extensionRegistry);
+    }
+    public static com.openxc.BinaryMessages.ServerConnectSettings parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return PARSER.parseDelimitedFrom(input);
+    }
+    public static com.openxc.BinaryMessages.ServerConnectSettings parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+    }
+    public static com.openxc.BinaryMessages.ServerConnectSettings parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input);
+    }
+    public static com.openxc.BinaryMessages.ServerConnectSettings 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.ServerConnectSettings 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.ServerConnectSettings}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessage.Builder<Builder>
+       implements com.openxc.BinaryMessages.ServerConnectSettingsOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return com.openxc.BinaryMessages.internal_static_openxc_ServerConnectSettings_descriptor;
+      }
+
+      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return com.openxc.BinaryMessages.internal_static_openxc_ServerConnectSettings_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                com.openxc.BinaryMessages.ServerConnectSettings.class, com.openxc.BinaryMessages.ServerConnectSettings.Builder.class);
+      }
+
+      // Construct using com.openxc.BinaryMessages.ServerConnectSettings.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();
+        host_ = "";
+        bitField0_ = (bitField0_ & ~0x00000001);
+        port_ = 0;
+        bitField0_ = (bitField0_ & ~0x00000002);
+        return this;
+      }
+
+      public Builder clone() {
+        return create().mergeFrom(buildPartial());
+      }
+
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return com.openxc.BinaryMessages.internal_static_openxc_ServerConnectSettings_descriptor;
+      }
+
+      public com.openxc.BinaryMessages.ServerConnectSettings getDefaultInstanceForType() {
+        return com.openxc.BinaryMessages.ServerConnectSettings.getDefaultInstance();
+      }
+
+      public com.openxc.BinaryMessages.ServerConnectSettings build() {
+        com.openxc.BinaryMessages.ServerConnectSettings result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      public com.openxc.BinaryMessages.ServerConnectSettings buildPartial() {
+        com.openxc.BinaryMessages.ServerConnectSettings result = new com.openxc.BinaryMessages.ServerConnectSettings(this);
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
+          to_bitField0_ |= 0x00000001;
+        }
+        result.host_ = host_;
+        if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
+          to_bitField0_ |= 0x00000002;
+        }
+        result.port_ = port_;
+        result.bitField0_ = to_bitField0_;
+        onBuilt();
+        return result;
+      }
+
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof com.openxc.BinaryMessages.ServerConnectSettings) {
+          return mergeFrom((com.openxc.BinaryMessages.ServerConnectSettings)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(com.openxc.BinaryMessages.ServerConnectSettings other) {
+        if (other == com.openxc.BinaryMessages.ServerConnectSettings.getDefaultInstance()) return this;
+        if (other.hasHost()) {
+          bitField0_ |= 0x00000001;
+          host_ = other.host_;
+          onChanged();
+        }
+        if (other.hasPort()) {
+          setPort(other.getPort());
+        }
+        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.ServerConnectSettings parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.openxc.BinaryMessages.ServerConnectSettings) e.getUnfinishedMessage();
+          throw e;
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+      private int bitField0_;
+
+      // optional string host = 1;
+      private java.lang.Object host_ = "";
+      /**
+       * <code>optional string host = 1;</code>
+       */
+      public boolean hasHost() {
+        return ((bitField0_ & 0x00000001) == 0x00000001);
+      }
+      /**
+       * <code>optional string host = 1;</code>
+       */
+      public java.lang.String getHost() {
+        java.lang.Object ref = host_;
+        if (!(ref instanceof java.lang.String)) {
+          java.lang.String s = ((com.google.protobuf.ByteString) ref)
+              .toStringUtf8();
+          host_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>optional string host = 1;</code>
+       */
+      public com.google.protobuf.ByteString
+          getHostBytes() {
+        java.lang.Object ref = host_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          host_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>optional string host = 1;</code>
+       */
+      public Builder setHost(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000001;
+        host_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional string host = 1;</code>
+       */
+      public Builder clearHost() {
+        bitField0_ = (bitField0_ & ~0x00000001);
+        host_ = getDefaultInstance().getHost();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional string host = 1;</code>
+       */
+      public Builder setHostBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000001;
+        host_ = value;
+        onChanged();
+        return this;
+      }
+
+      // optional uint32 port = 2;
+      private int port_ ;
+      /**
+       * <code>optional uint32 port = 2;</code>
+       */
+      public boolean hasPort() {
+        return ((bitField0_ & 0x00000002) == 0x00000002);
+      }
+      /**
+       * <code>optional uint32 port = 2;</code>
+       */
+      public int getPort() {
+        return port_;
+      }
+      /**
+       * <code>optional uint32 port = 2;</code>
+       */
+      public Builder setPort(int value) {
+        bitField0_ |= 0x00000002;
+        port_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional uint32 port = 2;</code>
+       */
+      public Builder clearPort() {
+        bitField0_ = (bitField0_ & ~0x00000002);
+        port_ = 0;
+        onChanged();
+        return this;
+      }
+
+      // @@protoc_insertion_point(builder_scope:openxc.ServerConnectSettings)
+    }
+
+    static {
+      defaultInstance = new ServerConnectSettings(true);
+      defaultInstance.initFields();
+    }
+
+    // @@protoc_insertion_point(class_scope:openxc.ServerConnectSettings)
+  }
+
+  public interface ModemConfigurationCommandOrBuilder
+      extends com.google.protobuf.MessageOrBuilder {
+
+    // optional .openxc.NetworkOperatorSettings networkOperatorSettings = 1;
+    /**
+     * <code>optional .openxc.NetworkOperatorSettings networkOperatorSettings = 1;</code>
+     */
+    boolean hasNetworkOperatorSettings();
+    /**
+     * <code>optional .openxc.NetworkOperatorSettings networkOperatorSettings = 1;</code>
+     */
+    com.openxc.BinaryMessages.NetworkOperatorSettings getNetworkOperatorSettings();
+    /**
+     * <code>optional .openxc.NetworkOperatorSettings networkOperatorSettings = 1;</code>
+     */
+    com.openxc.BinaryMessages.NetworkOperatorSettingsOrBuilder getNetworkOperatorSettingsOrBuilder();
+
+    // optional .openxc.NetworkDataSettings networkDataSettings = 2;
+    /**
+     * <code>optional .openxc.NetworkDataSettings networkDataSettings = 2;</code>
+     */
+    boolean hasNetworkDataSettings();
+    /**
+     * <code>optional .openxc.NetworkDataSettings networkDataSettings = 2;</code>
+     */
+    com.openxc.BinaryMessages.NetworkDataSettings getNetworkDataSettings();
+    /**
+     * <code>optional .openxc.NetworkDataSettings networkDataSettings = 2;</code>
+     */
+    com.openxc.BinaryMessages.NetworkDataSettingsOrBuilder getNetworkDataSettingsOrBuilder();
+
+    // optional .openxc.ServerConnectSettings serverConnectSettings = 3;
+    /**
+     * <code>optional .openxc.ServerConnectSettings serverConnectSettings = 3;</code>
+     */
+    boolean hasServerConnectSettings();
+    /**
+     * <code>optional .openxc.ServerConnectSettings serverConnectSettings = 3;</code>
+     */
+    com.openxc.BinaryMessages.ServerConnectSettings getServerConnectSettings();
+    /**
+     * <code>optional .openxc.ServerConnectSettings serverConnectSettings = 3;</code>
+     */
+    com.openxc.BinaryMessages.ServerConnectSettingsOrBuilder getServerConnectSettingsOrBuilder();
+  }
+  /**
+   * Protobuf type {@code openxc.ModemConfigurationCommand}
+   */
+  public static final class ModemConfigurationCommand extends
+      com.google.protobuf.GeneratedMessage
+      implements ModemConfigurationCommandOrBuilder {
+    // Use ModemConfigurationCommand.newBuilder() to construct.
+    private ModemConfigurationCommand(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+      super(builder);
+      this.unknownFields = builder.getUnknownFields();
+    }
+    private ModemConfigurationCommand(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+
+    private static final ModemConfigurationCommand defaultInstance;
+    public static ModemConfigurationCommand getDefaultInstance() {
+      return defaultInstance;
+    }
+
+    public ModemConfigurationCommand getDefaultInstanceForType() {
+      return defaultInstance;
+    }
+
+    private final com.google.protobuf.UnknownFieldSet unknownFields;
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+        getUnknownFields() {
+      return this.unknownFields;
+    }
+    private ModemConfigurationCommand(
+        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 10: {
+              com.openxc.BinaryMessages.NetworkOperatorSettings.Builder subBuilder = null;
+              if (((bitField0_ & 0x00000001) == 0x00000001)) {
+                subBuilder = networkOperatorSettings_.toBuilder();
+              }
+              networkOperatorSettings_ = input.readMessage(com.openxc.BinaryMessages.NetworkOperatorSettings.PARSER, extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(networkOperatorSettings_);
+                networkOperatorSettings_ = subBuilder.buildPartial();
+              }
+              bitField0_ |= 0x00000001;
+              break;
+            }
+            case 18: {
+              com.openxc.BinaryMessages.NetworkDataSettings.Builder subBuilder = null;
+              if (((bitField0_ & 0x00000002) == 0x00000002)) {
+                subBuilder = networkDataSettings_.toBuilder();
+              }
+              networkDataSettings_ = input.readMessage(com.openxc.BinaryMessages.NetworkDataSettings.PARSER, extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(networkDataSettings_);
+                networkDataSettings_ = subBuilder.buildPartial();
+              }
+              bitField0_ |= 0x00000002;
+              break;
+            }
+            case 26: {
+              com.openxc.BinaryMessages.ServerConnectSettings.Builder subBuilder = null;
+              if (((bitField0_ & 0x00000004) == 0x00000004)) {
+                subBuilder = serverConnectSettings_.toBuilder();
+              }
+              serverConnectSettings_ = input.readMessage(com.openxc.BinaryMessages.ServerConnectSettings.PARSER, extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(serverConnectSettings_);
+                serverConnectSettings_ = subBuilder.buildPartial();
+              }
+              bitField0_ |= 0x00000004;
+              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_ModemConfigurationCommand_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.openxc.BinaryMessages.internal_static_openxc_ModemConfigurationCommand_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.openxc.BinaryMessages.ModemConfigurationCommand.class, com.openxc.BinaryMessages.ModemConfigurationCommand.Builder.class);
+    }
+
+    public static com.google.protobuf.Parser<ModemConfigurationCommand> PARSER =
+        new com.google.protobuf.AbstractParser<ModemConfigurationCommand>() {
+      public ModemConfigurationCommand parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new ModemConfigurationCommand(input, extensionRegistry);
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<ModemConfigurationCommand> getParserForType() {
+      return PARSER;
+    }
+
+    private int bitField0_;
+    // optional .openxc.NetworkOperatorSettings networkOperatorSettings = 1;
+    public static final int NETWORKOPERATORSETTINGS_FIELD_NUMBER = 1;
+    private com.openxc.BinaryMessages.NetworkOperatorSettings networkOperatorSettings_;
+    /**
+     * <code>optional .openxc.NetworkOperatorSettings networkOperatorSettings = 1;</code>
+     */
+    public boolean hasNetworkOperatorSettings() {
+      return ((bitField0_ & 0x00000001) == 0x00000001);
+    }
+    /**
+     * <code>optional .openxc.NetworkOperatorSettings networkOperatorSettings = 1;</code>
+     */
+    public com.openxc.BinaryMessages.NetworkOperatorSettings getNetworkOperatorSettings() {
+      return networkOperatorSettings_;
+    }
+    /**
+     * <code>optional .openxc.NetworkOperatorSettings networkOperatorSettings = 1;</code>
+     */
+    public com.openxc.BinaryMessages.NetworkOperatorSettingsOrBuilder getNetworkOperatorSettingsOrBuilder() {
+      return networkOperatorSettings_;
+    }
+
+    // optional .openxc.NetworkDataSettings networkDataSettings = 2;
+    public static final int NETWORKDATASETTINGS_FIELD_NUMBER = 2;
+    private com.openxc.BinaryMessages.NetworkDataSettings networkDataSettings_;
+    /**
+     * <code>optional .openxc.NetworkDataSettings networkDataSettings = 2;</code>
+     */
+    public boolean hasNetworkDataSettings() {
+      return ((bitField0_ & 0x00000002) == 0x00000002);
+    }
+    /**
+     * <code>optional .openxc.NetworkDataSettings networkDataSettings = 2;</code>
+     */
+    public com.openxc.BinaryMessages.NetworkDataSettings getNetworkDataSettings() {
+      return networkDataSettings_;
+    }
+    /**
+     * <code>optional .openxc.NetworkDataSettings networkDataSettings = 2;</code>
+     */
+    public com.openxc.BinaryMessages.NetworkDataSettingsOrBuilder getNetworkDataSettingsOrBuilder() {
+      return networkDataSettings_;
+    }
+
+    // optional .openxc.ServerConnectSettings serverConnectSettings = 3;
+    public static final int SERVERCONNECTSETTINGS_FIELD_NUMBER = 3;
+    private com.openxc.BinaryMessages.ServerConnectSettings serverConnectSettings_;
+    /**
+     * <code>optional .openxc.ServerConnectSettings serverConnectSettings = 3;</code>
+     */
+    public boolean hasServerConnectSettings() {
+      return ((bitField0_ & 0x00000004) == 0x00000004);
+    }
+    /**
+     * <code>optional .openxc.ServerConnectSettings serverConnectSettings = 3;</code>
+     */
+    public com.openxc.BinaryMessages.ServerConnectSettings getServerConnectSettings() {
+      return serverConnectSettings_;
+    }
+    /**
+     * <code>optional .openxc.ServerConnectSettings serverConnectSettings = 3;</code>
+     */
+    public com.openxc.BinaryMessages.ServerConnectSettingsOrBuilder getServerConnectSettingsOrBuilder() {
+      return serverConnectSettings_;
+    }
+
+    private void initFields() {
+      networkOperatorSettings_ = com.openxc.BinaryMessages.NetworkOperatorSettings.getDefaultInstance();
+      networkDataSettings_ = com.openxc.BinaryMessages.NetworkDataSettings.getDefaultInstance();
+      serverConnectSettings_ = com.openxc.BinaryMessages.ServerConnectSettings.getDefaultInstance();
+    }
+    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.writeMessage(1, networkOperatorSettings_);
+      }
+      if (((bitField0_ & 0x00000002) == 0x00000002)) {
+        output.writeMessage(2, networkDataSettings_);
+      }
+      if (((bitField0_ & 0x00000004) == 0x00000004)) {
+        output.writeMessage(3, serverConnectSettings_);
+      }
+      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
+          .computeMessageSize(1, networkOperatorSettings_);
+      }
+      if (((bitField0_ & 0x00000002) == 0x00000002)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(2, networkDataSettings_);
+      }
+      if (((bitField0_ & 0x00000004) == 0x00000004)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(3, serverConnectSettings_);
+      }
+      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.ModemConfigurationCommand parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static com.openxc.BinaryMessages.ModemConfigurationCommand 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.ModemConfigurationCommand parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static com.openxc.BinaryMessages.ModemConfigurationCommand parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static com.openxc.BinaryMessages.ModemConfigurationCommand parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input);
+    }
+    public static com.openxc.BinaryMessages.ModemConfigurationCommand parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input, extensionRegistry);
+    }
+    public static com.openxc.BinaryMessages.ModemConfigurationCommand parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return PARSER.parseDelimitedFrom(input);
+    }
+    public static com.openxc.BinaryMessages.ModemConfigurationCommand parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+    }
+    public static com.openxc.BinaryMessages.ModemConfigurationCommand parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input);
+    }
+    public static com.openxc.BinaryMessages.ModemConfigurationCommand 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.ModemConfigurationCommand 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.ModemConfigurationCommand}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessage.Builder<Builder>
+       implements com.openxc.BinaryMessages.ModemConfigurationCommandOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return com.openxc.BinaryMessages.internal_static_openxc_ModemConfigurationCommand_descriptor;
+      }
+
+      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return com.openxc.BinaryMessages.internal_static_openxc_ModemConfigurationCommand_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                com.openxc.BinaryMessages.ModemConfigurationCommand.class, com.openxc.BinaryMessages.ModemConfigurationCommand.Builder.class);
+      }
+
+      // Construct using com.openxc.BinaryMessages.ModemConfigurationCommand.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+          getNetworkOperatorSettingsFieldBuilder();
+          getNetworkDataSettingsFieldBuilder();
+          getServerConnectSettingsFieldBuilder();
+        }
+      }
+      private static Builder create() {
+        return new Builder();
+      }
+
+      public Builder clear() {
+        super.clear();
+        if (networkOperatorSettingsBuilder_ == null) {
+          networkOperatorSettings_ = com.openxc.BinaryMessages.NetworkOperatorSettings.getDefaultInstance();
+        } else {
+          networkOperatorSettingsBuilder_.clear();
+        }
+        bitField0_ = (bitField0_ & ~0x00000001);
+        if (networkDataSettingsBuilder_ == null) {
+          networkDataSettings_ = com.openxc.BinaryMessages.NetworkDataSettings.getDefaultInstance();
+        } else {
+          networkDataSettingsBuilder_.clear();
+        }
+        bitField0_ = (bitField0_ & ~0x00000002);
+        if (serverConnectSettingsBuilder_ == null) {
+          serverConnectSettings_ = com.openxc.BinaryMessages.ServerConnectSettings.getDefaultInstance();
+        } else {
+          serverConnectSettingsBuilder_.clear();
+        }
+        bitField0_ = (bitField0_ & ~0x00000004);
+        return this;
+      }
+
+      public Builder clone() {
+        return create().mergeFrom(buildPartial());
+      }
+
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return com.openxc.BinaryMessages.internal_static_openxc_ModemConfigurationCommand_descriptor;
+      }
+
+      public com.openxc.BinaryMessages.ModemConfigurationCommand getDefaultInstanceForType() {
+        return com.openxc.BinaryMessages.ModemConfigurationCommand.getDefaultInstance();
+      }
+
+      public com.openxc.BinaryMessages.ModemConfigurationCommand build() {
+        com.openxc.BinaryMessages.ModemConfigurationCommand result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      public com.openxc.BinaryMessages.ModemConfigurationCommand buildPartial() {
+        com.openxc.BinaryMessages.ModemConfigurationCommand result = new com.openxc.BinaryMessages.ModemConfigurationCommand(this);
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
+          to_bitField0_ |= 0x00000001;
+        }
+        if (networkOperatorSettingsBuilder_ == null) {
+          result.networkOperatorSettings_ = networkOperatorSettings_;
+        } else {
+          result.networkOperatorSettings_ = networkOperatorSettingsBuilder_.build();
+        }
+        if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
+          to_bitField0_ |= 0x00000002;
+        }
+        if (networkDataSettingsBuilder_ == null) {
+          result.networkDataSettings_ = networkDataSettings_;
+        } else {
+          result.networkDataSettings_ = networkDataSettingsBuilder_.build();
+        }
+        if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
+          to_bitField0_ |= 0x00000004;
+        }
+        if (serverConnectSettingsBuilder_ == null) {
+          result.serverConnectSettings_ = serverConnectSettings_;
+        } else {
+          result.serverConnectSettings_ = serverConnectSettingsBuilder_.build();
+        }
+        result.bitField0_ = to_bitField0_;
+        onBuilt();
+        return result;
+      }
+
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof com.openxc.BinaryMessages.ModemConfigurationCommand) {
+          return mergeFrom((com.openxc.BinaryMessages.ModemConfigurationCommand)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(com.openxc.BinaryMessages.ModemConfigurationCommand other) {
+        if (other == com.openxc.BinaryMessages.ModemConfigurationCommand.getDefaultInstance()) return this;
+        if (other.hasNetworkOperatorSettings()) {
+          mergeNetworkOperatorSettings(other.getNetworkOperatorSettings());
+        }
+        if (other.hasNetworkDataSettings()) {
+          mergeNetworkDataSettings(other.getNetworkDataSettings());
+        }
+        if (other.hasServerConnectSettings()) {
+          mergeServerConnectSettings(other.getServerConnectSettings());
+        }
+        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.ModemConfigurationCommand parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.openxc.BinaryMessages.ModemConfigurationCommand) e.getUnfinishedMessage();
+          throw e;
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+      private int bitField0_;
+
+      // optional .openxc.NetworkOperatorSettings networkOperatorSettings = 1;
+      private com.openxc.BinaryMessages.NetworkOperatorSettings networkOperatorSettings_ = com.openxc.BinaryMessages.NetworkOperatorSettings.getDefaultInstance();
+      private com.google.protobuf.SingleFieldBuilder<
+          com.openxc.BinaryMessages.NetworkOperatorSettings, com.openxc.BinaryMessages.NetworkOperatorSettings.Builder, com.openxc.BinaryMessages.NetworkOperatorSettingsOrBuilder> networkOperatorSettingsBuilder_;
+      /**
+       * <code>optional .openxc.NetworkOperatorSettings networkOperatorSettings = 1;</code>
+       */
+      public boolean hasNetworkOperatorSettings() {
+        return ((bitField0_ & 0x00000001) == 0x00000001);
+      }
+      /**
+       * <code>optional .openxc.NetworkOperatorSettings networkOperatorSettings = 1;</code>
+       */
+      public com.openxc.BinaryMessages.NetworkOperatorSettings getNetworkOperatorSettings() {
+        if (networkOperatorSettingsBuilder_ == null) {
+          return networkOperatorSettings_;
+        } else {
+          return networkOperatorSettingsBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>optional .openxc.NetworkOperatorSettings networkOperatorSettings = 1;</code>
+       */
+      public Builder setNetworkOperatorSettings(com.openxc.BinaryMessages.NetworkOperatorSettings value) {
+        if (networkOperatorSettingsBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          networkOperatorSettings_ = value;
+          onChanged();
+        } else {
+          networkOperatorSettingsBuilder_.setMessage(value);
+        }
+        bitField0_ |= 0x00000001;
+        return this;
+      }
+      /**
+       * <code>optional .openxc.NetworkOperatorSettings networkOperatorSettings = 1;</code>
+       */
+      public Builder setNetworkOperatorSettings(
+          com.openxc.BinaryMessages.NetworkOperatorSettings.Builder builderForValue) {
+        if (networkOperatorSettingsBuilder_ == null) {
+          networkOperatorSettings_ = builderForValue.build();
+          onChanged();
+        } else {
+          networkOperatorSettingsBuilder_.setMessage(builderForValue.build());
+        }
+        bitField0_ |= 0x00000001;
+        return this;
+      }
+      /**
+       * <code>optional .openxc.NetworkOperatorSettings networkOperatorSettings = 1;</code>
+       */
+      public Builder mergeNetworkOperatorSettings(com.openxc.BinaryMessages.NetworkOperatorSettings value) {
+        if (networkOperatorSettingsBuilder_ == null) {
+          if (((bitField0_ & 0x00000001) == 0x00000001) &&
+              networkOperatorSettings_ != com.openxc.BinaryMessages.NetworkOperatorSettings.getDefaultInstance()) {
+            networkOperatorSettings_ =
+              com.openxc.BinaryMessages.NetworkOperatorSettings.newBuilder(networkOperatorSettings_).mergeFrom(value).buildPartial();
+          } else {
+            networkOperatorSettings_ = value;
+          }
+          onChanged();
+        } else {
+          networkOperatorSettingsBuilder_.mergeFrom(value);
+        }
+        bitField0_ |= 0x00000001;
+        return this;
+      }
+      /**
+       * <code>optional .openxc.NetworkOperatorSettings networkOperatorSettings = 1;</code>
+       */
+      public Builder clearNetworkOperatorSettings() {
+        if (networkOperatorSettingsBuilder_ == null) {
+          networkOperatorSettings_ = com.openxc.BinaryMessages.NetworkOperatorSettings.getDefaultInstance();
+          onChanged();
+        } else {
+          networkOperatorSettingsBuilder_.clear();
+        }
+        bitField0_ = (bitField0_ & ~0x00000001);
+        return this;
+      }
+      /**
+       * <code>optional .openxc.NetworkOperatorSettings networkOperatorSettings = 1;</code>
+       */
+      public com.openxc.BinaryMessages.NetworkOperatorSettings.Builder getNetworkOperatorSettingsBuilder() {
+        bitField0_ |= 0x00000001;
+        onChanged();
+        return getNetworkOperatorSettingsFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>optional .openxc.NetworkOperatorSettings networkOperatorSettings = 1;</code>
+       */
+      public com.openxc.BinaryMessages.NetworkOperatorSettingsOrBuilder getNetworkOperatorSettingsOrBuilder() {
+        if (networkOperatorSettingsBuilder_ != null) {
+          return networkOperatorSettingsBuilder_.getMessageOrBuilder();
+        } else {
+          return networkOperatorSettings_;
+        }
+      }
+      /**
+       * <code>optional .openxc.NetworkOperatorSettings networkOperatorSettings = 1;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilder<
+          com.openxc.BinaryMessages.NetworkOperatorSettings, com.openxc.BinaryMessages.NetworkOperatorSettings.Builder, com.openxc.BinaryMessages.NetworkOperatorSettingsOrBuilder> 
+          getNetworkOperatorSettingsFieldBuilder() {
+        if (networkOperatorSettingsBuilder_ == null) {
+          networkOperatorSettingsBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+              com.openxc.BinaryMessages.NetworkOperatorSettings, com.openxc.BinaryMessages.NetworkOperatorSettings.Builder, com.openxc.BinaryMessages.NetworkOperatorSettingsOrBuilder>(
+                  networkOperatorSettings_,
+                  getParentForChildren(),
+                  isClean());
+          networkOperatorSettings_ = null;
+        }
+        return networkOperatorSettingsBuilder_;
+      }
+
+      // optional .openxc.NetworkDataSettings networkDataSettings = 2;
+      private com.openxc.BinaryMessages.NetworkDataSettings networkDataSettings_ = com.openxc.BinaryMessages.NetworkDataSettings.getDefaultInstance();
+      private com.google.protobuf.SingleFieldBuilder<
+          com.openxc.BinaryMessages.NetworkDataSettings, com.openxc.BinaryMessages.NetworkDataSettings.Builder, com.openxc.BinaryMessages.NetworkDataSettingsOrBuilder> networkDataSettingsBuilder_;
+      /**
+       * <code>optional .openxc.NetworkDataSettings networkDataSettings = 2;</code>
+       */
+      public boolean hasNetworkDataSettings() {
+        return ((bitField0_ & 0x00000002) == 0x00000002);
+      }
+      /**
+       * <code>optional .openxc.NetworkDataSettings networkDataSettings = 2;</code>
+       */
+      public com.openxc.BinaryMessages.NetworkDataSettings getNetworkDataSettings() {
+        if (networkDataSettingsBuilder_ == null) {
+          return networkDataSettings_;
+        } else {
+          return networkDataSettingsBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>optional .openxc.NetworkDataSettings networkDataSettings = 2;</code>
+       */
+      public Builder setNetworkDataSettings(com.openxc.BinaryMessages.NetworkDataSettings value) {
+        if (networkDataSettingsBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          networkDataSettings_ = value;
+          onChanged();
+        } else {
+          networkDataSettingsBuilder_.setMessage(value);
+        }
+        bitField0_ |= 0x00000002;
+        return this;
+      }
+      /**
+       * <code>optional .openxc.NetworkDataSettings networkDataSettings = 2;</code>
+       */
+      public Builder setNetworkDataSettings(
+          com.openxc.BinaryMessages.NetworkDataSettings.Builder builderForValue) {
+        if (networkDataSettingsBuilder_ == null) {
+          networkDataSettings_ = builderForValue.build();
+          onChanged();
+        } else {
+          networkDataSettingsBuilder_.setMessage(builderForValue.build());
+        }
+        bitField0_ |= 0x00000002;
+        return this;
+      }
+      /**
+       * <code>optional .openxc.NetworkDataSettings networkDataSettings = 2;</code>
+       */
+      public Builder mergeNetworkDataSettings(com.openxc.BinaryMessages.NetworkDataSettings value) {
+        if (networkDataSettingsBuilder_ == null) {
+          if (((bitField0_ & 0x00000002) == 0x00000002) &&
+              networkDataSettings_ != com.openxc.BinaryMessages.NetworkDataSettings.getDefaultInstance()) {
+            networkDataSettings_ =
+              com.openxc.BinaryMessages.NetworkDataSettings.newBuilder(networkDataSettings_).mergeFrom(value).buildPartial();
+          } else {
+            networkDataSettings_ = value;
+          }
+          onChanged();
+        } else {
+          networkDataSettingsBuilder_.mergeFrom(value);
+        }
+        bitField0_ |= 0x00000002;
+        return this;
+      }
+      /**
+       * <code>optional .openxc.NetworkDataSettings networkDataSettings = 2;</code>
+       */
+      public Builder clearNetworkDataSettings() {
+        if (networkDataSettingsBuilder_ == null) {
+          networkDataSettings_ = com.openxc.BinaryMessages.NetworkDataSettings.getDefaultInstance();
+          onChanged();
+        } else {
+          networkDataSettingsBuilder_.clear();
+        }
+        bitField0_ = (bitField0_ & ~0x00000002);
+        return this;
+      }
+      /**
+       * <code>optional .openxc.NetworkDataSettings networkDataSettings = 2;</code>
+       */
+      public com.openxc.BinaryMessages.NetworkDataSettings.Builder getNetworkDataSettingsBuilder() {
+        bitField0_ |= 0x00000002;
+        onChanged();
+        return getNetworkDataSettingsFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>optional .openxc.NetworkDataSettings networkDataSettings = 2;</code>
+       */
+      public com.openxc.BinaryMessages.NetworkDataSettingsOrBuilder getNetworkDataSettingsOrBuilder() {
+        if (networkDataSettingsBuilder_ != null) {
+          return networkDataSettingsBuilder_.getMessageOrBuilder();
+        } else {
+          return networkDataSettings_;
+        }
+      }
+      /**
+       * <code>optional .openxc.NetworkDataSettings networkDataSettings = 2;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilder<
+          com.openxc.BinaryMessages.NetworkDataSettings, com.openxc.BinaryMessages.NetworkDataSettings.Builder, com.openxc.BinaryMessages.NetworkDataSettingsOrBuilder> 
+          getNetworkDataSettingsFieldBuilder() {
+        if (networkDataSettingsBuilder_ == null) {
+          networkDataSettingsBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+              com.openxc.BinaryMessages.NetworkDataSettings, com.openxc.BinaryMessages.NetworkDataSettings.Builder, com.openxc.BinaryMessages.NetworkDataSettingsOrBuilder>(
+                  networkDataSettings_,
+                  getParentForChildren(),
+                  isClean());
+          networkDataSettings_ = null;
+        }
+        return networkDataSettingsBuilder_;
+      }
+
+      // optional .openxc.ServerConnectSettings serverConnectSettings = 3;
+      private com.openxc.BinaryMessages.ServerConnectSettings serverConnectSettings_ = com.openxc.BinaryMessages.ServerConnectSettings.getDefaultInstance();
+      private com.google.protobuf.SingleFieldBuilder<
+          com.openxc.BinaryMessages.ServerConnectSettings, com.openxc.BinaryMessages.ServerConnectSettings.Builder, com.openxc.BinaryMessages.ServerConnectSettingsOrBuilder> serverConnectSettingsBuilder_;
+      /**
+       * <code>optional .openxc.ServerConnectSettings serverConnectSettings = 3;</code>
+       */
+      public boolean hasServerConnectSettings() {
+        return ((bitField0_ & 0x00000004) == 0x00000004);
+      }
+      /**
+       * <code>optional .openxc.ServerConnectSettings serverConnectSettings = 3;</code>
+       */
+      public com.openxc.BinaryMessages.ServerConnectSettings getServerConnectSettings() {
+        if (serverConnectSettingsBuilder_ == null) {
+          return serverConnectSettings_;
+        } else {
+          return serverConnectSettingsBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>optional .openxc.ServerConnectSettings serverConnectSettings = 3;</code>
+       */
+      public Builder setServerConnectSettings(com.openxc.BinaryMessages.ServerConnectSettings value) {
+        if (serverConnectSettingsBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          serverConnectSettings_ = value;
+          onChanged();
+        } else {
+          serverConnectSettingsBuilder_.setMessage(value);
+        }
+        bitField0_ |= 0x00000004;
+        return this;
+      }
+      /**
+       * <code>optional .openxc.ServerConnectSettings serverConnectSettings = 3;</code>
+       */
+      public Builder setServerConnectSettings(
+          com.openxc.BinaryMessages.ServerConnectSettings.Builder builderForValue) {
+        if (serverConnectSettingsBuilder_ == null) {
+          serverConnectSettings_ = builderForValue.build();
+          onChanged();
+        } else {
+          serverConnectSettingsBuilder_.setMessage(builderForValue.build());
+        }
+        bitField0_ |= 0x00000004;
+        return this;
+      }
+      /**
+       * <code>optional .openxc.ServerConnectSettings serverConnectSettings = 3;</code>
+       */
+      public Builder mergeServerConnectSettings(com.openxc.BinaryMessages.ServerConnectSettings value) {
+        if (serverConnectSettingsBuilder_ == null) {
+          if (((bitField0_ & 0x00000004) == 0x00000004) &&
+              serverConnectSettings_ != com.openxc.BinaryMessages.ServerConnectSettings.getDefaultInstance()) {
+            serverConnectSettings_ =
+              com.openxc.BinaryMessages.ServerConnectSettings.newBuilder(serverConnectSettings_).mergeFrom(value).buildPartial();
+          } else {
+            serverConnectSettings_ = value;
+          }
+          onChanged();
+        } else {
+          serverConnectSettingsBuilder_.mergeFrom(value);
+        }
+        bitField0_ |= 0x00000004;
+        return this;
+      }
+      /**
+       * <code>optional .openxc.ServerConnectSettings serverConnectSettings = 3;</code>
+       */
+      public Builder clearServerConnectSettings() {
+        if (serverConnectSettingsBuilder_ == null) {
+          serverConnectSettings_ = com.openxc.BinaryMessages.ServerConnectSettings.getDefaultInstance();
+          onChanged();
+        } else {
+          serverConnectSettingsBuilder_.clear();
+        }
+        bitField0_ = (bitField0_ & ~0x00000004);
+        return this;
+      }
+      /**
+       * <code>optional .openxc.ServerConnectSettings serverConnectSettings = 3;</code>
+       */
+      public com.openxc.BinaryMessages.ServerConnectSettings.Builder getServerConnectSettingsBuilder() {
+        bitField0_ |= 0x00000004;
+        onChanged();
+        return getServerConnectSettingsFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>optional .openxc.ServerConnectSettings serverConnectSettings = 3;</code>
+       */
+      public com.openxc.BinaryMessages.ServerConnectSettingsOrBuilder getServerConnectSettingsOrBuilder() {
+        if (serverConnectSettingsBuilder_ != null) {
+          return serverConnectSettingsBuilder_.getMessageOrBuilder();
+        } else {
+          return serverConnectSettings_;
+        }
+      }
+      /**
+       * <code>optional .openxc.ServerConnectSettings serverConnectSettings = 3;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilder<
+          com.openxc.BinaryMessages.ServerConnectSettings, com.openxc.BinaryMessages.ServerConnectSettings.Builder, com.openxc.BinaryMessages.ServerConnectSettingsOrBuilder> 
+          getServerConnectSettingsFieldBuilder() {
+        if (serverConnectSettingsBuilder_ == null) {
+          serverConnectSettingsBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+              com.openxc.BinaryMessages.ServerConnectSettings, com.openxc.BinaryMessages.ServerConnectSettings.Builder, com.openxc.BinaryMessages.ServerConnectSettingsOrBuilder>(
+                  serverConnectSettings_,
+                  getParentForChildren(),
+                  isClean());
+          serverConnectSettings_ = null;
+        }
+        return serverConnectSettingsBuilder_;
+      }
+
+      // @@protoc_insertion_point(builder_scope:openxc.ModemConfigurationCommand)
+    }
+
+    static {
+      defaultInstance = new ModemConfigurationCommand(true);
+      defaultInstance.initFields();
+    }
+
+    // @@protoc_insertion_point(class_scope:openxc.ModemConfigurationCommand)
+  }
+
+  public interface RTCConfigurationCommandOrBuilder
+      extends com.google.protobuf.MessageOrBuilder {
+
+    // optional uint32 unix_time = 1;
+    /**
+     * <code>optional uint32 unix_time = 1;</code>
+     */
+    boolean hasUnixTime();
+    /**
+     * <code>optional uint32 unix_time = 1;</code>
+     */
+    int getUnixTime();
+  }
+  /**
+   * Protobuf type {@code openxc.RTCConfigurationCommand}
+   */
+  public static final class RTCConfigurationCommand extends
+      com.google.protobuf.GeneratedMessage
+      implements RTCConfigurationCommandOrBuilder {
+    // Use RTCConfigurationCommand.newBuilder() to construct.
+    private RTCConfigurationCommand(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+      super(builder);
+      this.unknownFields = builder.getUnknownFields();
+    }
+    private RTCConfigurationCommand(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+
+    private static final RTCConfigurationCommand defaultInstance;
+    public static RTCConfigurationCommand getDefaultInstance() {
+      return defaultInstance;
+    }
+
+    public RTCConfigurationCommand getDefaultInstanceForType() {
+      return defaultInstance;
+    }
+
+    private final com.google.protobuf.UnknownFieldSet unknownFields;
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+        getUnknownFields() {
+      return this.unknownFields;
+    }
+    private RTCConfigurationCommand(
+        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: {
+              bitField0_ |= 0x00000001;
+              unixTime_ = input.readUInt32();
+              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_RTCConfigurationCommand_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.openxc.BinaryMessages.internal_static_openxc_RTCConfigurationCommand_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.openxc.BinaryMessages.RTCConfigurationCommand.class, com.openxc.BinaryMessages.RTCConfigurationCommand.Builder.class);
+    }
+
+    public static com.google.protobuf.Parser<RTCConfigurationCommand> PARSER =
+        new com.google.protobuf.AbstractParser<RTCConfigurationCommand>() {
+      public RTCConfigurationCommand parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new RTCConfigurationCommand(input, extensionRegistry);
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<RTCConfigurationCommand> getParserForType() {
+      return PARSER;
+    }
+
+    private int bitField0_;
+    // optional uint32 unix_time = 1;
+    public static final int UNIX_TIME_FIELD_NUMBER = 1;
+    private int unixTime_;
+    /**
+     * <code>optional uint32 unix_time = 1;</code>
+     */
+    public boolean hasUnixTime() {
+      return ((bitField0_ & 0x00000001) == 0x00000001);
+    }
+    /**
+     * <code>optional uint32 unix_time = 1;</code>
+     */
+    public int getUnixTime() {
+      return unixTime_;
+    }
+
+    private void initFields() {
+      unixTime_ = 0;
+    }
+    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.writeUInt32(1, unixTime_);
+      }
+      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
+          .computeUInt32Size(1, unixTime_);
+      }
+      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.RTCConfigurationCommand parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static com.openxc.BinaryMessages.RTCConfigurationCommand 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.RTCConfigurationCommand parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static com.openxc.BinaryMessages.RTCConfigurationCommand parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static com.openxc.BinaryMessages.RTCConfigurationCommand parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input);
+    }
+    public static com.openxc.BinaryMessages.RTCConfigurationCommand parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input, extensionRegistry);
+    }
+    public static com.openxc.BinaryMessages.RTCConfigurationCommand parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return PARSER.parseDelimitedFrom(input);
+    }
+    public static com.openxc.BinaryMessages.RTCConfigurationCommand parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+    }
+    public static com.openxc.BinaryMessages.RTCConfigurationCommand parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input);
+    }
+    public static com.openxc.BinaryMessages.RTCConfigurationCommand 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.RTCConfigurationCommand 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.RTCConfigurationCommand}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessage.Builder<Builder>
+       implements com.openxc.BinaryMessages.RTCConfigurationCommandOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return com.openxc.BinaryMessages.internal_static_openxc_RTCConfigurationCommand_descriptor;
+      }
+
+      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return com.openxc.BinaryMessages.internal_static_openxc_RTCConfigurationCommand_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                com.openxc.BinaryMessages.RTCConfigurationCommand.class, com.openxc.BinaryMessages.RTCConfigurationCommand.Builder.class);
+      }
+
+      // Construct using com.openxc.BinaryMessages.RTCConfigurationCommand.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();
+        unixTime_ = 0;
+        bitField0_ = (bitField0_ & ~0x00000001);
+        return this;
+      }
+
+      public Builder clone() {
+        return create().mergeFrom(buildPartial());
+      }
+
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return com.openxc.BinaryMessages.internal_static_openxc_RTCConfigurationCommand_descriptor;
+      }
+
+      public com.openxc.BinaryMessages.RTCConfigurationCommand getDefaultInstanceForType() {
+        return com.openxc.BinaryMessages.RTCConfigurationCommand.getDefaultInstance();
+      }
+
+      public com.openxc.BinaryMessages.RTCConfigurationCommand build() {
+        com.openxc.BinaryMessages.RTCConfigurationCommand result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      public com.openxc.BinaryMessages.RTCConfigurationCommand buildPartial() {
+        com.openxc.BinaryMessages.RTCConfigurationCommand result = new com.openxc.BinaryMessages.RTCConfigurationCommand(this);
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
+          to_bitField0_ |= 0x00000001;
+        }
+        result.unixTime_ = unixTime_;
+        result.bitField0_ = to_bitField0_;
+        onBuilt();
+        return result;
+      }
+
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof com.openxc.BinaryMessages.RTCConfigurationCommand) {
+          return mergeFrom((com.openxc.BinaryMessages.RTCConfigurationCommand)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(com.openxc.BinaryMessages.RTCConfigurationCommand other) {
+        if (other == com.openxc.BinaryMessages.RTCConfigurationCommand.getDefaultInstance()) return this;
+        if (other.hasUnixTime()) {
+          setUnixTime(other.getUnixTime());
+        }
+        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.RTCConfigurationCommand parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.openxc.BinaryMessages.RTCConfigurationCommand) e.getUnfinishedMessage();
+          throw e;
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+      private int bitField0_;
+
+      // optional uint32 unix_time = 1;
+      private int unixTime_ ;
+      /**
+       * <code>optional uint32 unix_time = 1;</code>
+       */
+      public boolean hasUnixTime() {
+        return ((bitField0_ & 0x00000001) == 0x00000001);
+      }
+      /**
+       * <code>optional uint32 unix_time = 1;</code>
+       */
+      public int getUnixTime() {
+        return unixTime_;
+      }
+      /**
+       * <code>optional uint32 unix_time = 1;</code>
+       */
+      public Builder setUnixTime(int value) {
+        bitField0_ |= 0x00000001;
+        unixTime_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional uint32 unix_time = 1;</code>
+       */
+      public Builder clearUnixTime() {
+        bitField0_ = (bitField0_ & ~0x00000001);
+        unixTime_ = 0;
+        onChanged();
+        return this;
+      }
+
+      // @@protoc_insertion_point(builder_scope:openxc.RTCConfigurationCommand)
+    }
+
+    static {
+      defaultInstance = new RTCConfigurationCommand(true);
+      defaultInstance.initFields();
+    }
+
+    // @@protoc_insertion_point(class_scope:openxc.RTCConfigurationCommand)
+  }
+
+  public interface CommandResponseOrBuilder
+      extends com.google.protobuf.MessageOrBuilder {
+
+    // optional .openxc.ControlCommand.Type type = 1;
+    /**
+     * <code>optional .openxc.ControlCommand.Type type = 1;</code>
+     */
+    boolean hasType();
+    /**
+     * <code>optional .openxc.ControlCommand.Type type = 1;</code>
+     */
+    com.openxc.BinaryMessages.ControlCommand.Type getType();
+
+    // optional string message = 2;
+    /**
+     * <code>optional string message = 2;</code>
+     */
+    boolean hasMessage();
+    /**
+     * <code>optional string message = 2;</code>
+     */
+    java.lang.String getMessage();
+    /**
+     * <code>optional string message = 2;</code>
+     */
+    com.google.protobuf.ByteString
+        getMessageBytes();
+
+    // optional bool status = 3;
+    /**
+     * <code>optional bool status = 3;</code>
+     */
+    boolean hasStatus();
+    /**
+     * <code>optional bool status = 3;</code>
+     */
+    boolean getStatus();
+  }
+  /**
+   * Protobuf type {@code openxc.CommandResponse}
+   */
+  public static final class CommandResponse extends
+      com.google.protobuf.GeneratedMessage
+      implements CommandResponseOrBuilder {
+    // Use CommandResponse.newBuilder() to construct.
+    private CommandResponse(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+      super(builder);
+      this.unknownFields = builder.getUnknownFields();
+    }
+    private CommandResponse(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+
+    private static final CommandResponse defaultInstance;
+    public static CommandResponse getDefaultInstance() {
+      return defaultInstance;
+    }
+
+    public CommandResponse getDefaultInstanceForType() {
+      return defaultInstance;
+    }
+
+    private final com.google.protobuf.UnknownFieldSet unknownFields;
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+        getUnknownFields() {
+      return this.unknownFields;
+    }
+    private CommandResponse(
+        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.ControlCommand.Type value = com.openxc.BinaryMessages.ControlCommand.Type.valueOf(rawValue);
+              if (value == null) {
+                unknownFields.mergeVarintField(1, rawValue);
+              } else {
+                bitField0_ |= 0x00000001;
+                type_ = value;
+              }
+              break;
+            }
+            case 18: {
+              bitField0_ |= 0x00000002;
+              message_ = input.readBytes();
+              break;
+            }
+            case 24: {
+              bitField0_ |= 0x00000004;
+              status_ = 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_CommandResponse_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.openxc.BinaryMessages.internal_static_openxc_CommandResponse_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.openxc.BinaryMessages.CommandResponse.class, com.openxc.BinaryMessages.CommandResponse.Builder.class);
+    }
+
+    public static com.google.protobuf.Parser<CommandResponse> PARSER =
+        new com.google.protobuf.AbstractParser<CommandResponse>() {
+      public CommandResponse parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new CommandResponse(input, extensionRegistry);
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<CommandResponse> getParserForType() {
+      return PARSER;
+    }
 
     private int bitField0_;
-    // optional int32 bus = 1;
-    public static final int BUS_FIELD_NUMBER = 1;
-    private int bus_;
+    // optional .openxc.ControlCommand.Type type = 1;
+    public static final int TYPE_FIELD_NUMBER = 1;
+    private com.openxc.BinaryMessages.ControlCommand.Type type_;
     /**
-     * <code>optional int32 bus = 1;</code>
+     * <code>optional .openxc.ControlCommand.Type type = 1;</code>
      */
-    public boolean hasBus() {
+    public boolean hasType() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * <code>optional int32 bus = 1;</code>
+     * <code>optional .openxc.ControlCommand.Type type = 1;</code>
      */
-    public int getBus() {
-      return bus_;
+    public com.openxc.BinaryMessages.ControlCommand.Type getType() {
+      return type_;
     }
 
-    // optional uint32 message_id = 2;
-    public static final int MESSAGE_ID_FIELD_NUMBER = 2;
-    private int messageId_;
+    // optional string message = 2;
+    public static final int MESSAGE_FIELD_NUMBER = 2;
+    private java.lang.Object message_;
     /**
-     * <code>optional uint32 message_id = 2;</code>
+     * <code>optional string message = 2;</code>
      */
-    public boolean hasMessageId() {
+    public boolean hasMessage() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * <code>optional uint32 message_id = 2;</code>
+     * <code>optional string message = 2;</code>
      */
-    public int getMessageId() {
-      return messageId_;
+    public java.lang.String getMessage() {
+      java.lang.Object ref = message_;
+      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()) {
+          message_ = s;
+        }
+        return s;
+      }
+    }
+    /**
+     * <code>optional string message = 2;</code>
+     */
+    public com.google.protobuf.ByteString
+        getMessageBytes() {
+      java.lang.Object ref = message_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        message_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
     }
 
-    // optional bytes data = 3;
-    public static final int DATA_FIELD_NUMBER = 3;
-    private com.google.protobuf.ByteString data_;
+    // optional bool status = 3;
+    public static final int STATUS_FIELD_NUMBER = 3;
+    private boolean status_;
     /**
-     * <code>optional bytes data = 3;</code>
+     * <code>optional bool status = 3;</code>
      */
-    public boolean hasData() {
+    public boolean hasStatus() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
     /**
-     * <code>optional bytes data = 3;</code>
+     * <code>optional bool status = 3;</code>
      */
-    public com.google.protobuf.ByteString getData() {
-      return data_;
+    public boolean getStatus() {
+      return status_;
     }
 
     private void initFields() {
-      bus_ = 0;
-      messageId_ = 0;
-      data_ = com.google.protobuf.ByteString.EMPTY;
+      type_ = com.openxc.BinaryMessages.ControlCommand.Type.VERSION;
+      message_ = "";
+      status_ = false;
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -1285,13 +10632,13 @@ public final class BinaryMessages {
                         throws java.io.IOException {
       getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        output.writeInt32(1, bus_);
+        output.writeEnum(1, type_.getNumber());
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        output.writeUInt32(2, messageId_);
+        output.writeBytes(2, getMessageBytes());
       }
       if (((bitField0_ & 0x00000004) == 0x00000004)) {
-        output.writeBytes(3, data_);
+        output.writeBool(3, status_);
       }
       getUnknownFields().writeTo(output);
     }
@@ -1304,15 +10651,15 @@ public final class BinaryMessages {
       size = 0;
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(1, bus_);
+          .computeEnumSize(1, type_.getNumber());
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, messageId_);
+          .computeBytesSize(2, getMessageBytes());
       }
       if (((bitField0_ & 0x00000004) == 0x00000004)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(3, data_);
+          .computeBoolSize(3, status_);
       }
       size += getUnknownFields().getSerializedSize();
       memoizedSerializedSize = size;
@@ -1326,53 +10673,53 @@ public final class BinaryMessages {
       return super.writeReplace();
     }
 
-    public static com.openxc.BinaryMessages.RawMessage parseFrom(
+    public static com.openxc.BinaryMessages.CommandResponse parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.openxc.BinaryMessages.RawMessage parseFrom(
+    public static com.openxc.BinaryMessages.CommandResponse 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.RawMessage parseFrom(byte[] data)
+    public static com.openxc.BinaryMessages.CommandResponse parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.openxc.BinaryMessages.RawMessage parseFrom(
+    public static com.openxc.BinaryMessages.CommandResponse parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.openxc.BinaryMessages.RawMessage parseFrom(java.io.InputStream input)
+    public static com.openxc.BinaryMessages.CommandResponse parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static com.openxc.BinaryMessages.RawMessage parseFrom(
+    public static com.openxc.BinaryMessages.CommandResponse parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static com.openxc.BinaryMessages.RawMessage parseDelimitedFrom(java.io.InputStream input)
+    public static com.openxc.BinaryMessages.CommandResponse parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static com.openxc.BinaryMessages.RawMessage parseDelimitedFrom(
+    public static com.openxc.BinaryMessages.CommandResponse parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static com.openxc.BinaryMessages.RawMessage parseFrom(
+    public static com.openxc.BinaryMessages.CommandResponse parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static com.openxc.BinaryMessages.RawMessage parseFrom(
+    public static com.openxc.BinaryMessages.CommandResponse parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -1381,7 +10728,7 @@ public final class BinaryMessages {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(com.openxc.BinaryMessages.RawMessage prototype) {
+    public static Builder newBuilder(com.openxc.BinaryMessages.CommandResponse prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -1393,24 +10740,24 @@ public final class BinaryMessages {
       return builder;
     }
     /**
-     * Protobuf type {@code openxc.RawMessage}
+     * Protobuf type {@code openxc.CommandResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements com.openxc.BinaryMessages.RawMessageOrBuilder {
+       implements com.openxc.BinaryMessages.CommandResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return com.openxc.BinaryMessages.internal_static_openxc_RawMessage_descriptor;
+        return com.openxc.BinaryMessages.internal_static_openxc_CommandResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.openxc.BinaryMessages.internal_static_openxc_RawMessage_fieldAccessorTable
+        return com.openxc.BinaryMessages.internal_static_openxc_CommandResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                com.openxc.BinaryMessages.RawMessage.class, com.openxc.BinaryMessages.RawMessage.Builder.class);
+                com.openxc.BinaryMessages.CommandResponse.class, com.openxc.BinaryMessages.CommandResponse.Builder.class);
       }
 
-      // Construct using com.openxc.BinaryMessages.RawMessage.newBuilder()
+      // Construct using com.openxc.BinaryMessages.CommandResponse.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -1430,11 +10777,11 @@ public final class BinaryMessages {
 
       public Builder clear() {
         super.clear();
-        bus_ = 0;
+        type_ = com.openxc.BinaryMessages.ControlCommand.Type.VERSION;
         bitField0_ = (bitField0_ & ~0x00000001);
-        messageId_ = 0;
+        message_ = "";
         bitField0_ = (bitField0_ & ~0x00000002);
-        data_ = com.google.protobuf.ByteString.EMPTY;
+        status_ = false;
         bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
@@ -1445,61 +10792,63 @@ public final class BinaryMessages {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return com.openxc.BinaryMessages.internal_static_openxc_RawMessage_descriptor;
+        return com.openxc.BinaryMessages.internal_static_openxc_CommandResponse_descriptor;
       }
 
-      public com.openxc.BinaryMessages.RawMessage getDefaultInstanceForType() {
-        return com.openxc.BinaryMessages.RawMessage.getDefaultInstance();
+      public com.openxc.BinaryMessages.CommandResponse getDefaultInstanceForType() {
+        return com.openxc.BinaryMessages.CommandResponse.getDefaultInstance();
       }
 
-      public com.openxc.BinaryMessages.RawMessage build() {
-        com.openxc.BinaryMessages.RawMessage result = buildPartial();
+      public com.openxc.BinaryMessages.CommandResponse build() {
+        com.openxc.BinaryMessages.CommandResponse result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public com.openxc.BinaryMessages.RawMessage buildPartial() {
-        com.openxc.BinaryMessages.RawMessage result = new com.openxc.BinaryMessages.RawMessage(this);
+      public com.openxc.BinaryMessages.CommandResponse buildPartial() {
+        com.openxc.BinaryMessages.CommandResponse result = new com.openxc.BinaryMessages.CommandResponse(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
           to_bitField0_ |= 0x00000001;
         }
-        result.bus_ = bus_;
+        result.type_ = type_;
         if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
           to_bitField0_ |= 0x00000002;
         }
-        result.messageId_ = messageId_;
+        result.message_ = message_;
         if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
           to_bitField0_ |= 0x00000004;
         }
-        result.data_ = data_;
+        result.status_ = status_;
         result.bitField0_ = to_bitField0_;
         onBuilt();
         return result;
       }
 
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.openxc.BinaryMessages.RawMessage) {
-          return mergeFrom((com.openxc.BinaryMessages.RawMessage)other);
+        if (other instanceof com.openxc.BinaryMessages.CommandResponse) {
+          return mergeFrom((com.openxc.BinaryMessages.CommandResponse)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(com.openxc.BinaryMessages.RawMessage other) {
-        if (other == com.openxc.BinaryMessages.RawMessage.getDefaultInstance()) return this;
-        if (other.hasBus()) {
-          setBus(other.getBus());
+      public Builder mergeFrom(com.openxc.BinaryMessages.CommandResponse other) {
+        if (other == com.openxc.BinaryMessages.CommandResponse.getDefaultInstance()) return this;
+        if (other.hasType()) {
+          setType(other.getType());
         }
-        if (other.hasMessageId()) {
-          setMessageId(other.getMessageId());
+        if (other.hasMessage()) {
+          bitField0_ |= 0x00000002;
+          message_ = other.message_;
+          onChanged();
         }
-        if (other.hasData()) {
-          setData(other.getData());
+        if (other.hasStatus()) {
+          setStatus(other.getStatus());
         }
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
@@ -1513,11 +10862,11 @@ public final class BinaryMessages {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        com.openxc.BinaryMessages.RawMessage parsedMessage = null;
+        com.openxc.BinaryMessages.CommandResponse parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (com.openxc.BinaryMessages.RawMessage) e.getUnfinishedMessage();
+          parsedMessage = (com.openxc.BinaryMessages.CommandResponse) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -1528,165 +10877,287 @@ public final class BinaryMessages {
       }
       private int bitField0_;
 
-      // optional int32 bus = 1;
-      private int bus_ ;
+      // optional .openxc.ControlCommand.Type type = 1;
+      private com.openxc.BinaryMessages.ControlCommand.Type type_ = com.openxc.BinaryMessages.ControlCommand.Type.VERSION;
       /**
-       * <code>optional int32 bus = 1;</code>
+       * <code>optional .openxc.ControlCommand.Type type = 1;</code>
        */
-      public boolean hasBus() {
+      public boolean hasType() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * <code>optional int32 bus = 1;</code>
+       * <code>optional .openxc.ControlCommand.Type type = 1;</code>
        */
-      public int getBus() {
-        return bus_;
+      public com.openxc.BinaryMessages.ControlCommand.Type getType() {
+        return type_;
       }
       /**
-       * <code>optional int32 bus = 1;</code>
+       * <code>optional .openxc.ControlCommand.Type type = 1;</code>
        */
-      public Builder setBus(int value) {
+      public Builder setType(com.openxc.BinaryMessages.ControlCommand.Type value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
         bitField0_ |= 0x00000001;
-        bus_ = value;
+        type_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>optional int32 bus = 1;</code>
+       * <code>optional .openxc.ControlCommand.Type type = 1;</code>
        */
-      public Builder clearBus() {
+      public Builder clearType() {
         bitField0_ = (bitField0_ & ~0x00000001);
-        bus_ = 0;
+        type_ = com.openxc.BinaryMessages.ControlCommand.Type.VERSION;
         onChanged();
         return this;
       }
 
-      // optional uint32 message_id = 2;
-      private int messageId_ ;
+      // optional string message = 2;
+      private java.lang.Object message_ = "";
       /**
-       * <code>optional uint32 message_id = 2;</code>
+       * <code>optional string message = 2;</code>
        */
-      public boolean hasMessageId() {
+      public boolean hasMessage() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * <code>optional uint32 message_id = 2;</code>
+       * <code>optional string message = 2;</code>
        */
-      public int getMessageId() {
-        return messageId_;
+      public java.lang.String getMessage() {
+        java.lang.Object ref = message_;
+        if (!(ref instanceof java.lang.String)) {
+          java.lang.String s = ((com.google.protobuf.ByteString) ref)
+              .toStringUtf8();
+          message_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
       }
       /**
-       * <code>optional uint32 message_id = 2;</code>
+       * <code>optional string message = 2;</code>
        */
-      public Builder setMessageId(int value) {
-        bitField0_ |= 0x00000002;
-        messageId_ = value;
+      public com.google.protobuf.ByteString
+          getMessageBytes() {
+        java.lang.Object ref = message_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          message_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>optional string message = 2;</code>
+       */
+      public Builder setMessage(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000002;
+        message_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>optional uint32 message_id = 2;</code>
+       * <code>optional string message = 2;</code>
        */
-      public Builder clearMessageId() {
+      public Builder clearMessage() {
         bitField0_ = (bitField0_ & ~0x00000002);
-        messageId_ = 0;
+        message_ = getDefaultInstance().getMessage();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional string message = 2;</code>
+       */
+      public Builder setMessageBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000002;
+        message_ = value;
         onChanged();
         return this;
       }
 
-      // optional bytes data = 3;
-      private com.google.protobuf.ByteString data_ = com.google.protobuf.ByteString.EMPTY;
+      // optional bool status = 3;
+      private boolean status_ ;
       /**
-       * <code>optional bytes data = 3;</code>
+       * <code>optional bool status = 3;</code>
        */
-      public boolean hasData() {
+      public boolean hasStatus() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * <code>optional bytes data = 3;</code>
+       * <code>optional bool status = 3;</code>
        */
-      public com.google.protobuf.ByteString getData() {
-        return data_;
+      public boolean getStatus() {
+        return status_;
       }
       /**
-       * <code>optional bytes data = 3;</code>
+       * <code>optional bool status = 3;</code>
        */
-      public Builder setData(com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000004;
-        data_ = value;
+      public Builder setStatus(boolean value) {
+        bitField0_ |= 0x00000004;
+        status_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>optional bytes data = 3;</code>
+       * <code>optional bool status = 3;</code>
        */
-      public Builder clearData() {
+      public Builder clearStatus() {
         bitField0_ = (bitField0_ & ~0x00000004);
-        data_ = getDefaultInstance().getData();
+        status_ = false;
         onChanged();
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:openxc.RawMessage)
+      // @@protoc_insertion_point(builder_scope:openxc.CommandResponse)
     }
 
     static {
-      defaultInstance = new RawMessage(true);
+      defaultInstance = new CommandResponse(true);
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:openxc.RawMessage)
+    // @@protoc_insertion_point(class_scope:openxc.CommandResponse)
   }
 
-  public interface ControlCommandOrBuilder
+  public interface DiagnosticRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // optional .openxc.ControlCommand.Type type = 1;
+    // optional int32 bus = 1;
     /**
-     * <code>optional .openxc.ControlCommand.Type type = 1;</code>
+     * <code>optional int32 bus = 1;</code>
      */
-    boolean hasType();
+    boolean hasBus();
     /**
-     * <code>optional .openxc.ControlCommand.Type type = 1;</code>
+     * <code>optional int32 bus = 1;</code>
      */
-    com.openxc.BinaryMessages.ControlCommand.Type getType();
+    int getBus();
 
-    // optional .openxc.DiagnosticRequest diagnostic_request = 2;
+    // optional uint32 message_id = 2;
     /**
-     * <code>optional .openxc.DiagnosticRequest diagnostic_request = 2;</code>
+     * <code>optional uint32 message_id = 2;</code>
      */
-    boolean hasDiagnosticRequest();
+    boolean hasMessageId();
+    /**
+     * <code>optional uint32 message_id = 2;</code>
+     */
+    int getMessageId();
+
+    // optional uint32 mode = 3;
+    /**
+     * <code>optional uint32 mode = 3;</code>
+     */
+    boolean hasMode();
+    /**
+     * <code>optional uint32 mode = 3;</code>
+     */
+    int getMode();
+
+    // optional uint32 pid = 4;
+    /**
+     * <code>optional uint32 pid = 4;</code>
+     */
+    boolean hasPid();
+    /**
+     * <code>optional uint32 pid = 4;</code>
+     */
+    int getPid();
+
+    // optional bytes payload = 5;
+    /**
+     * <code>optional bytes payload = 5;</code>
+     *
+     * <pre>
+     * TODO we are capping this at 8 bytes for now - need to change when we
+     * support multi-frame responses
+     * </pre>
+     */
+    boolean hasPayload();
+    /**
+     * <code>optional bytes payload = 5;</code>
+     *
+     * <pre>
+     * TODO we are capping this at 8 bytes for now - need to change when we
+     * support multi-frame responses
+     * </pre>
+     */
+    com.google.protobuf.ByteString getPayload();
+
+    // optional bool multiple_responses = 6;
+    /**
+     * <code>optional bool multiple_responses = 6;</code>
+     */
+    boolean hasMultipleResponses();
+    /**
+     * <code>optional bool multiple_responses = 6;</code>
+     */
+    boolean getMultipleResponses();
+
+    // optional double frequency = 7;
+    /**
+     * <code>optional double frequency = 7;</code>
+     */
+    boolean hasFrequency();
+    /**
+     * <code>optional double frequency = 7;</code>
+     */
+    double getFrequency();
+
+    // optional string name = 8;
+    /**
+     * <code>optional string name = 8;</code>
+     */
+    boolean hasName();
+    /**
+     * <code>optional string name = 8;</code>
+     */
+    java.lang.String getName();
+    /**
+     * <code>optional string name = 8;</code>
+     */
+    com.google.protobuf.ByteString
+        getNameBytes();
+
+    // optional .openxc.DiagnosticRequest.DecodedType decoded_type = 9;
     /**
-     * <code>optional .openxc.DiagnosticRequest diagnostic_request = 2;</code>
+     * <code>optional .openxc.DiagnosticRequest.DecodedType decoded_type = 9;</code>
      */
-    com.openxc.BinaryMessages.DiagnosticRequest getDiagnosticRequest();
+    boolean hasDecodedType();
     /**
-     * <code>optional .openxc.DiagnosticRequest diagnostic_request = 2;</code>
+     * <code>optional .openxc.DiagnosticRequest.DecodedType decoded_type = 9;</code>
      */
-    com.openxc.BinaryMessages.DiagnosticRequestOrBuilder getDiagnosticRequestOrBuilder();
+    com.openxc.BinaryMessages.DiagnosticRequest.DecodedType getDecodedType();
   }
   /**
-   * Protobuf type {@code openxc.ControlCommand}
+   * Protobuf type {@code openxc.DiagnosticRequest}
    */
-  public static final class ControlCommand extends
+  public static final class DiagnosticRequest extends
       com.google.protobuf.GeneratedMessage
-      implements ControlCommandOrBuilder {
-    // Use ControlCommand.newBuilder() to construct.
-    private ControlCommand(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+      implements DiagnosticRequestOrBuilder {
+    // Use DiagnosticRequest.newBuilder() to construct.
+    private DiagnosticRequest(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
       this.unknownFields = builder.getUnknownFields();
     }
-    private ControlCommand(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+    private DiagnosticRequest(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
 
-    private static final ControlCommand defaultInstance;
-    public static ControlCommand getDefaultInstance() {
+    private static final DiagnosticRequest defaultInstance;
+    public static DiagnosticRequest getDefaultInstance() {
       return defaultInstance;
     }
 
-    public ControlCommand getDefaultInstanceForType() {
+    public DiagnosticRequest getDefaultInstanceForType() {
       return defaultInstance;
     }
 
@@ -1696,7 +11167,7 @@ public final class BinaryMessages {
         getUnknownFields() {
       return this.unknownFields;
     }
-    private ControlCommand(
+    private DiagnosticRequest(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -1720,29 +11191,56 @@ public final class BinaryMessages {
               break;
             }
             case 8: {
+              bitField0_ |= 0x00000001;
+              bus_ = input.readInt32();
+              break;
+            }
+            case 16: {
+              bitField0_ |= 0x00000002;
+              messageId_ = input.readUInt32();
+              break;
+            }
+            case 24: {
+              bitField0_ |= 0x00000004;
+              mode_ = input.readUInt32();
+              break;
+            }
+            case 32: {
+              bitField0_ |= 0x00000008;
+              pid_ = input.readUInt32();
+              break;
+            }
+            case 42: {
+              bitField0_ |= 0x00000010;
+              payload_ = input.readBytes();
+              break;
+            }
+            case 48: {
+              bitField0_ |= 0x00000020;
+              multipleResponses_ = input.readBool();
+              break;
+            }
+            case 57: {
+              bitField0_ |= 0x00000040;
+              frequency_ = input.readDouble();
+              break;
+            }
+            case 66: {
+              bitField0_ |= 0x00000080;
+              name_ = input.readBytes();
+              break;
+            }
+            case 72: {
               int rawValue = input.readEnum();
-              com.openxc.BinaryMessages.ControlCommand.Type value = com.openxc.BinaryMessages.ControlCommand.Type.valueOf(rawValue);
+              com.openxc.BinaryMessages.DiagnosticRequest.DecodedType value = com.openxc.BinaryMessages.DiagnosticRequest.DecodedType.valueOf(rawValue);
               if (value == null) {
-                unknownFields.mergeVarintField(1, rawValue);
+                unknownFields.mergeVarintField(9, rawValue);
               } else {
-                bitField0_ |= 0x00000001;
-                type_ = value;
+                bitField0_ |= 0x00000100;
+                decodedType_ = value;
               }
               break;
             }
-            case 18: {
-              com.openxc.BinaryMessages.DiagnosticRequest.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000002) == 0x00000002)) {
-                subBuilder = diagnosticRequest_.toBuilder();
-              }
-              diagnosticRequest_ = input.readMessage(com.openxc.BinaryMessages.DiagnosticRequest.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(diagnosticRequest_);
-                diagnosticRequest_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000002;
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -1757,84 +11255,75 @@ public final class BinaryMessages {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.openxc.BinaryMessages.internal_static_openxc_ControlCommand_descriptor;
+      return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.openxc.BinaryMessages.internal_static_openxc_ControlCommand_fieldAccessorTable
+      return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.openxc.BinaryMessages.ControlCommand.class, com.openxc.BinaryMessages.ControlCommand.Builder.class);
+              com.openxc.BinaryMessages.DiagnosticRequest.class, com.openxc.BinaryMessages.DiagnosticRequest.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<ControlCommand> PARSER =
-        new com.google.protobuf.AbstractParser<ControlCommand>() {
-      public ControlCommand parsePartialFrom(
+    public static com.google.protobuf.Parser<DiagnosticRequest> PARSER =
+        new com.google.protobuf.AbstractParser<DiagnosticRequest>() {
+      public DiagnosticRequest parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ControlCommand(input, extensionRegistry);
+        return new DiagnosticRequest(input, extensionRegistry);
       }
     };
 
     @java.lang.Override
-    public com.google.protobuf.Parser<ControlCommand> getParserForType() {
+    public com.google.protobuf.Parser<DiagnosticRequest> getParserForType() {
       return PARSER;
     }
 
     /**
-     * Protobuf enum {@code openxc.ControlCommand.Type}
+     * Protobuf enum {@code openxc.DiagnosticRequest.DecodedType}
      */
-    public enum Type
+    public enum DecodedType
         implements com.google.protobuf.ProtocolMessageEnum {
       /**
-       * <code>VERSION = 1;</code>
-       */
-      VERSION(0, 1),
-      /**
-       * <code>DEVICE_ID = 2;</code>
+       * <code>NONE = 1;</code>
        */
-      DEVICE_ID(1, 2),
+      NONE(0, 1),
       /**
-       * <code>DIAGNOSTIC = 3;</code>
+       * <code>OBD2 = 2;</code>
        */
-      DIAGNOSTIC(2, 3),
+      OBD2(1, 2),
       ;
 
       /**
-       * <code>VERSION = 1;</code>
-       */
-      public static final int VERSION_VALUE = 1;
-      /**
-       * <code>DEVICE_ID = 2;</code>
+       * <code>NONE = 1;</code>
        */
-      public static final int DEVICE_ID_VALUE = 2;
+      public static final int NONE_VALUE = 1;
       /**
-       * <code>DIAGNOSTIC = 3;</code>
+       * <code>OBD2 = 2;</code>
        */
-      public static final int DIAGNOSTIC_VALUE = 3;
+      public static final int OBD2_VALUE = 2;
 
 
       public final int getNumber() { return value; }
 
-      public static Type valueOf(int value) {
+      public static DecodedType valueOf(int value) {
         switch (value) {
-          case 1: return VERSION;
-          case 2: return DEVICE_ID;
-          case 3: return DIAGNOSTIC;
+          case 1: return NONE;
+          case 2: return OBD2;
           default: return null;
         }
       }
 
-      public static com.google.protobuf.Internal.EnumLiteMap<Type>
+      public static com.google.protobuf.Internal.EnumLiteMap<DecodedType>
           internalGetValueMap() {
         return internalValueMap;
       }
-      private static com.google.protobuf.Internal.EnumLiteMap<Type>
+      private static com.google.protobuf.Internal.EnumLiteMap<DecodedType>
           internalValueMap =
-            new com.google.protobuf.Internal.EnumLiteMap<Type>() {
-              public Type findValueByNumber(int number) {
-                return Type.valueOf(number);
+            new com.google.protobuf.Internal.EnumLiteMap<DecodedType>() {
+              public DecodedType findValueByNumber(int number) {
+                return DecodedType.valueOf(number);
               }
             };
 
@@ -1848,12 +11337,12 @@ public final class BinaryMessages {
       }
       public static final com.google.protobuf.Descriptors.EnumDescriptor
           getDescriptor() {
-        return com.openxc.BinaryMessages.ControlCommand.getDescriptor().getEnumTypes().get(0);
+        return com.openxc.BinaryMessages.DiagnosticRequest.getDescriptor().getEnumTypes().get(0);
       }
 
-      private static final Type[] VALUES = values();
+      private static final DecodedType[] VALUES = values();
 
-      public static Type valueOf(
+      public static DecodedType valueOf(
           com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
         if (desc.getType() != getDescriptor()) {
           throw new java.lang.IllegalArgumentException(
@@ -1862,59 +11351,209 @@ public final class BinaryMessages {
         return VALUES[desc.getIndex()];
       }
 
-      private final int index;
-      private final int value;
+      private final int index;
+      private final int value;
+
+      private DecodedType(int index, int value) {
+        this.index = index;
+        this.value = value;
+      }
+
+      // @@protoc_insertion_point(enum_scope:openxc.DiagnosticRequest.DecodedType)
+    }
+
+    private int bitField0_;
+    // optional int32 bus = 1;
+    public static final int BUS_FIELD_NUMBER = 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_;
+    }
+
+    // optional uint32 message_id = 2;
+    public static final int MESSAGE_ID_FIELD_NUMBER = 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_;
+    }
+
+    // optional uint32 mode = 3;
+    public static final int MODE_FIELD_NUMBER = 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_;
+    }
 
-      private Type(int index, int value) {
-        this.index = index;
-        this.value = value;
-      }
+    // optional uint32 pid = 4;
+    public static final int PID_FIELD_NUMBER = 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_;
+    }
 
-      // @@protoc_insertion_point(enum_scope:openxc.ControlCommand.Type)
+    // optional bytes payload = 5;
+    public static final int PAYLOAD_FIELD_NUMBER = 5;
+    private com.google.protobuf.ByteString payload_;
+    /**
+     * <code>optional bytes payload = 5;</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_ & 0x00000010) == 0x00000010);
+    }
+    /**
+     * <code>optional bytes payload = 5;</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_;
     }
 
-    private int bitField0_;
-    // optional .openxc.ControlCommand.Type type = 1;
-    public static final int TYPE_FIELD_NUMBER = 1;
-    private com.openxc.BinaryMessages.ControlCommand.Type type_;
+    // optional bool multiple_responses = 6;
+    public static final int MULTIPLE_RESPONSES_FIELD_NUMBER = 6;
+    private boolean multipleResponses_;
     /**
-     * <code>optional .openxc.ControlCommand.Type type = 1;</code>
+     * <code>optional bool multiple_responses = 6;</code>
      */
-    public boolean hasType() {
-      return ((bitField0_ & 0x00000001) == 0x00000001);
+    public boolean hasMultipleResponses() {
+      return ((bitField0_ & 0x00000020) == 0x00000020);
     }
     /**
-     * <code>optional .openxc.ControlCommand.Type type = 1;</code>
+     * <code>optional bool multiple_responses = 6;</code>
      */
-    public com.openxc.BinaryMessages.ControlCommand.Type getType() {
-      return type_;
+    public boolean getMultipleResponses() {
+      return multipleResponses_;
     }
 
-    // optional .openxc.DiagnosticRequest diagnostic_request = 2;
-    public static final int DIAGNOSTIC_REQUEST_FIELD_NUMBER = 2;
-    private com.openxc.BinaryMessages.DiagnosticRequest diagnosticRequest_;
+    // optional double frequency = 7;
+    public static final int FREQUENCY_FIELD_NUMBER = 7;
+    private double frequency_;
     /**
-     * <code>optional .openxc.DiagnosticRequest diagnostic_request = 2;</code>
+     * <code>optional double frequency = 7;</code>
      */
-    public boolean hasDiagnosticRequest() {
-      return ((bitField0_ & 0x00000002) == 0x00000002);
+    public boolean hasFrequency() {
+      return ((bitField0_ & 0x00000040) == 0x00000040);
     }
     /**
-     * <code>optional .openxc.DiagnosticRequest diagnostic_request = 2;</code>
+     * <code>optional double frequency = 7;</code>
      */
-    public com.openxc.BinaryMessages.DiagnosticRequest getDiagnosticRequest() {
-      return diagnosticRequest_;
+    public double getFrequency() {
+      return frequency_;
     }
+
+    // optional string name = 8;
+    public static final int NAME_FIELD_NUMBER = 8;
+    private java.lang.Object name_;
     /**
-     * <code>optional .openxc.DiagnosticRequest diagnostic_request = 2;</code>
+     * <code>optional string name = 8;</code>
      */
-    public com.openxc.BinaryMessages.DiagnosticRequestOrBuilder getDiagnosticRequestOrBuilder() {
-      return diagnosticRequest_;
+    public boolean hasName() {
+      return ((bitField0_ & 0x00000080) == 0x00000080);
+    }
+    /**
+     * <code>optional string name = 8;</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 = 8;</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 .openxc.DiagnosticRequest.DecodedType decoded_type = 9;
+    public static final int DECODED_TYPE_FIELD_NUMBER = 9;
+    private com.openxc.BinaryMessages.DiagnosticRequest.DecodedType decodedType_;
+    /**
+     * <code>optional .openxc.DiagnosticRequest.DecodedType decoded_type = 9;</code>
+     */
+    public boolean hasDecodedType() {
+      return ((bitField0_ & 0x00000100) == 0x00000100);
+    }
+    /**
+     * <code>optional .openxc.DiagnosticRequest.DecodedType decoded_type = 9;</code>
+     */
+    public com.openxc.BinaryMessages.DiagnosticRequest.DecodedType getDecodedType() {
+      return decodedType_;
     }
 
     private void initFields() {
-      type_ = com.openxc.BinaryMessages.ControlCommand.Type.VERSION;
-      diagnosticRequest_ = com.openxc.BinaryMessages.DiagnosticRequest.getDefaultInstance();
+      bus_ = 0;
+      messageId_ = 0;
+      mode_ = 0;
+      pid_ = 0;
+      payload_ = com.google.protobuf.ByteString.EMPTY;
+      multipleResponses_ = false;
+      frequency_ = 0D;
+      name_ = "";
+      decodedType_ = com.openxc.BinaryMessages.DiagnosticRequest.DecodedType.NONE;
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -1929,10 +11568,31 @@ public final class BinaryMessages {
                         throws java.io.IOException {
       getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        output.writeEnum(1, type_.getNumber());
+        output.writeInt32(1, bus_);
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        output.writeMessage(2, diagnosticRequest_);
+        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.writeBytes(5, payload_);
+      }
+      if (((bitField0_ & 0x00000020) == 0x00000020)) {
+        output.writeBool(6, multipleResponses_);
+      }
+      if (((bitField0_ & 0x00000040) == 0x00000040)) {
+        output.writeDouble(7, frequency_);
+      }
+      if (((bitField0_ & 0x00000080) == 0x00000080)) {
+        output.writeBytes(8, getNameBytes());
+      }
+      if (((bitField0_ & 0x00000100) == 0x00000100)) {
+        output.writeEnum(9, decodedType_.getNumber());
       }
       getUnknownFields().writeTo(output);
     }
@@ -1945,11 +11605,39 @@ public final class BinaryMessages {
       size = 0;
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(1, type_.getNumber());
+          .computeInt32Size(1, bus_);
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(2, diagnosticRequest_);
+          .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
+          .computeBytesSize(5, payload_);
+      }
+      if (((bitField0_ & 0x00000020) == 0x00000020)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(6, multipleResponses_);
+      }
+      if (((bitField0_ & 0x00000040) == 0x00000040)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeDoubleSize(7, frequency_);
+      }
+      if (((bitField0_ & 0x00000080) == 0x00000080)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(8, getNameBytes());
+      }
+      if (((bitField0_ & 0x00000100) == 0x00000100)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(9, decodedType_.getNumber());
       }
       size += getUnknownFields().getSerializedSize();
       memoizedSerializedSize = size;
@@ -1963,53 +11651,53 @@ public final class BinaryMessages {
       return super.writeReplace();
     }
 
-    public static com.openxc.BinaryMessages.ControlCommand parseFrom(
+    public static com.openxc.BinaryMessages.DiagnosticRequest parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.openxc.BinaryMessages.ControlCommand parseFrom(
+    public static com.openxc.BinaryMessages.DiagnosticRequest 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.ControlCommand parseFrom(byte[] data)
+    public static com.openxc.BinaryMessages.DiagnosticRequest parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.openxc.BinaryMessages.ControlCommand parseFrom(
+    public static com.openxc.BinaryMessages.DiagnosticRequest parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.openxc.BinaryMessages.ControlCommand parseFrom(java.io.InputStream input)
+    public static com.openxc.BinaryMessages.DiagnosticRequest parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static com.openxc.BinaryMessages.ControlCommand parseFrom(
+    public static com.openxc.BinaryMessages.DiagnosticRequest parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static com.openxc.BinaryMessages.ControlCommand parseDelimitedFrom(java.io.InputStream input)
+    public static com.openxc.BinaryMessages.DiagnosticRequest parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static com.openxc.BinaryMessages.ControlCommand parseDelimitedFrom(
+    public static com.openxc.BinaryMessages.DiagnosticRequest parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static com.openxc.BinaryMessages.ControlCommand parseFrom(
+    public static com.openxc.BinaryMessages.DiagnosticRequest parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static com.openxc.BinaryMessages.ControlCommand parseFrom(
+    public static com.openxc.BinaryMessages.DiagnosticRequest parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -2018,7 +11706,7 @@ public final class BinaryMessages {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(com.openxc.BinaryMessages.ControlCommand prototype) {
+    public static Builder newBuilder(com.openxc.BinaryMessages.DiagnosticRequest prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -2030,24 +11718,24 @@ public final class BinaryMessages {
       return builder;
     }
     /**
-     * Protobuf type {@code openxc.ControlCommand}
+     * Protobuf type {@code openxc.DiagnosticRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements com.openxc.BinaryMessages.ControlCommandOrBuilder {
+       implements com.openxc.BinaryMessages.DiagnosticRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return com.openxc.BinaryMessages.internal_static_openxc_ControlCommand_descriptor;
+        return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.openxc.BinaryMessages.internal_static_openxc_ControlCommand_fieldAccessorTable
+        return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                com.openxc.BinaryMessages.ControlCommand.class, com.openxc.BinaryMessages.ControlCommand.Builder.class);
+                com.openxc.BinaryMessages.DiagnosticRequest.class, com.openxc.BinaryMessages.DiagnosticRequest.Builder.class);
       }
 
-      // Construct using com.openxc.BinaryMessages.ControlCommand.newBuilder()
+      // Construct using com.openxc.BinaryMessages.DiagnosticRequest.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -2059,7 +11747,6 @@ public final class BinaryMessages {
       }
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
-          getDiagnosticRequestFieldBuilder();
         }
       }
       private static Builder create() {
@@ -2068,14 +11755,24 @@ public final class BinaryMessages {
 
       public Builder clear() {
         super.clear();
-        type_ = com.openxc.BinaryMessages.ControlCommand.Type.VERSION;
+        bus_ = 0;
         bitField0_ = (bitField0_ & ~0x00000001);
-        if (diagnosticRequestBuilder_ == null) {
-          diagnosticRequest_ = com.openxc.BinaryMessages.DiagnosticRequest.getDefaultInstance();
-        } else {
-          diagnosticRequestBuilder_.clear();
-        }
+        messageId_ = 0;
         bitField0_ = (bitField0_ & ~0x00000002);
+        mode_ = 0;
+        bitField0_ = (bitField0_ & ~0x00000004);
+        pid_ = 0;
+        bitField0_ = (bitField0_ & ~0x00000008);
+        payload_ = com.google.protobuf.ByteString.EMPTY;
+        bitField0_ = (bitField0_ & ~0x00000010);
+        multipleResponses_ = false;
+        bitField0_ = (bitField0_ & ~0x00000020);
+        frequency_ = 0D;
+        bitField0_ = (bitField0_ & ~0x00000040);
+        name_ = "";
+        bitField0_ = (bitField0_ & ~0x00000080);
+        decodedType_ = com.openxc.BinaryMessages.DiagnosticRequest.DecodedType.NONE;
+        bitField0_ = (bitField0_ & ~0x00000100);
         return this;
       }
 
@@ -2085,58 +11782,105 @@ public final class BinaryMessages {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return com.openxc.BinaryMessages.internal_static_openxc_ControlCommand_descriptor;
+        return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticRequest_descriptor;
       }
 
-      public com.openxc.BinaryMessages.ControlCommand getDefaultInstanceForType() {
-        return com.openxc.BinaryMessages.ControlCommand.getDefaultInstance();
+      public com.openxc.BinaryMessages.DiagnosticRequest getDefaultInstanceForType() {
+        return com.openxc.BinaryMessages.DiagnosticRequest.getDefaultInstance();
       }
 
-      public com.openxc.BinaryMessages.ControlCommand build() {
-        com.openxc.BinaryMessages.ControlCommand result = buildPartial();
+      public com.openxc.BinaryMessages.DiagnosticRequest build() {
+        com.openxc.BinaryMessages.DiagnosticRequest result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public com.openxc.BinaryMessages.ControlCommand buildPartial() {
-        com.openxc.BinaryMessages.ControlCommand result = new com.openxc.BinaryMessages.ControlCommand(this);
+      public com.openxc.BinaryMessages.DiagnosticRequest buildPartial() {
+        com.openxc.BinaryMessages.DiagnosticRequest result = new com.openxc.BinaryMessages.DiagnosticRequest(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
           to_bitField0_ |= 0x00000001;
         }
-        result.type_ = type_;
+        result.bus_ = bus_;
         if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
           to_bitField0_ |= 0x00000002;
         }
-        if (diagnosticRequestBuilder_ == null) {
-          result.diagnosticRequest_ = diagnosticRequest_;
-        } else {
-          result.diagnosticRequest_ = diagnosticRequestBuilder_.build();
+        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.payload_ = payload_;
+        if (((from_bitField0_ & 0x00000020) == 0x00000020)) {
+          to_bitField0_ |= 0x00000020;
+        }
+        result.multipleResponses_ = multipleResponses_;
+        if (((from_bitField0_ & 0x00000040) == 0x00000040)) {
+          to_bitField0_ |= 0x00000040;
+        }
+        result.frequency_ = frequency_;
+        if (((from_bitField0_ & 0x00000080) == 0x00000080)) {
+          to_bitField0_ |= 0x00000080;
+        }
+        result.name_ = name_;
+        if (((from_bitField0_ & 0x00000100) == 0x00000100)) {
+          to_bitField0_ |= 0x00000100;
         }
+        result.decodedType_ = decodedType_;
         result.bitField0_ = to_bitField0_;
         onBuilt();
         return result;
       }
 
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.openxc.BinaryMessages.ControlCommand) {
-          return mergeFrom((com.openxc.BinaryMessages.ControlCommand)other);
+        if (other instanceof com.openxc.BinaryMessages.DiagnosticRequest) {
+          return mergeFrom((com.openxc.BinaryMessages.DiagnosticRequest)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(com.openxc.BinaryMessages.ControlCommand other) {
-        if (other == com.openxc.BinaryMessages.ControlCommand.getDefaultInstance()) return this;
-        if (other.hasType()) {
-          setType(other.getType());
+      public Builder mergeFrom(com.openxc.BinaryMessages.DiagnosticRequest other) {
+        if (other == com.openxc.BinaryMessages.DiagnosticRequest.getDefaultInstance()) return this;
+        if (other.hasBus()) {
+          setBus(other.getBus());
         }
-        if (other.hasDiagnosticRequest()) {
-          mergeDiagnosticRequest(other.getDiagnosticRequest());
+        if (other.hasMessageId()) {
+          setMessageId(other.getMessageId());
+        }
+        if (other.hasMode()) {
+          setMode(other.getMode());
+        }
+        if (other.hasPid()) {
+          setPid(other.getPid());
+        }
+        if (other.hasPayload()) {
+          setPayload(other.getPayload());
+        }
+        if (other.hasMultipleResponses()) {
+          setMultipleResponses(other.getMultipleResponses());
+        }
+        if (other.hasFrequency()) {
+          setFrequency(other.getFrequency());
+        }
+        if (other.hasName()) {
+          bitField0_ |= 0x00000080;
+          name_ = other.name_;
+          onChanged();
+        }
+        if (other.hasDecodedType()) {
+          setDecodedType(other.getDecodedType());
         }
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
@@ -2150,11 +11894,11 @@ public final class BinaryMessages {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        com.openxc.BinaryMessages.ControlCommand parsedMessage = null;
+        com.openxc.BinaryMessages.DiagnosticRequest parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (com.openxc.BinaryMessages.ControlCommand) e.getUnfinishedMessage();
+          parsedMessage = (com.openxc.BinaryMessages.DiagnosticRequest) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -2163,173 +11907,384 @@ public final class BinaryMessages {
         }
         return this;
       }
-      private int bitField0_;
+      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 bytes payload = 5;
+      private com.google.protobuf.ByteString payload_ = com.google.protobuf.ByteString.EMPTY;
+      /**
+       * <code>optional bytes payload = 5;</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_ & 0x00000010) == 0x00000010);
+      }
+      /**
+       * <code>optional bytes payload = 5;</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 = 5;</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_ |= 0x00000010;
+        payload_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional bytes payload = 5;</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_ & ~0x00000010);
+        payload_ = getDefaultInstance().getPayload();
+        onChanged();
+        return this;
+      }
 
-      // optional .openxc.ControlCommand.Type type = 1;
-      private com.openxc.BinaryMessages.ControlCommand.Type type_ = com.openxc.BinaryMessages.ControlCommand.Type.VERSION;
+      // optional bool multiple_responses = 6;
+      private boolean multipleResponses_ ;
       /**
-       * <code>optional .openxc.ControlCommand.Type type = 1;</code>
+       * <code>optional bool multiple_responses = 6;</code>
        */
-      public boolean hasType() {
-        return ((bitField0_ & 0x00000001) == 0x00000001);
+      public boolean hasMultipleResponses() {
+        return ((bitField0_ & 0x00000020) == 0x00000020);
       }
       /**
-       * <code>optional .openxc.ControlCommand.Type type = 1;</code>
+       * <code>optional bool multiple_responses = 6;</code>
        */
-      public com.openxc.BinaryMessages.ControlCommand.Type getType() {
-        return type_;
+      public boolean getMultipleResponses() {
+        return multipleResponses_;
       }
       /**
-       * <code>optional .openxc.ControlCommand.Type type = 1;</code>
+       * <code>optional bool multiple_responses = 6;</code>
        */
-      public Builder setType(com.openxc.BinaryMessages.ControlCommand.Type value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        bitField0_ |= 0x00000001;
-        type_ = value;
+      public Builder setMultipleResponses(boolean value) {
+        bitField0_ |= 0x00000020;
+        multipleResponses_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>optional .openxc.ControlCommand.Type type = 1;</code>
+       * <code>optional bool multiple_responses = 6;</code>
        */
-      public Builder clearType() {
-        bitField0_ = (bitField0_ & ~0x00000001);
-        type_ = com.openxc.BinaryMessages.ControlCommand.Type.VERSION;
+      public Builder clearMultipleResponses() {
+        bitField0_ = (bitField0_ & ~0x00000020);
+        multipleResponses_ = false;
         onChanged();
         return this;
       }
 
-      // optional .openxc.DiagnosticRequest diagnostic_request = 2;
-      private com.openxc.BinaryMessages.DiagnosticRequest diagnosticRequest_ = com.openxc.BinaryMessages.DiagnosticRequest.getDefaultInstance();
-      private com.google.protobuf.SingleFieldBuilder<
-          com.openxc.BinaryMessages.DiagnosticRequest, com.openxc.BinaryMessages.DiagnosticRequest.Builder, com.openxc.BinaryMessages.DiagnosticRequestOrBuilder> diagnosticRequestBuilder_;
+      // optional double frequency = 7;
+      private double frequency_ ;
       /**
-       * <code>optional .openxc.DiagnosticRequest diagnostic_request = 2;</code>
+       * <code>optional double frequency = 7;</code>
        */
-      public boolean hasDiagnosticRequest() {
-        return ((bitField0_ & 0x00000002) == 0x00000002);
+      public boolean hasFrequency() {
+        return ((bitField0_ & 0x00000040) == 0x00000040);
       }
       /**
-       * <code>optional .openxc.DiagnosticRequest diagnostic_request = 2;</code>
+       * <code>optional double frequency = 7;</code>
        */
-      public com.openxc.BinaryMessages.DiagnosticRequest getDiagnosticRequest() {
-        if (diagnosticRequestBuilder_ == null) {
-          return diagnosticRequest_;
-        } else {
-          return diagnosticRequestBuilder_.getMessage();
-        }
+      public double getFrequency() {
+        return frequency_;
       }
       /**
-       * <code>optional .openxc.DiagnosticRequest diagnostic_request = 2;</code>
+       * <code>optional double frequency = 7;</code>
        */
-      public Builder setDiagnosticRequest(com.openxc.BinaryMessages.DiagnosticRequest value) {
-        if (diagnosticRequestBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          diagnosticRequest_ = value;
-          onChanged();
-        } else {
-          diagnosticRequestBuilder_.setMessage(value);
-        }
-        bitField0_ |= 0x00000002;
+      public Builder setFrequency(double value) {
+        bitField0_ |= 0x00000040;
+        frequency_ = value;
+        onChanged();
         return this;
       }
       /**
-       * <code>optional .openxc.DiagnosticRequest diagnostic_request = 2;</code>
+       * <code>optional double frequency = 7;</code>
        */
-      public Builder setDiagnosticRequest(
-          com.openxc.BinaryMessages.DiagnosticRequest.Builder builderForValue) {
-        if (diagnosticRequestBuilder_ == null) {
-          diagnosticRequest_ = builderForValue.build();
-          onChanged();
-        } else {
-          diagnosticRequestBuilder_.setMessage(builderForValue.build());
-        }
-        bitField0_ |= 0x00000002;
+      public Builder clearFrequency() {
+        bitField0_ = (bitField0_ & ~0x00000040);
+        frequency_ = 0D;
+        onChanged();
         return this;
       }
+
+      // optional string name = 8;
+      private java.lang.Object name_ = "";
       /**
-       * <code>optional .openxc.DiagnosticRequest diagnostic_request = 2;</code>
+       * <code>optional string name = 8;</code>
        */
-      public Builder mergeDiagnosticRequest(com.openxc.BinaryMessages.DiagnosticRequest value) {
-        if (diagnosticRequestBuilder_ == null) {
-          if (((bitField0_ & 0x00000002) == 0x00000002) &&
-              diagnosticRequest_ != com.openxc.BinaryMessages.DiagnosticRequest.getDefaultInstance()) {
-            diagnosticRequest_ =
-              com.openxc.BinaryMessages.DiagnosticRequest.newBuilder(diagnosticRequest_).mergeFrom(value).buildPartial();
-          } else {
-            diagnosticRequest_ = value;
-          }
-          onChanged();
+      public boolean hasName() {
+        return ((bitField0_ & 0x00000080) == 0x00000080);
+      }
+      /**
+       * <code>optional string name = 8;</code>
+       */
+      public java.lang.String getName() {
+        java.lang.Object ref = name_;
+        if (!(ref instanceof java.lang.String)) {
+          java.lang.String s = ((com.google.protobuf.ByteString) ref)
+              .toStringUtf8();
+          name_ = s;
+          return s;
         } else {
-          diagnosticRequestBuilder_.mergeFrom(value);
+          return (java.lang.String) ref;
         }
-        bitField0_ |= 0x00000002;
-        return this;
       }
       /**
-       * <code>optional .openxc.DiagnosticRequest diagnostic_request = 2;</code>
+       * <code>optional string name = 8;</code>
        */
-      public Builder clearDiagnosticRequest() {
-        if (diagnosticRequestBuilder_ == null) {
-          diagnosticRequest_ = com.openxc.BinaryMessages.DiagnosticRequest.getDefaultInstance();
-          onChanged();
+      public com.google.protobuf.ByteString
+          getNameBytes() {
+        java.lang.Object ref = name_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          name_ = b;
+          return b;
         } else {
-          diagnosticRequestBuilder_.clear();
+          return (com.google.protobuf.ByteString) ref;
         }
-        bitField0_ = (bitField0_ & ~0x00000002);
+      }
+      /**
+       * <code>optional string name = 8;</code>
+       */
+      public Builder setName(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000080;
+        name_ = value;
+        onChanged();
         return this;
       }
       /**
-       * <code>optional .openxc.DiagnosticRequest diagnostic_request = 2;</code>
+       * <code>optional string name = 8;</code>
        */
-      public com.openxc.BinaryMessages.DiagnosticRequest.Builder getDiagnosticRequestBuilder() {
-        bitField0_ |= 0x00000002;
+      public Builder clearName() {
+        bitField0_ = (bitField0_ & ~0x00000080);
+        name_ = getDefaultInstance().getName();
         onChanged();
-        return getDiagnosticRequestFieldBuilder().getBuilder();
+        return this;
       }
       /**
-       * <code>optional .openxc.DiagnosticRequest diagnostic_request = 2;</code>
+       * <code>optional string name = 8;</code>
        */
-      public com.openxc.BinaryMessages.DiagnosticRequestOrBuilder getDiagnosticRequestOrBuilder() {
-        if (diagnosticRequestBuilder_ != null) {
-          return diagnosticRequestBuilder_.getMessageOrBuilder();
-        } else {
-          return diagnosticRequest_;
-        }
+      public Builder setNameBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000080;
+        name_ = value;
+        onChanged();
+        return this;
       }
+
+      // optional .openxc.DiagnosticRequest.DecodedType decoded_type = 9;
+      private com.openxc.BinaryMessages.DiagnosticRequest.DecodedType decodedType_ = com.openxc.BinaryMessages.DiagnosticRequest.DecodedType.NONE;
       /**
-       * <code>optional .openxc.DiagnosticRequest diagnostic_request = 2;</code>
+       * <code>optional .openxc.DiagnosticRequest.DecodedType decoded_type = 9;</code>
        */
-      private com.google.protobuf.SingleFieldBuilder<
-          com.openxc.BinaryMessages.DiagnosticRequest, com.openxc.BinaryMessages.DiagnosticRequest.Builder, com.openxc.BinaryMessages.DiagnosticRequestOrBuilder> 
-          getDiagnosticRequestFieldBuilder() {
-        if (diagnosticRequestBuilder_ == null) {
-          diagnosticRequestBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              com.openxc.BinaryMessages.DiagnosticRequest, com.openxc.BinaryMessages.DiagnosticRequest.Builder, com.openxc.BinaryMessages.DiagnosticRequestOrBuilder>(
-                  diagnosticRequest_,
-                  getParentForChildren(),
-                  isClean());
-          diagnosticRequest_ = null;
+      public boolean hasDecodedType() {
+        return ((bitField0_ & 0x00000100) == 0x00000100);
+      }
+      /**
+       * <code>optional .openxc.DiagnosticRequest.DecodedType decoded_type = 9;</code>
+       */
+      public com.openxc.BinaryMessages.DiagnosticRequest.DecodedType getDecodedType() {
+        return decodedType_;
+      }
+      /**
+       * <code>optional .openxc.DiagnosticRequest.DecodedType decoded_type = 9;</code>
+       */
+      public Builder setDecodedType(com.openxc.BinaryMessages.DiagnosticRequest.DecodedType value) {
+        if (value == null) {
+          throw new NullPointerException();
         }
-        return diagnosticRequestBuilder_;
+        bitField0_ |= 0x00000100;
+        decodedType_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .openxc.DiagnosticRequest.DecodedType decoded_type = 9;</code>
+       */
+      public Builder clearDecodedType() {
+        bitField0_ = (bitField0_ & ~0x00000100);
+        decodedType_ = com.openxc.BinaryMessages.DiagnosticRequest.DecodedType.NONE;
+        onChanged();
+        return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:openxc.ControlCommand)
+      // @@protoc_insertion_point(builder_scope:openxc.DiagnosticRequest)
     }
 
     static {
-      defaultInstance = new ControlCommand(true);
+      defaultInstance = new DiagnosticRequest(true);
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:openxc.ControlCommand)
+    // @@protoc_insertion_point(class_scope:openxc.DiagnosticRequest)
   }
 
-  public interface DiagnosticRequestOrBuilder
+  public interface DiagnosticResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
     // optional int32 bus = 1;
@@ -2372,9 +12327,29 @@ public final class BinaryMessages {
      */
     int getPid();
 
-    // optional bytes payload = 5;
+    // optional bool success = 5;
     /**
-     * <code>optional bytes payload = 5;</code>
+     * <code>optional bool success = 5;</code>
+     */
+    boolean hasSuccess();
+    /**
+     * <code>optional bool success = 5;</code>
+     */
+    boolean getSuccess();
+
+    // optional uint32 negative_response_code = 6;
+    /**
+     * <code>optional uint32 negative_response_code = 6;</code>
+     */
+    boolean hasNegativeResponseCode();
+    /**
+     * <code>optional uint32 negative_response_code = 6;</code>
+     */
+    int getNegativeResponseCode();
+
+    // optional bytes payload = 7;
+    /**
+     * <code>optional bytes payload = 7;</code>
      *
      * <pre>
      * TODO we are capping this at 8 bytes for now - need to change when we
@@ -2383,7 +12358,7 @@ public final class BinaryMessages {
      */
     boolean hasPayload();
     /**
-     * <code>optional bytes payload = 5;</code>
+     * <code>optional bytes payload = 7;</code>
      *
      * <pre>
      * TODO we are capping this at 8 bytes for now - need to change when we
@@ -2392,65 +12367,35 @@ public final class BinaryMessages {
      */
     com.google.protobuf.ByteString getPayload();
 
-    // optional bool parse_payload = 6;
-    /**
-     * <code>optional bool parse_payload = 6;</code>
-     */
-    boolean hasParsePayload();
-    /**
-     * <code>optional bool parse_payload = 6;</code>
-     */
-    boolean getParsePayload();
-
-    // optional double factor = 7;
-    /**
-     * <code>optional double factor = 7;</code>
-     */
-    boolean hasFactor();
-    /**
-     * <code>optional double factor = 7;</code>
-     */
-    double getFactor();
-
-    // optional double offset = 8;
-    /**
-     * <code>optional double offset = 8;</code>
-     */
-    boolean hasOffset();
-    /**
-     * <code>optional double offset = 8;</code>
-     */
-    double getOffset();
-
-    // optional double frequency = 9;
+    // optional double value = 8;
     /**
-     * <code>optional double frequency = 9;</code>
+     * <code>optional double value = 8;</code>
      */
-    boolean hasFrequency();
+    boolean hasValue();
     /**
-     * <code>optional double frequency = 9;</code>
+     * <code>optional double value = 8;</code>
      */
-    double getFrequency();
+    double getValue();
   }
   /**
-   * Protobuf type {@code openxc.DiagnosticRequest}
+   * Protobuf type {@code openxc.DiagnosticResponse}
    */
-  public static final class DiagnosticRequest extends
+  public static final class DiagnosticResponse extends
       com.google.protobuf.GeneratedMessage
-      implements DiagnosticRequestOrBuilder {
-    // Use DiagnosticRequest.newBuilder() to construct.
-    private DiagnosticRequest(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+      implements DiagnosticResponseOrBuilder {
+    // Use DiagnosticResponse.newBuilder() to construct.
+    private DiagnosticResponse(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
       this.unknownFields = builder.getUnknownFields();
     }
-    private DiagnosticRequest(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+    private DiagnosticResponse(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
 
-    private static final DiagnosticRequest defaultInstance;
-    public static DiagnosticRequest getDefaultInstance() {
+    private static final DiagnosticResponse defaultInstance;
+    public static DiagnosticResponse getDefaultInstance() {
       return defaultInstance;
     }
 
-    public DiagnosticRequest getDefaultInstanceForType() {
+    public DiagnosticResponse getDefaultInstanceForType() {
       return defaultInstance;
     }
 
@@ -2460,7 +12405,7 @@ public final class BinaryMessages {
         getUnknownFields() {
       return this.unknownFields;
     }
-    private DiagnosticRequest(
+    private DiagnosticResponse(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -2503,29 +12448,24 @@ public final class BinaryMessages {
               pid_ = input.readUInt32();
               break;
             }
-            case 42: {
+            case 40: {
               bitField0_ |= 0x00000010;
-              payload_ = input.readBytes();
+              success_ = input.readBool();
               break;
             }
             case 48: {
               bitField0_ |= 0x00000020;
-              parsePayload_ = input.readBool();
+              negativeResponseCode_ = input.readUInt32();
               break;
             }
-            case 57: {
+            case 58: {
               bitField0_ |= 0x00000040;
-              factor_ = input.readDouble();
+              payload_ = input.readBytes();
               break;
             }
             case 65: {
               bitField0_ |= 0x00000080;
-              offset_ = input.readDouble();
-              break;
-            }
-            case 73: {
-              bitField0_ |= 0x00000100;
-              frequency_ = input.readDouble();
+              value_ = input.readDouble();
               break;
             }
           }
@@ -2542,28 +12482,28 @@ public final class BinaryMessages {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticRequest_descriptor;
+      return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticRequest_fieldAccessorTable
+      return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.openxc.BinaryMessages.DiagnosticRequest.class, com.openxc.BinaryMessages.DiagnosticRequest.Builder.class);
+              com.openxc.BinaryMessages.DiagnosticResponse.class, com.openxc.BinaryMessages.DiagnosticResponse.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<DiagnosticRequest> PARSER =
-        new com.google.protobuf.AbstractParser<DiagnosticRequest>() {
-      public DiagnosticRequest parsePartialFrom(
+    public static com.google.protobuf.Parser<DiagnosticResponse> PARSER =
+        new com.google.protobuf.AbstractParser<DiagnosticResponse>() {
+      public DiagnosticResponse parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new DiagnosticRequest(input, extensionRegistry);
+        return new DiagnosticResponse(input, extensionRegistry);
       }
     };
 
     @java.lang.Override
-    public com.google.protobuf.Parser<DiagnosticRequest> getParserForType() {
+    public com.google.protobuf.Parser<DiagnosticResponse> getParserForType() {
       return PARSER;
     }
 
@@ -2632,94 +12572,78 @@ public final class BinaryMessages {
       return pid_;
     }
 
-    // optional bytes payload = 5;
-    public static final int PAYLOAD_FIELD_NUMBER = 5;
-    private com.google.protobuf.ByteString payload_;
+    // optional bool success = 5;
+    public static final int SUCCESS_FIELD_NUMBER = 5;
+    private boolean success_;
     /**
-     * <code>optional bytes payload = 5;</code>
-     *
-     * <pre>
-     * TODO we are capping this at 8 bytes for now - need to change when we
-     * support multi-frame responses
-     * </pre>
+     * <code>optional bool success = 5;</code>
      */
-    public boolean hasPayload() {
+    public boolean hasSuccess() {
       return ((bitField0_ & 0x00000010) == 0x00000010);
     }
     /**
-     * <code>optional bytes payload = 5;</code>
-     *
-     * <pre>
-     * TODO we are capping this at 8 bytes for now - need to change when we
-     * support multi-frame responses
-     * </pre>
+     * <code>optional bool success = 5;</code>
      */
-    public com.google.protobuf.ByteString getPayload() {
-      return payload_;
+    public boolean getSuccess() {
+      return success_;
     }
 
-    // optional bool parse_payload = 6;
-    public static final int PARSE_PAYLOAD_FIELD_NUMBER = 6;
-    private boolean parsePayload_;
+    // optional uint32 negative_response_code = 6;
+    public static final int NEGATIVE_RESPONSE_CODE_FIELD_NUMBER = 6;
+    private int negativeResponseCode_;
     /**
-     * <code>optional bool parse_payload = 6;</code>
+     * <code>optional uint32 negative_response_code = 6;</code>
      */
-    public boolean hasParsePayload() {
+    public boolean hasNegativeResponseCode() {
       return ((bitField0_ & 0x00000020) == 0x00000020);
     }
     /**
-     * <code>optional bool parse_payload = 6;</code>
+     * <code>optional uint32 negative_response_code = 6;</code>
      */
-    public boolean getParsePayload() {
-      return parsePayload_;
+    public int getNegativeResponseCode() {
+      return negativeResponseCode_;
     }
 
-    // optional double factor = 7;
-    public static final int FACTOR_FIELD_NUMBER = 7;
-    private double factor_;
+    // optional bytes payload = 7;
+    public static final int PAYLOAD_FIELD_NUMBER = 7;
+    private com.google.protobuf.ByteString payload_;
     /**
-     * <code>optional double factor = 7;</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>
      */
-    public boolean hasFactor() {
+    public boolean hasPayload() {
       return ((bitField0_ & 0x00000040) == 0x00000040);
     }
     /**
-     * <code>optional double factor = 7;</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>
      */
-    public double getFactor() {
-      return factor_;
+    public com.google.protobuf.ByteString getPayload() {
+      return payload_;
     }
 
-    // optional double offset = 8;
-    public static final int OFFSET_FIELD_NUMBER = 8;
-    private double offset_;
+    // optional double value = 8;
+    public static final int VALUE_FIELD_NUMBER = 8;
+    private double value_;
     /**
-     * <code>optional double offset = 8;</code>
+     * <code>optional double value = 8;</code>
      */
-    public boolean hasOffset() {
+    public boolean hasValue() {
       return ((bitField0_ & 0x00000080) == 0x00000080);
     }
     /**
-     * <code>optional double offset = 8;</code>
-     */
-    public double getOffset() {
-      return offset_;
-    }
-
-    // optional double frequency = 9;
-    public static final int FREQUENCY_FIELD_NUMBER = 9;
-    private double frequency_;
-    /**
-     * <code>optional double frequency = 9;</code>
-     */
-    public boolean hasFrequency() {
-      return ((bitField0_ & 0x00000100) == 0x00000100);
-    }
-    /**
-     * <code>optional double frequency = 9;</code>
+     * <code>optional double value = 8;</code>
      */
-    public double getFrequency() {
-      return frequency_;
+    public double getValue() {
+      return value_;
     }
 
     private void initFields() {
@@ -2727,11 +12651,10 @@ public final class BinaryMessages {
       messageId_ = 0;
       mode_ = 0;
       pid_ = 0;
+      success_ = false;
+      negativeResponseCode_ = 0;
       payload_ = com.google.protobuf.ByteString.EMPTY;
-      parsePayload_ = false;
-      factor_ = 0D;
-      offset_ = 0D;
-      frequency_ = 0D;
+      value_ = 0D;
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -2758,19 +12681,16 @@ public final class BinaryMessages {
         output.writeUInt32(4, pid_);
       }
       if (((bitField0_ & 0x00000010) == 0x00000010)) {
-        output.writeBytes(5, payload_);
+        output.writeBool(5, success_);
       }
       if (((bitField0_ & 0x00000020) == 0x00000020)) {
-        output.writeBool(6, parsePayload_);
+        output.writeUInt32(6, negativeResponseCode_);
       }
       if (((bitField0_ & 0x00000040) == 0x00000040)) {
-        output.writeDouble(7, factor_);
+        output.writeBytes(7, payload_);
       }
       if (((bitField0_ & 0x00000080) == 0x00000080)) {
-        output.writeDouble(8, offset_);
-      }
-      if (((bitField0_ & 0x00000100) == 0x00000100)) {
-        output.writeDouble(9, frequency_);
+        output.writeDouble(8, value_);
       }
       getUnknownFields().writeTo(output);
     }
@@ -2799,23 +12719,19 @@ public final class BinaryMessages {
       }
       if (((bitField0_ & 0x00000010) == 0x00000010)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(5, payload_);
+          .computeBoolSize(5, success_);
       }
       if (((bitField0_ & 0x00000020) == 0x00000020)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(6, parsePayload_);
+          .computeUInt32Size(6, negativeResponseCode_);
       }
       if (((bitField0_ & 0x00000040) == 0x00000040)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeDoubleSize(7, factor_);
+          .computeBytesSize(7, payload_);
       }
       if (((bitField0_ & 0x00000080) == 0x00000080)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeDoubleSize(8, offset_);
-      }
-      if (((bitField0_ & 0x00000100) == 0x00000100)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeDoubleSize(9, frequency_);
+          .computeDoubleSize(8, value_);
       }
       size += getUnknownFields().getSerializedSize();
       memoizedSerializedSize = size;
@@ -2829,53 +12745,53 @@ public final class BinaryMessages {
       return super.writeReplace();
     }
 
-    public static com.openxc.BinaryMessages.DiagnosticRequest parseFrom(
+    public static com.openxc.BinaryMessages.DiagnosticResponse parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.openxc.BinaryMessages.DiagnosticRequest parseFrom(
+    public static com.openxc.BinaryMessages.DiagnosticResponse 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.DiagnosticRequest parseFrom(byte[] data)
+    public static com.openxc.BinaryMessages.DiagnosticResponse parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.openxc.BinaryMessages.DiagnosticRequest parseFrom(
+    public static com.openxc.BinaryMessages.DiagnosticResponse parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.openxc.BinaryMessages.DiagnosticRequest parseFrom(java.io.InputStream input)
+    public static com.openxc.BinaryMessages.DiagnosticResponse parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static com.openxc.BinaryMessages.DiagnosticRequest parseFrom(
+    public static com.openxc.BinaryMessages.DiagnosticResponse parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static com.openxc.BinaryMessages.DiagnosticRequest parseDelimitedFrom(java.io.InputStream input)
+    public static com.openxc.BinaryMessages.DiagnosticResponse parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static com.openxc.BinaryMessages.DiagnosticRequest parseDelimitedFrom(
+    public static com.openxc.BinaryMessages.DiagnosticResponse parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static com.openxc.BinaryMessages.DiagnosticRequest parseFrom(
+    public static com.openxc.BinaryMessages.DiagnosticResponse parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static com.openxc.BinaryMessages.DiagnosticRequest parseFrom(
+    public static com.openxc.BinaryMessages.DiagnosticResponse parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -2884,7 +12800,7 @@ public final class BinaryMessages {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(com.openxc.BinaryMessages.DiagnosticRequest prototype) {
+    public static Builder newBuilder(com.openxc.BinaryMessages.DiagnosticResponse prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -2896,24 +12812,24 @@ public final class BinaryMessages {
       return builder;
     }
     /**
-     * Protobuf type {@code openxc.DiagnosticRequest}
+     * Protobuf type {@code openxc.DiagnosticResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements com.openxc.BinaryMessages.DiagnosticRequestOrBuilder {
+       implements com.openxc.BinaryMessages.DiagnosticResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticRequest_descriptor;
+        return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticRequest_fieldAccessorTable
+        return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                com.openxc.BinaryMessages.DiagnosticRequest.class, com.openxc.BinaryMessages.DiagnosticRequest.Builder.class);
+                com.openxc.BinaryMessages.DiagnosticResponse.class, com.openxc.BinaryMessages.DiagnosticResponse.Builder.class);
       }
 
-      // Construct using com.openxc.BinaryMessages.DiagnosticRequest.newBuilder()
+      // Construct using com.openxc.BinaryMessages.DiagnosticResponse.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -2941,16 +12857,14 @@ public final class BinaryMessages {
         bitField0_ = (bitField0_ & ~0x00000004);
         pid_ = 0;
         bitField0_ = (bitField0_ & ~0x00000008);
-        payload_ = com.google.protobuf.ByteString.EMPTY;
+        success_ = false;
         bitField0_ = (bitField0_ & ~0x00000010);
-        parsePayload_ = false;
+        negativeResponseCode_ = 0;
         bitField0_ = (bitField0_ & ~0x00000020);
-        factor_ = 0D;
+        payload_ = com.google.protobuf.ByteString.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000040);
-        offset_ = 0D;
+        value_ = 0D;
         bitField0_ = (bitField0_ & ~0x00000080);
-        frequency_ = 0D;
-        bitField0_ = (bitField0_ & ~0x00000100);
         return this;
       }
 
@@ -2960,23 +12874,23 @@ public final class BinaryMessages {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticRequest_descriptor;
+        return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticResponse_descriptor;
       }
 
-      public com.openxc.BinaryMessages.DiagnosticRequest getDefaultInstanceForType() {
-        return com.openxc.BinaryMessages.DiagnosticRequest.getDefaultInstance();
+      public com.openxc.BinaryMessages.DiagnosticResponse getDefaultInstanceForType() {
+        return com.openxc.BinaryMessages.DiagnosticResponse.getDefaultInstance();
       }
 
-      public com.openxc.BinaryMessages.DiagnosticRequest build() {
-        com.openxc.BinaryMessages.DiagnosticRequest result = buildPartial();
+      public com.openxc.BinaryMessages.DiagnosticResponse build() {
+        com.openxc.BinaryMessages.DiagnosticResponse result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public com.openxc.BinaryMessages.DiagnosticRequest buildPartial() {
-        com.openxc.BinaryMessages.DiagnosticRequest result = new com.openxc.BinaryMessages.DiagnosticRequest(this);
+      public com.openxc.BinaryMessages.DiagnosticResponse buildPartial() {
+        com.openxc.BinaryMessages.DiagnosticResponse result = new com.openxc.BinaryMessages.DiagnosticResponse(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -2998,39 +12912,35 @@ public final class BinaryMessages {
         if (((from_bitField0_ & 0x00000010) == 0x00000010)) {
           to_bitField0_ |= 0x00000010;
         }
-        result.payload_ = payload_;
+        result.success_ = success_;
         if (((from_bitField0_ & 0x00000020) == 0x00000020)) {
           to_bitField0_ |= 0x00000020;
         }
-        result.parsePayload_ = parsePayload_;
+        result.negativeResponseCode_ = negativeResponseCode_;
         if (((from_bitField0_ & 0x00000040) == 0x00000040)) {
           to_bitField0_ |= 0x00000040;
         }
-        result.factor_ = factor_;
+        result.payload_ = payload_;
         if (((from_bitField0_ & 0x00000080) == 0x00000080)) {
           to_bitField0_ |= 0x00000080;
         }
-        result.offset_ = offset_;
-        if (((from_bitField0_ & 0x00000100) == 0x00000100)) {
-          to_bitField0_ |= 0x00000100;
-        }
-        result.frequency_ = frequency_;
+        result.value_ = value_;
         result.bitField0_ = to_bitField0_;
         onBuilt();
         return result;
       }
 
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.openxc.BinaryMessages.DiagnosticRequest) {
-          return mergeFrom((com.openxc.BinaryMessages.DiagnosticRequest)other);
+        if (other instanceof com.openxc.BinaryMessages.DiagnosticResponse) {
+          return mergeFrom((com.openxc.BinaryMessages.DiagnosticResponse)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(com.openxc.BinaryMessages.DiagnosticRequest other) {
-        if (other == com.openxc.BinaryMessages.DiagnosticRequest.getDefaultInstance()) return this;
+      public Builder mergeFrom(com.openxc.BinaryMessages.DiagnosticResponse other) {
+        if (other == com.openxc.BinaryMessages.DiagnosticResponse.getDefaultInstance()) return this;
         if (other.hasBus()) {
           setBus(other.getBus());
         }
@@ -3043,20 +12953,17 @@ public final class BinaryMessages {
         if (other.hasPid()) {
           setPid(other.getPid());
         }
-        if (other.hasPayload()) {
-          setPayload(other.getPayload());
-        }
-        if (other.hasParsePayload()) {
-          setParsePayload(other.getParsePayload());
+        if (other.hasSuccess()) {
+          setSuccess(other.getSuccess());
         }
-        if (other.hasFactor()) {
-          setFactor(other.getFactor());
+        if (other.hasNegativeResponseCode()) {
+          setNegativeResponseCode(other.getNegativeResponseCode());
         }
-        if (other.hasOffset()) {
-          setOffset(other.getOffset());
+        if (other.hasPayload()) {
+          setPayload(other.getPayload());
         }
-        if (other.hasFrequency()) {
-          setFrequency(other.getFrequency());
+        if (other.hasValue()) {
+          setValue(other.getValue());
         }
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
@@ -3070,11 +12977,11 @@ public final class BinaryMessages {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        com.openxc.BinaryMessages.DiagnosticRequest parsedMessage = null;
+        com.openxc.BinaryMessages.DiagnosticResponse parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (com.openxc.BinaryMessages.DiagnosticRequest) e.getUnfinishedMessage();
+          parsedMessage = (com.openxc.BinaryMessages.DiagnosticResponse) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -3184,43 +13091,109 @@ public final class BinaryMessages {
         return this;
       }
 
-      // optional uint32 pid = 4;
-      private int pid_ ;
+      // 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 pid = 4;</code>
+       * <code>optional uint32 negative_response_code = 6;</code>
        */
-      public boolean hasPid() {
-        return ((bitField0_ & 0x00000008) == 0x00000008);
+      public boolean hasNegativeResponseCode() {
+        return ((bitField0_ & 0x00000020) == 0x00000020);
       }
       /**
-       * <code>optional uint32 pid = 4;</code>
+       * <code>optional uint32 negative_response_code = 6;</code>
        */
-      public int getPid() {
-        return pid_;
+      public int getNegativeResponseCode() {
+        return negativeResponseCode_;
       }
       /**
-       * <code>optional uint32 pid = 4;</code>
+       * <code>optional uint32 negative_response_code = 6;</code>
        */
-      public Builder setPid(int value) {
-        bitField0_ |= 0x00000008;
-        pid_ = value;
+      public Builder setNegativeResponseCode(int value) {
+        bitField0_ |= 0x00000020;
+        negativeResponseCode_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>optional uint32 pid = 4;</code>
+       * <code>optional uint32 negative_response_code = 6;</code>
        */
-      public Builder clearPid() {
-        bitField0_ = (bitField0_ & ~0x00000008);
-        pid_ = 0;
+      public Builder clearNegativeResponseCode() {
+        bitField0_ = (bitField0_ & ~0x00000020);
+        negativeResponseCode_ = 0;
         onChanged();
         return this;
       }
 
-      // optional bytes payload = 5;
+      // optional bytes payload = 7;
       private com.google.protobuf.ByteString payload_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>optional bytes payload = 5;</code>
+       * <code>optional bytes payload = 7;</code>
        *
        * <pre>
        * TODO we are capping this at 8 bytes for now - need to change when we
@@ -3228,10 +13201,10 @@ public final class BinaryMessages {
        * </pre>
        */
       public boolean hasPayload() {
-        return ((bitField0_ & 0x00000010) == 0x00000010);
+        return ((bitField0_ & 0x00000040) == 0x00000040);
       }
       /**
-       * <code>optional bytes payload = 5;</code>
+       * <code>optional bytes payload = 7;</code>
        *
        * <pre>
        * TODO we are capping this at 8 bytes for now - need to change when we
@@ -3242,7 +13215,7 @@ public final class BinaryMessages {
         return payload_;
       }
       /**
-       * <code>optional bytes payload = 5;</code>
+       * <code>optional bytes payload = 7;</code>
        *
        * <pre>
        * TODO we are capping this at 8 bytes for now - need to change when we
@@ -3253,13 +13226,13 @@ public final class BinaryMessages {
         if (value == null) {
     throw new NullPointerException();
   }
-  bitField0_ |= 0x00000010;
+  bitField0_ |= 0x00000040;
         payload_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>optional bytes payload = 5;</code>
+       * <code>optional bytes payload = 7;</code>
        *
        * <pre>
        * TODO we are capping this at 8 bytes for now - need to change when we
@@ -3267,267 +13240,123 @@ public final class BinaryMessages {
        * </pre>
        */
       public Builder clearPayload() {
-        bitField0_ = (bitField0_ & ~0x00000010);
-        payload_ = getDefaultInstance().getPayload();
-        onChanged();
-        return this;
-      }
-
-      // optional bool parse_payload = 6;
-      private boolean parsePayload_ ;
-      /**
-       * <code>optional bool parse_payload = 6;</code>
-       */
-      public boolean hasParsePayload() {
-        return ((bitField0_ & 0x00000020) == 0x00000020);
-      }
-      /**
-       * <code>optional bool parse_payload = 6;</code>
-       */
-      public boolean getParsePayload() {
-        return parsePayload_;
-      }
-      /**
-       * <code>optional bool parse_payload = 6;</code>
-       */
-      public Builder setParsePayload(boolean value) {
-        bitField0_ |= 0x00000020;
-        parsePayload_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>optional bool parse_payload = 6;</code>
-       */
-      public Builder clearParsePayload() {
-        bitField0_ = (bitField0_ & ~0x00000020);
-        parsePayload_ = false;
-        onChanged();
-        return this;
-      }
-
-      // optional double factor = 7;
-      private double factor_ ;
-      /**
-       * <code>optional double factor = 7;</code>
-       */
-      public boolean hasFactor() {
-        return ((bitField0_ & 0x00000040) == 0x00000040);
-      }
-      /**
-       * <code>optional double factor = 7;</code>
-       */
-      public double getFactor() {
-        return factor_;
-      }
-      /**
-       * <code>optional double factor = 7;</code>
-       */
-      public Builder setFactor(double value) {
-        bitField0_ |= 0x00000040;
-        factor_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>optional double factor = 7;</code>
-       */
-      public Builder clearFactor() {
         bitField0_ = (bitField0_ & ~0x00000040);
-        factor_ = 0D;
+        payload_ = getDefaultInstance().getPayload();
         onChanged();
         return this;
       }
 
-      // optional double offset = 8;
-      private double offset_ ;
+      // optional double value = 8;
+      private double value_ ;
       /**
-       * <code>optional double offset = 8;</code>
+       * <code>optional double value = 8;</code>
        */
-      public boolean hasOffset() {
+      public boolean hasValue() {
         return ((bitField0_ & 0x00000080) == 0x00000080);
       }
       /**
-       * <code>optional double offset = 8;</code>
+       * <code>optional double value = 8;</code>
        */
-      public double getOffset() {
-        return offset_;
+      public double getValue() {
+        return value_;
       }
       /**
-       * <code>optional double offset = 8;</code>
+       * <code>optional double value = 8;</code>
        */
-      public Builder setOffset(double value) {
+      public Builder setValue(double value) {
         bitField0_ |= 0x00000080;
-        offset_ = value;
+        value_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>optional double offset = 8;</code>
+       * <code>optional double value = 8;</code>
        */
-      public Builder clearOffset() {
+      public Builder clearValue() {
         bitField0_ = (bitField0_ & ~0x00000080);
-        offset_ = 0D;
-        onChanged();
-        return this;
-      }
-
-      // optional double frequency = 9;
-      private double frequency_ ;
-      /**
-       * <code>optional double frequency = 9;</code>
-       */
-      public boolean hasFrequency() {
-        return ((bitField0_ & 0x00000100) == 0x00000100);
-      }
-      /**
-       * <code>optional double frequency = 9;</code>
-       */
-      public double getFrequency() {
-        return frequency_;
-      }
-      /**
-       * <code>optional double frequency = 9;</code>
-       */
-      public Builder setFrequency(double value) {
-        bitField0_ |= 0x00000100;
-        frequency_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>optional double frequency = 9;</code>
-       */
-      public Builder clearFrequency() {
-        bitField0_ = (bitField0_ & ~0x00000100);
-        frequency_ = 0D;
+        value_ = 0D;
         onChanged();
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:openxc.DiagnosticRequest)
+      // @@protoc_insertion_point(builder_scope:openxc.DiagnosticResponse)
     }
 
     static {
-      defaultInstance = new DiagnosticRequest(true);
+      defaultInstance = new DiagnosticResponse(true);
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:openxc.DiagnosticRequest)
+    // @@protoc_insertion_point(class_scope:openxc.DiagnosticResponse)
   }
 
-  public interface DiagnosticResponseOrBuilder
+  public interface DynamicFieldOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // optional int32 bus = 1;
-    /**
-     * <code>optional int32 bus = 1;</code>
-     */
-    boolean hasBus();
-    /**
-     * <code>optional int32 bus = 1;</code>
-     */
-    int getBus();
-
-    // optional uint32 message_id = 2;
-    /**
-     * <code>optional uint32 message_id = 2;</code>
-     */
-    boolean hasMessageId();
-    /**
-     * <code>optional uint32 message_id = 2;</code>
-     */
-    int getMessageId();
-
-    // optional uint32 mode = 3;
-    /**
-     * <code>optional uint32 mode = 3;</code>
-     */
-    boolean hasMode();
-    /**
-     * <code>optional uint32 mode = 3;</code>
-     */
-    int getMode();
-
-    // optional uint32 pid = 4;
+    // optional .openxc.DynamicField.Type type = 1;
     /**
-     * <code>optional uint32 pid = 4;</code>
+     * <code>optional .openxc.DynamicField.Type type = 1;</code>
      */
-    boolean hasPid();
+    boolean hasType();
     /**
-     * <code>optional uint32 pid = 4;</code>
+     * <code>optional .openxc.DynamicField.Type type = 1;</code>
      */
-    int getPid();
+    com.openxc.BinaryMessages.DynamicField.Type getType();
 
-    // optional bool success = 5;
-    /**
-     * <code>optional bool success = 5;</code>
-     */
-    boolean hasSuccess();
+    // optional string string_value = 2;
     /**
-     * <code>optional bool success = 5;</code>
+     * <code>optional string string_value = 2;</code>
      */
-    boolean getSuccess();
-
-    // optional uint32 negative_response_code = 6;
+    boolean hasStringValue();
     /**
-     * <code>optional uint32 negative_response_code = 6;</code>
+     * <code>optional string string_value = 2;</code>
      */
-    boolean hasNegativeResponseCode();
+    java.lang.String getStringValue();
     /**
-     * <code>optional uint32 negative_response_code = 6;</code>
+     * <code>optional string string_value = 2;</code>
      */
-    int getNegativeResponseCode();
+    com.google.protobuf.ByteString
+        getStringValueBytes();
 
-    // optional bytes payload = 7;
+    // optional double numeric_value = 3;
     /**
-     * <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>
+     * <code>optional double numeric_value = 3;</code>
      */
-    boolean hasPayload();
+    boolean hasNumericValue();
     /**
-     * <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>
+     * <code>optional double numeric_value = 3;</code>
      */
-    com.google.protobuf.ByteString getPayload();
+    double getNumericValue();
 
-    // optional double value = 8;
+    // optional bool boolean_value = 4;
     /**
-     * <code>optional double value = 8;</code>
+     * <code>optional bool boolean_value = 4;</code>
      */
-    boolean hasValue();
+    boolean hasBooleanValue();
     /**
-     * <code>optional double value = 8;</code>
+     * <code>optional bool boolean_value = 4;</code>
      */
-    double getValue();
+    boolean getBooleanValue();
   }
   /**
-   * Protobuf type {@code openxc.DiagnosticResponse}
+   * Protobuf type {@code openxc.DynamicField}
    */
-  public static final class DiagnosticResponse extends
+  public static final class DynamicField extends
       com.google.protobuf.GeneratedMessage
-      implements DiagnosticResponseOrBuilder {
-    // Use DiagnosticResponse.newBuilder() to construct.
-    private DiagnosticResponse(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+      implements DynamicFieldOrBuilder {
+    // Use DynamicField.newBuilder() to construct.
+    private DynamicField(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
       this.unknownFields = builder.getUnknownFields();
     }
-    private DiagnosticResponse(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+    private DynamicField(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
 
-    private static final DiagnosticResponse defaultInstance;
-    public static DiagnosticResponse getDefaultInstance() {
+    private static final DynamicField defaultInstance;
+    public static DynamicField getDefaultInstance() {
       return defaultInstance;
     }
 
-    public DiagnosticResponse getDefaultInstanceForType() {
+    public DynamicField getDefaultInstanceForType() {
       return defaultInstance;
     }
 
@@ -3537,7 +13366,7 @@ public final class BinaryMessages {
         getUnknownFields() {
       return this.unknownFields;
     }
-    private DiagnosticResponse(
+    private DynamicField(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -3561,43 +13390,29 @@ public final class BinaryMessages {
               break;
             }
             case 8: {
-              bitField0_ |= 0x00000001;
-              bus_ = input.readInt32();
+              int rawValue = input.readEnum();
+              com.openxc.BinaryMessages.DynamicField.Type value = com.openxc.BinaryMessages.DynamicField.Type.valueOf(rawValue);
+              if (value == null) {
+                unknownFields.mergeVarintField(1, rawValue);
+              } else {
+                bitField0_ |= 0x00000001;
+                type_ = value;
+              }
               break;
             }
-            case 16: {
+            case 18: {
               bitField0_ |= 0x00000002;
-              messageId_ = input.readUInt32();
-              break;
-            }
-            case 24: {
-              bitField0_ |= 0x00000004;
-              mode_ = input.readUInt32();
-              break;
-            }
-            case 32: {
-              bitField0_ |= 0x00000008;
-              pid_ = input.readUInt32();
-              break;
-            }
-            case 40: {
-              bitField0_ |= 0x00000010;
-              success_ = input.readBool();
-              break;
-            }
-            case 48: {
-              bitField0_ |= 0x00000020;
-              negativeResponseCode_ = input.readUInt32();
+              stringValue_ = input.readBytes();
               break;
             }
-            case 58: {
-              bitField0_ |= 0x00000040;
-              payload_ = input.readBytes();
+            case 25: {
+              bitField0_ |= 0x00000004;
+              numericValue_ = input.readDouble();
               break;
             }
-            case 65: {
-              bitField0_ |= 0x00000080;
-              value_ = input.readDouble();
+            case 32: {
+              bitField0_ |= 0x00000008;
+              booleanValue_ = input.readBool();
               break;
             }
           }
@@ -3614,179 +13429,219 @@ public final class BinaryMessages {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticResponse_descriptor;
+      return com.openxc.BinaryMessages.internal_static_openxc_DynamicField_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticResponse_fieldAccessorTable
+      return com.openxc.BinaryMessages.internal_static_openxc_DynamicField_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.openxc.BinaryMessages.DiagnosticResponse.class, com.openxc.BinaryMessages.DiagnosticResponse.Builder.class);
+              com.openxc.BinaryMessages.DynamicField.class, com.openxc.BinaryMessages.DynamicField.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<DiagnosticResponse> PARSER =
-        new com.google.protobuf.AbstractParser<DiagnosticResponse>() {
-      public DiagnosticResponse parsePartialFrom(
+    public static com.google.protobuf.Parser<DynamicField> PARSER =
+        new com.google.protobuf.AbstractParser<DynamicField>() {
+      public DynamicField parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new DiagnosticResponse(input, extensionRegistry);
+        return new DynamicField(input, extensionRegistry);
       }
     };
 
     @java.lang.Override
-    public com.google.protobuf.Parser<DiagnosticResponse> getParserForType() {
+    public com.google.protobuf.Parser<DynamicField> getParserForType() {
       return PARSER;
     }
 
-    private int bitField0_;
-    // optional int32 bus = 1;
-    public static final int BUS_FIELD_NUMBER = 1;
-    private int bus_;
     /**
-     * <code>optional int32 bus = 1;</code>
-     */
-    public boolean hasBus() {
-      return ((bitField0_ & 0x00000001) == 0x00000001);
-    }
-    /**
-     * <code>optional int32 bus = 1;</code>
+     * Protobuf enum {@code openxc.DynamicField.Type}
      */
-    public int getBus() {
-      return bus_;
-    }
+    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),
+      ;
 
-    // optional uint32 message_id = 2;
-    public static final int MESSAGE_ID_FIELD_NUMBER = 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>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;
 
-    // optional uint32 mode = 3;
-    public static final int MODE_FIELD_NUMBER = 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_;
+
+      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;
+          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.DynamicField.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.DynamicField.Type)
     }
 
-    // optional uint32 pid = 4;
-    public static final int PID_FIELD_NUMBER = 4;
-    private int pid_;
+    private int bitField0_;
+    // optional .openxc.DynamicField.Type type = 1;
+    public static final int TYPE_FIELD_NUMBER = 1;
+    private com.openxc.BinaryMessages.DynamicField.Type type_;
     /**
-     * <code>optional uint32 pid = 4;</code>
+     * <code>optional .openxc.DynamicField.Type type = 1;</code>
      */
-    public boolean hasPid() {
-      return ((bitField0_ & 0x00000008) == 0x00000008);
+    public boolean hasType() {
+      return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * <code>optional uint32 pid = 4;</code>
+     * <code>optional .openxc.DynamicField.Type type = 1;</code>
      */
-    public int getPid() {
-      return pid_;
+    public com.openxc.BinaryMessages.DynamicField.Type getType() {
+      return type_;
     }
 
-    // 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);
-    }
+    // optional string string_value = 2;
+    public static final int STRING_VALUE_FIELD_NUMBER = 2;
+    private java.lang.Object stringValue_;
     /**
-     * <code>optional bool success = 5;</code>
+     * <code>optional string string_value = 2;</code>
      */
-    public boolean getSuccess() {
-      return success_;
+    public boolean hasStringValue() {
+      return ((bitField0_ & 0x00000002) == 0x00000002);
     }
-
-    // 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>
+     * <code>optional string string_value = 2;</code>
      */
-    public boolean hasNegativeResponseCode() {
-      return ((bitField0_ & 0x00000020) == 0x00000020);
+    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 uint32 negative_response_code = 6;</code>
+     * <code>optional string string_value = 2;</code>
      */
-    public int getNegativeResponseCode() {
-      return negativeResponseCode_;
+    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 bytes payload = 7;
-    public static final int PAYLOAD_FIELD_NUMBER = 7;
-    private com.google.protobuf.ByteString payload_;
+    // optional double numeric_value = 3;
+    public static final int NUMERIC_VALUE_FIELD_NUMBER = 3;
+    private double numericValue_;
     /**
-     * <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>
+     * <code>optional double numeric_value = 3;</code>
      */
-    public boolean hasPayload() {
-      return ((bitField0_ & 0x00000040) == 0x00000040);
+    public boolean hasNumericValue() {
+      return ((bitField0_ & 0x00000004) == 0x00000004);
     }
     /**
-     * <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>
+     * <code>optional double numeric_value = 3;</code>
      */
-    public com.google.protobuf.ByteString getPayload() {
-      return payload_;
+    public double getNumericValue() {
+      return numericValue_;
     }
 
-    // optional double value = 8;
-    public static final int VALUE_FIELD_NUMBER = 8;
-    private double value_;
+    // optional bool boolean_value = 4;
+    public static final int BOOLEAN_VALUE_FIELD_NUMBER = 4;
+    private boolean booleanValue_;
     /**
-     * <code>optional double value = 8;</code>
+     * <code>optional bool boolean_value = 4;</code>
      */
-    public boolean hasValue() {
-      return ((bitField0_ & 0x00000080) == 0x00000080);
+    public boolean hasBooleanValue() {
+      return ((bitField0_ & 0x00000008) == 0x00000008);
     }
     /**
-     * <code>optional double value = 8;</code>
+     * <code>optional bool boolean_value = 4;</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;
+    public boolean getBooleanValue() {
+      return booleanValue_;
+    }
+
+    private void initFields() {
+      type_ = com.openxc.BinaryMessages.DynamicField.Type.STRING;
+      stringValue_ = "";
+      numericValue_ = 0D;
+      booleanValue_ = false;
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -3801,28 +13656,16 @@ public final class BinaryMessages {
                         throws java.io.IOException {
       getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        output.writeInt32(1, bus_);
+        output.writeEnum(1, type_.getNumber());
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        output.writeUInt32(2, messageId_);
+        output.writeBytes(2, getStringValueBytes());
       }
       if (((bitField0_ & 0x00000004) == 0x00000004)) {
-        output.writeUInt32(3, mode_);
+        output.writeDouble(3, numericValue_);
       }
       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_);
+        output.writeBool(4, booleanValue_);
       }
       getUnknownFields().writeTo(output);
     }
@@ -3835,35 +13678,19 @@ public final class BinaryMessages {
       size = 0;
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(1, bus_);
+          .computeEnumSize(1, type_.getNumber());
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, messageId_);
+          .computeBytesSize(2, getStringValueBytes());
       }
       if (((bitField0_ & 0x00000004) == 0x00000004)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, mode_);
+          .computeDoubleSize(3, numericValue_);
       }
       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_);
+          .computeBoolSize(4, booleanValue_);
       }
       size += getUnknownFields().getSerializedSize();
       memoizedSerializedSize = size;
@@ -3877,53 +13704,53 @@ public final class BinaryMessages {
       return super.writeReplace();
     }
 
-    public static com.openxc.BinaryMessages.DiagnosticResponse parseFrom(
+    public static com.openxc.BinaryMessages.DynamicField parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.openxc.BinaryMessages.DiagnosticResponse parseFrom(
+    public static com.openxc.BinaryMessages.DynamicField 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.DiagnosticResponse parseFrom(byte[] data)
+    public static com.openxc.BinaryMessages.DynamicField parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.openxc.BinaryMessages.DiagnosticResponse parseFrom(
+    public static com.openxc.BinaryMessages.DynamicField parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.openxc.BinaryMessages.DiagnosticResponse parseFrom(java.io.InputStream input)
+    public static com.openxc.BinaryMessages.DynamicField parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static com.openxc.BinaryMessages.DiagnosticResponse parseFrom(
+    public static com.openxc.BinaryMessages.DynamicField parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static com.openxc.BinaryMessages.DiagnosticResponse parseDelimitedFrom(java.io.InputStream input)
+    public static com.openxc.BinaryMessages.DynamicField parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static com.openxc.BinaryMessages.DiagnosticResponse parseDelimitedFrom(
+    public static com.openxc.BinaryMessages.DynamicField parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static com.openxc.BinaryMessages.DiagnosticResponse parseFrom(
+    public static com.openxc.BinaryMessages.DynamicField parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static com.openxc.BinaryMessages.DiagnosticResponse parseFrom(
+    public static com.openxc.BinaryMessages.DynamicField parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -3932,7 +13759,7 @@ public final class BinaryMessages {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(com.openxc.BinaryMessages.DiagnosticResponse prototype) {
+    public static Builder newBuilder(com.openxc.BinaryMessages.DynamicField prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -3944,24 +13771,24 @@ public final class BinaryMessages {
       return builder;
     }
     /**
-     * Protobuf type {@code openxc.DiagnosticResponse}
+     * Protobuf type {@code openxc.DynamicField}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements com.openxc.BinaryMessages.DiagnosticResponseOrBuilder {
+       implements com.openxc.BinaryMessages.DynamicFieldOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticResponse_descriptor;
+        return com.openxc.BinaryMessages.internal_static_openxc_DynamicField_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticResponse_fieldAccessorTable
+        return com.openxc.BinaryMessages.internal_static_openxc_DynamicField_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                com.openxc.BinaryMessages.DiagnosticResponse.class, com.openxc.BinaryMessages.DiagnosticResponse.Builder.class);
+                com.openxc.BinaryMessages.DynamicField.class, com.openxc.BinaryMessages.DynamicField.Builder.class);
       }
 
-      // Construct using com.openxc.BinaryMessages.DiagnosticResponse.newBuilder()
+      // Construct using com.openxc.BinaryMessages.DynamicField.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -3981,22 +13808,14 @@ public final class BinaryMessages {
 
       public Builder clear() {
         super.clear();
-        bus_ = 0;
+        type_ = com.openxc.BinaryMessages.DynamicField.Type.STRING;
         bitField0_ = (bitField0_ & ~0x00000001);
-        messageId_ = 0;
+        stringValue_ = "";
         bitField0_ = (bitField0_ & ~0x00000002);
-        mode_ = 0;
+        numericValue_ = 0D;
         bitField0_ = (bitField0_ & ~0x00000004);
-        pid_ = 0;
+        booleanValue_ = false;
         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;
       }
 
@@ -4006,539 +13825,350 @@ public final class BinaryMessages {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return com.openxc.BinaryMessages.internal_static_openxc_DiagnosticResponse_descriptor;
+        return com.openxc.BinaryMessages.internal_static_openxc_DynamicField_descriptor;
       }
 
-      public com.openxc.BinaryMessages.DiagnosticResponse getDefaultInstanceForType() {
-        return com.openxc.BinaryMessages.DiagnosticResponse.getDefaultInstance();
+      public com.openxc.BinaryMessages.DynamicField getDefaultInstanceForType() {
+        return com.openxc.BinaryMessages.DynamicField.getDefaultInstance();
       }
 
-      public com.openxc.BinaryMessages.DiagnosticResponse build() {
-        com.openxc.BinaryMessages.DiagnosticResponse result = buildPartial();
+      public com.openxc.BinaryMessages.DynamicField build() {
+        com.openxc.BinaryMessages.DynamicField result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public com.openxc.BinaryMessages.DiagnosticResponse buildPartial() {
-        com.openxc.BinaryMessages.DiagnosticResponse result = new com.openxc.BinaryMessages.DiagnosticResponse(this);
+      public com.openxc.BinaryMessages.DynamicField buildPartial() {
+        com.openxc.BinaryMessages.DynamicField result = new com.openxc.BinaryMessages.DynamicField(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
           to_bitField0_ |= 0x00000001;
         }
-        result.bus_ = bus_;
+        result.type_ = type_;
         if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
           to_bitField0_ |= 0x00000002;
         }
-        result.messageId_ = messageId_;
+        result.stringValue_ = stringValue_;
         if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
           to_bitField0_ |= 0x00000004;
         }
-        result.mode_ = mode_;
+        result.numericValue_ = numericValue_;
         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.booleanValue_ = booleanValue_;
         result.bitField0_ = to_bitField0_;
         onBuilt();
         return result;
       }
 
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.openxc.BinaryMessages.DiagnosticResponse) {
-          return mergeFrom((com.openxc.BinaryMessages.DiagnosticResponse)other);
+        if (other instanceof com.openxc.BinaryMessages.DynamicField) {
+          return mergeFrom((com.openxc.BinaryMessages.DynamicField)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(com.openxc.BinaryMessages.DiagnosticResponse other) {
-        if (other == com.openxc.BinaryMessages.DiagnosticResponse.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());
+      public Builder mergeFrom(com.openxc.BinaryMessages.DynamicField other) {
+        if (other == com.openxc.BinaryMessages.DynamicField.getDefaultInstance()) return this;
+        if (other.hasType()) {
+          setType(other.getType());
         }
-        if (other.hasValue()) {
-          setValue(other.getValue());
+        if (other.hasStringValue()) {
+          bitField0_ |= 0x00000002;
+          stringValue_ = other.stringValue_;
+          onChanged();
         }
-        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.DiagnosticResponse parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (com.openxc.BinaryMessages.DiagnosticResponse) e.getUnfinishedMessage();
-          throw e;
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
+        if (other.hasNumericValue()) {
+          setNumericValue(other.getNumericValue());
         }
+        if (other.hasBooleanValue()) {
+          setBooleanValue(other.getBooleanValue());
+        }
+        this.mergeUnknownFields(other.getUnknownFields());
         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();
+
+      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.DynamicField parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.openxc.BinaryMessages.DynamicField) e.getUnfinishedMessage();
+          throw e;
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
         return this;
       }
+      private int bitField0_;
 
-      // optional uint32 pid = 4;
-      private int pid_ ;
+      // optional .openxc.DynamicField.Type type = 1;
+      private com.openxc.BinaryMessages.DynamicField.Type type_ = com.openxc.BinaryMessages.DynamicField.Type.STRING;
       /**
-       * <code>optional uint32 pid = 4;</code>
+       * <code>optional .openxc.DynamicField.Type type = 1;</code>
        */
-      public boolean hasPid() {
-        return ((bitField0_ & 0x00000008) == 0x00000008);
+      public boolean hasType() {
+        return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * <code>optional uint32 pid = 4;</code>
+       * <code>optional .openxc.DynamicField.Type type = 1;</code>
        */
-      public int getPid() {
-        return pid_;
+      public com.openxc.BinaryMessages.DynamicField.Type getType() {
+        return type_;
       }
       /**
-       * <code>optional uint32 pid = 4;</code>
+       * <code>optional .openxc.DynamicField.Type type = 1;</code>
        */
-      public Builder setPid(int value) {
-        bitField0_ |= 0x00000008;
-        pid_ = value;
+      public Builder setType(com.openxc.BinaryMessages.DynamicField.Type value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        bitField0_ |= 0x00000001;
+        type_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>optional uint32 pid = 4;</code>
+       * <code>optional .openxc.DynamicField.Type type = 1;</code>
        */
-      public Builder clearPid() {
-        bitField0_ = (bitField0_ & ~0x00000008);
-        pid_ = 0;
+      public Builder clearType() {
+        bitField0_ = (bitField0_ & ~0x00000001);
+        type_ = com.openxc.BinaryMessages.DynamicField.Type.STRING;
         onChanged();
         return this;
       }
 
-      // optional bool success = 5;
-      private boolean success_ ;
+      // optional string string_value = 2;
+      private java.lang.Object stringValue_ = "";
       /**
-       * <code>optional bool success = 5;</code>
+       * <code>optional string string_value = 2;</code>
        */
-      public boolean hasSuccess() {
-        return ((bitField0_ & 0x00000010) == 0x00000010);
+      public boolean hasStringValue() {
+        return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * <code>optional bool success = 5;</code>
+       * <code>optional string string_value = 2;</code>
        */
-      public boolean getSuccess() {
-        return success_;
+      public java.lang.String getStringValue() {
+        java.lang.Object ref = stringValue_;
+        if (!(ref instanceof java.lang.String)) {
+          java.lang.String s = ((com.google.protobuf.ByteString) ref)
+              .toStringUtf8();
+          stringValue_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
       }
       /**
-       * <code>optional bool success = 5;</code>
+       * <code>optional string string_value = 2;</code>
        */
-      public Builder setSuccess(boolean value) {
-        bitField0_ |= 0x00000010;
-        success_ = value;
-        onChanged();
-        return this;
+      public com.google.protobuf.ByteString
+          getStringValueBytes() {
+        java.lang.Object ref = stringValue_;
+        if (ref instanceof 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;
+        }
       }
       /**
-       * <code>optional bool success = 5;</code>
+       * <code>optional string string_value = 2;</code>
        */
-      public Builder clearSuccess() {
-        bitField0_ = (bitField0_ & ~0x00000010);
-        success_ = false;
+      public Builder setStringValue(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000002;
+        stringValue_ = value;
         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>
+       * <code>optional string string_value = 2;</code>
        */
-      public Builder setNegativeResponseCode(int value) {
-        bitField0_ |= 0x00000020;
-        negativeResponseCode_ = value;
+      public Builder clearStringValue() {
+        bitField0_ = (bitField0_ & ~0x00000002);
+        stringValue_ = getDefaultInstance().getStringValue();
         onChanged();
         return this;
       }
       /**
-       * <code>optional uint32 negative_response_code = 6;</code>
+       * <code>optional string string_value = 2;</code>
        */
-      public Builder clearNegativeResponseCode() {
-        bitField0_ = (bitField0_ & ~0x00000020);
-        negativeResponseCode_ = 0;
+      public Builder setStringValueBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000002;
+        stringValue_ = value;
         onChanged();
         return this;
       }
 
-      // optional bytes payload = 7;
-      private com.google.protobuf.ByteString payload_ = com.google.protobuf.ByteString.EMPTY;
+      // optional double numeric_value = 3;
+      private double numericValue_ ;
       /**
-       * <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>
+       * <code>optional double numeric_value = 3;</code>
        */
-      public boolean hasPayload() {
-        return ((bitField0_ & 0x00000040) == 0x00000040);
+      public boolean hasNumericValue() {
+        return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * <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>
+       * <code>optional double numeric_value = 3;</code>
        */
-      public com.google.protobuf.ByteString getPayload() {
-        return payload_;
+      public double getNumericValue() {
+        return numericValue_;
       }
       /**
-       * <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>
+       * <code>optional double numeric_value = 3;</code>
        */
-      public Builder setPayload(com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000040;
-        payload_ = value;
+      public Builder setNumericValue(double value) {
+        bitField0_ |= 0x00000004;
+        numericValue_ = 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>
+       * <code>optional double numeric_value = 3;</code>
        */
-      public Builder clearPayload() {
-        bitField0_ = (bitField0_ & ~0x00000040);
-        payload_ = getDefaultInstance().getPayload();
+      public Builder clearNumericValue() {
+        bitField0_ = (bitField0_ & ~0x00000004);
+        numericValue_ = 0D;
         onChanged();
         return this;
       }
 
-      // optional double value = 8;
-      private double value_ ;
+      // optional bool boolean_value = 4;
+      private boolean booleanValue_ ;
       /**
-       * <code>optional double value = 8;</code>
+       * <code>optional bool boolean_value = 4;</code>
        */
-      public boolean hasValue() {
-        return ((bitField0_ & 0x00000080) == 0x00000080);
+      public boolean hasBooleanValue() {
+        return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * <code>optional double value = 8;</code>
+       * <code>optional bool boolean_value = 4;</code>
        */
-      public double getValue() {
-        return value_;
+      public boolean getBooleanValue() {
+        return booleanValue_;
       }
       /**
-       * <code>optional double value = 8;</code>
+       * <code>optional bool boolean_value = 4;</code>
        */
-      public Builder setValue(double value) {
-        bitField0_ |= 0x00000080;
-        value_ = value;
+      public Builder setBooleanValue(boolean value) {
+        bitField0_ |= 0x00000008;
+        booleanValue_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>optional double value = 8;</code>
+       * <code>optional bool boolean_value = 4;</code>
        */
-      public Builder clearValue() {
-        bitField0_ = (bitField0_ & ~0x00000080);
-        value_ = 0D;
+      public Builder clearBooleanValue() {
+        bitField0_ = (bitField0_ & ~0x00000008);
+        booleanValue_ = false;
         onChanged();
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:openxc.DiagnosticResponse)
+      // @@protoc_insertion_point(builder_scope:openxc.DynamicField)
     }
 
     static {
-      defaultInstance = new DiagnosticResponse(true);
+      defaultInstance = new DynamicField(true);
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:openxc.DiagnosticResponse)
+    // @@protoc_insertion_point(class_scope:openxc.DynamicField)
   }
 
-  public interface TranslatedMessageOrBuilder
+  public interface SimpleMessageOrBuilder
       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;
+    // optional string name = 1;
     /**
-     * <code>optional string name = 2;</code>
+     * <code>optional string name = 1;</code>
      */
     boolean hasName();
     /**
-     * <code>optional string name = 2;</code>
+     * <code>optional string name = 1;</code>
      */
     java.lang.String getName();
     /**
-     * <code>optional string name = 2;</code>
+     * <code>optional string name = 1;</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();
+    // optional .openxc.DynamicField value = 2;
     /**
-     * <code>optional string string_event = 6;</code>
+     * <code>optional .openxc.DynamicField value = 2;</code>
      */
-    java.lang.String getStringEvent();
-    /**
-     * <code>optional string string_event = 6;</code>
-     */
-    com.google.protobuf.ByteString
-        getStringEventBytes();
-
-    // optional double numeric_event = 7;
+    boolean hasValue();
     /**
-     * <code>optional double numeric_event = 7;</code>
+     * <code>optional .openxc.DynamicField value = 2;</code>
      */
-    boolean hasNumericEvent();
+    com.openxc.BinaryMessages.DynamicField getValue();
     /**
-     * <code>optional double numeric_event = 7;</code>
+     * <code>optional .openxc.DynamicField value = 2;</code>
      */
-    double getNumericEvent();
+    com.openxc.BinaryMessages.DynamicFieldOrBuilder getValueOrBuilder();
 
-    // optional bool boolean_event = 8;
+    // optional .openxc.DynamicField event = 3;
+    /**
+     * <code>optional .openxc.DynamicField event = 3;</code>
+     */
+    boolean hasEvent();
     /**
-     * <code>optional bool boolean_event = 8;</code>
+     * <code>optional .openxc.DynamicField event = 3;</code>
      */
-    boolean hasBooleanEvent();
+    com.openxc.BinaryMessages.DynamicField getEvent();
     /**
-     * <code>optional bool boolean_event = 8;</code>
+     * <code>optional .openxc.DynamicField event = 3;</code>
      */
-    boolean getBooleanEvent();
+    com.openxc.BinaryMessages.DynamicFieldOrBuilder getEventOrBuilder();
   }
   /**
-   * Protobuf type {@code openxc.TranslatedMessage}
+   * Protobuf type {@code openxc.SimpleMessage}
    */
-  public static final class TranslatedMessage extends
+  public static final class SimpleMessage extends
       com.google.protobuf.GeneratedMessage
-      implements TranslatedMessageOrBuilder {
-    // Use TranslatedMessage.newBuilder() to construct.
-    private TranslatedMessage(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+      implements SimpleMessageOrBuilder {
+    // Use SimpleMessage.newBuilder() to construct.
+    private SimpleMessage(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
       this.unknownFields = builder.getUnknownFields();
     }
-    private TranslatedMessage(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+    private SimpleMessage(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
 
-    private static final TranslatedMessage defaultInstance;
-    public static TranslatedMessage getDefaultInstance() {
+    private static final SimpleMessage defaultInstance;
+    public static SimpleMessage getDefaultInstance() {
       return defaultInstance;
     }
 
-    public TranslatedMessage getDefaultInstanceForType() {
+    public SimpleMessage getDefaultInstanceForType() {
       return defaultInstance;
     }
 
@@ -4548,7 +14178,7 @@ public final class BinaryMessages {
         getUnknownFields() {
       return this.unknownFields;
     }
-    private TranslatedMessage(
+    private SimpleMessage(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -4571,358 +14201,91 @@ public final class BinaryMessages {
               }
               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;
-              }
+            case 10: {
+              bitField0_ |= 0x00000001;
+              name_ = input.readBytes();
               break;
             }
             case 18: {
+              com.openxc.BinaryMessages.DynamicField.Builder subBuilder = null;
+              if (((bitField0_ & 0x00000002) == 0x00000002)) {
+                subBuilder = value_.toBuilder();
+              }
+              value_ = input.readMessage(com.openxc.BinaryMessages.DynamicField.PARSER, extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(value_);
+                value_ = subBuilder.buildPartial();
+              }
               bitField0_ |= 0x00000002;
-              name_ = input.readBytes();
               break;
             }
             case 26: {
+              com.openxc.BinaryMessages.DynamicField.Builder subBuilder = null;
+              if (((bitField0_ & 0x00000004) == 0x00000004)) {
+                subBuilder = event_.toBuilder();
+              }
+              event_ = input.readMessage(com.openxc.BinaryMessages.DynamicField.PARSER, extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(event_);
+                event_ = subBuilder.buildPartial();
+              }
               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;
+        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();
       }
     }
-
-    // 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_;
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.openxc.BinaryMessages.internal_static_openxc_SimpleMessage_descriptor;
     }
 
-    // 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);
+    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.openxc.BinaryMessages.internal_static_openxc_SimpleMessage_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.openxc.BinaryMessages.SimpleMessage.class, com.openxc.BinaryMessages.SimpleMessage.Builder.class);
     }
-    /**
-     * <code>optional bool boolean_value = 5;</code>
-     */
-    public boolean getBooleanValue() {
-      return booleanValue_;
+
+    public static com.google.protobuf.Parser<SimpleMessage> PARSER =
+        new com.google.protobuf.AbstractParser<SimpleMessage>() {
+      public SimpleMessage parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new SimpleMessage(input, extensionRegistry);
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<SimpleMessage> getParserForType() {
+      return PARSER;
     }
 
-    // optional string string_event = 6;
-    public static final int STRING_EVENT_FIELD_NUMBER = 6;
-    private java.lang.Object stringEvent_;
+    private int bitField0_;
+    // optional string name = 1;
+    public static final int NAME_FIELD_NUMBER = 1;
+    private java.lang.Object name_;
     /**
-     * <code>optional string string_event = 6;</code>
+     * <code>optional string name = 1;</code>
      */
-    public boolean hasStringEvent() {
-      return ((bitField0_ & 0x00000020) == 0x00000020);
+    public boolean hasName() {
+      return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * <code>optional string string_event = 6;</code>
+     * <code>optional string name = 1;</code>
      */
-    public java.lang.String getStringEvent() {
-      java.lang.Object ref = stringEvent_;
+    public java.lang.String getName() {
+      java.lang.Object ref = name_;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
@@ -4930,69 +14293,76 @@ public final class BinaryMessages {
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
-          stringEvent_ = s;
+          name_ = s;
         }
         return s;
       }
     }
     /**
-     * <code>optional string string_event = 6;</code>
+     * <code>optional string name = 1;</code>
      */
     public com.google.protobuf.ByteString
-        getStringEventBytes() {
-      java.lang.Object ref = stringEvent_;
+        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);
-        stringEvent_ = b;
+        name_ = b;
         return b;
       } else {
         return (com.google.protobuf.ByteString) ref;
       }
     }
 
-    // optional double numeric_event = 7;
-    public static final int NUMERIC_EVENT_FIELD_NUMBER = 7;
-    private double numericEvent_;
+    // optional .openxc.DynamicField value = 2;
+    public static final int VALUE_FIELD_NUMBER = 2;
+    private com.openxc.BinaryMessages.DynamicField value_;
     /**
-     * <code>optional double numeric_event = 7;</code>
+     * <code>optional .openxc.DynamicField value = 2;</code>
      */
-    public boolean hasNumericEvent() {
-      return ((bitField0_ & 0x00000040) == 0x00000040);
+    public boolean hasValue() {
+      return ((bitField0_ & 0x00000002) == 0x00000002);
+    }
+    /**
+     * <code>optional .openxc.DynamicField value = 2;</code>
+     */
+    public com.openxc.BinaryMessages.DynamicField getValue() {
+      return value_;
     }
     /**
-     * <code>optional double numeric_event = 7;</code>
+     * <code>optional .openxc.DynamicField value = 2;</code>
      */
-    public double getNumericEvent() {
-      return numericEvent_;
+    public com.openxc.BinaryMessages.DynamicFieldOrBuilder getValueOrBuilder() {
+      return value_;
     }
 
-    // optional bool boolean_event = 8;
-    public static final int BOOLEAN_EVENT_FIELD_NUMBER = 8;
-    private boolean booleanEvent_;
+    // optional .openxc.DynamicField event = 3;
+    public static final int EVENT_FIELD_NUMBER = 3;
+    private com.openxc.BinaryMessages.DynamicField event_;
     /**
-     * <code>optional bool boolean_event = 8;</code>
+     * <code>optional .openxc.DynamicField event = 3;</code>
      */
-    public boolean hasBooleanEvent() {
-      return ((bitField0_ & 0x00000080) == 0x00000080);
+    public boolean hasEvent() {
+      return ((bitField0_ & 0x00000004) == 0x00000004);
+    }
+    /**
+     * <code>optional .openxc.DynamicField event = 3;</code>
+     */
+    public com.openxc.BinaryMessages.DynamicField getEvent() {
+      return event_;
     }
     /**
-     * <code>optional bool boolean_event = 8;</code>
+     * <code>optional .openxc.DynamicField event = 3;</code>
      */
-    public boolean getBooleanEvent() {
-      return booleanEvent_;
+    public com.openxc.BinaryMessages.DynamicFieldOrBuilder getEventOrBuilder() {
+      return event_;
     }
 
     private void initFields() {
-      type_ = com.openxc.BinaryMessages.TranslatedMessage.Type.STRING;
       name_ = "";
-      stringValue_ = "";
-      numericValue_ = 0D;
-      booleanValue_ = false;
-      stringEvent_ = "";
-      numericEvent_ = 0D;
-      booleanEvent_ = false;
+      value_ = com.openxc.BinaryMessages.DynamicField.getDefaultInstance();
+      event_ = com.openxc.BinaryMessages.DynamicField.getDefaultInstance();
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -5007,28 +14377,13 @@ public final class BinaryMessages {
                         throws java.io.IOException {
       getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        output.writeEnum(1, type_.getNumber());
+        output.writeBytes(1, getNameBytes());
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        output.writeBytes(2, getNameBytes());
+        output.writeMessage(2, value_);
       }
       if (((bitField0_ & 0x00000004) == 0x00000004)) {
-        output.writeBytes(3, getStringValueBytes());
-      }
-      if (((bitField0_ & 0x00000008) == 0x00000008)) {
-        output.writeDouble(4, numericValue_);
-      }
-      if (((bitField0_ & 0x00000010) == 0x00000010)) {
-        output.writeBool(5, booleanValue_);
-      }
-      if (((bitField0_ & 0x00000020) == 0x00000020)) {
-        output.writeBytes(6, getStringEventBytes());
-      }
-      if (((bitField0_ & 0x00000040) == 0x00000040)) {
-        output.writeDouble(7, numericEvent_);
-      }
-      if (((bitField0_ & 0x00000080) == 0x00000080)) {
-        output.writeBool(8, booleanEvent_);
+        output.writeMessage(3, event_);
       }
       getUnknownFields().writeTo(output);
     }
@@ -5041,35 +14396,15 @@ public final class BinaryMessages {
       size = 0;
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(1, type_.getNumber());
+          .computeBytesSize(1, getNameBytes());
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(2, getNameBytes());
+          .computeMessageSize(2, value_);
       }
       if (((bitField0_ & 0x00000004) == 0x00000004)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(3, getStringValueBytes());
-      }
-      if (((bitField0_ & 0x00000008) == 0x00000008)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeDoubleSize(4, numericValue_);
-      }
-      if (((bitField0_ & 0x00000010) == 0x00000010)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(5, booleanValue_);
-      }
-      if (((bitField0_ & 0x00000020) == 0x00000020)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(6, getStringEventBytes());
-      }
-      if (((bitField0_ & 0x00000040) == 0x00000040)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeDoubleSize(7, numericEvent_);
-      }
-      if (((bitField0_ & 0x00000080) == 0x00000080)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(8, booleanEvent_);
+          .computeMessageSize(3, event_);
       }
       size += getUnknownFields().getSerializedSize();
       memoizedSerializedSize = size;
@@ -5083,53 +14418,53 @@ public final class BinaryMessages {
       return super.writeReplace();
     }
 
-    public static com.openxc.BinaryMessages.TranslatedMessage parseFrom(
+    public static com.openxc.BinaryMessages.SimpleMessage parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.openxc.BinaryMessages.TranslatedMessage parseFrom(
+    public static com.openxc.BinaryMessages.SimpleMessage 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.TranslatedMessage parseFrom(byte[] data)
+    public static com.openxc.BinaryMessages.SimpleMessage parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static com.openxc.BinaryMessages.TranslatedMessage parseFrom(
+    public static com.openxc.BinaryMessages.SimpleMessage parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static com.openxc.BinaryMessages.TranslatedMessage parseFrom(java.io.InputStream input)
+    public static com.openxc.BinaryMessages.SimpleMessage parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static com.openxc.BinaryMessages.TranslatedMessage parseFrom(
+    public static com.openxc.BinaryMessages.SimpleMessage parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static com.openxc.BinaryMessages.TranslatedMessage parseDelimitedFrom(java.io.InputStream input)
+    public static com.openxc.BinaryMessages.SimpleMessage parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static com.openxc.BinaryMessages.TranslatedMessage parseDelimitedFrom(
+    public static com.openxc.BinaryMessages.SimpleMessage parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static com.openxc.BinaryMessages.TranslatedMessage parseFrom(
+    public static com.openxc.BinaryMessages.SimpleMessage parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static com.openxc.BinaryMessages.TranslatedMessage parseFrom(
+    public static com.openxc.BinaryMessages.SimpleMessage parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -5138,7 +14473,7 @@ public final class BinaryMessages {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(com.openxc.BinaryMessages.TranslatedMessage prototype) {
+    public static Builder newBuilder(com.openxc.BinaryMessages.SimpleMessage prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -5150,24 +14485,24 @@ public final class BinaryMessages {
       return builder;
     }
     /**
-     * Protobuf type {@code openxc.TranslatedMessage}
+     * Protobuf type {@code openxc.SimpleMessage}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements com.openxc.BinaryMessages.TranslatedMessageOrBuilder {
+       implements com.openxc.BinaryMessages.SimpleMessageOrBuilder {
       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_SimpleMessage_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.openxc.BinaryMessages.internal_static_openxc_TranslatedMessage_fieldAccessorTable
+        return com.openxc.BinaryMessages.internal_static_openxc_SimpleMessage_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                com.openxc.BinaryMessages.TranslatedMessage.class, com.openxc.BinaryMessages.TranslatedMessage.Builder.class);
+                com.openxc.BinaryMessages.SimpleMessage.class, com.openxc.BinaryMessages.SimpleMessage.Builder.class);
       }
 
-      // Construct using com.openxc.BinaryMessages.TranslatedMessage.newBuilder()
+      // Construct using com.openxc.BinaryMessages.SimpleMessage.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -5179,6 +14514,8 @@ public final class BinaryMessages {
       }
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+          getValueFieldBuilder();
+          getEventFieldBuilder();
         }
       }
       private static Builder create() {
@@ -5187,22 +14524,20 @@ public final class BinaryMessages {
 
       public Builder clear() {
         super.clear();
-        type_ = com.openxc.BinaryMessages.TranslatedMessage.Type.STRING;
-        bitField0_ = (bitField0_ & ~0x00000001);
         name_ = "";
+        bitField0_ = (bitField0_ & ~0x00000001);
+        if (valueBuilder_ == null) {
+          value_ = com.openxc.BinaryMessages.DynamicField.getDefaultInstance();
+        } else {
+          valueBuilder_.clear();
+        }
         bitField0_ = (bitField0_ & ~0x00000002);
-        stringValue_ = "";
+        if (eventBuilder_ == null) {
+          event_ = com.openxc.BinaryMessages.DynamicField.getDefaultInstance();
+        } else {
+          eventBuilder_.clear();
+        }
         bitField0_ = (bitField0_ & ~0x00000004);
-        numericValue_ = 0D;
-        bitField0_ = (bitField0_ & ~0x00000008);
-        booleanValue_ = false;
-        bitField0_ = (bitField0_ & ~0x00000010);
-        stringEvent_ = "";
-        bitField0_ = (bitField0_ & ~0x00000020);
-        numericEvent_ = 0D;
-        bitField0_ = (bitField0_ & ~0x00000040);
-        booleanEvent_ = false;
-        bitField0_ = (bitField0_ & ~0x00000080);
         return this;
       }
 
@@ -5212,102 +14547,71 @@ public final class BinaryMessages {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return com.openxc.BinaryMessages.internal_static_openxc_TranslatedMessage_descriptor;
+        return com.openxc.BinaryMessages.internal_static_openxc_SimpleMessage_descriptor;
       }
 
-      public com.openxc.BinaryMessages.TranslatedMessage getDefaultInstanceForType() {
-        return com.openxc.BinaryMessages.TranslatedMessage.getDefaultInstance();
+      public com.openxc.BinaryMessages.SimpleMessage getDefaultInstanceForType() {
+        return com.openxc.BinaryMessages.SimpleMessage.getDefaultInstance();
       }
 
-      public com.openxc.BinaryMessages.TranslatedMessage build() {
-        com.openxc.BinaryMessages.TranslatedMessage result = buildPartial();
+      public com.openxc.BinaryMessages.SimpleMessage build() {
+        com.openxc.BinaryMessages.SimpleMessage result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public com.openxc.BinaryMessages.TranslatedMessage buildPartial() {
-        com.openxc.BinaryMessages.TranslatedMessage result = new com.openxc.BinaryMessages.TranslatedMessage(this);
+      public com.openxc.BinaryMessages.SimpleMessage buildPartial() {
+        com.openxc.BinaryMessages.SimpleMessage result = new com.openxc.BinaryMessages.SimpleMessage(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
           to_bitField0_ |= 0x00000001;
         }
-        result.type_ = type_;
+        result.name_ = name_;
         if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
           to_bitField0_ |= 0x00000002;
         }
-        result.name_ = name_;
+        if (valueBuilder_ == null) {
+          result.value_ = value_;
+        } else {
+          result.value_ = valueBuilder_.build();
+        }
         if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
           to_bitField0_ |= 0x00000004;
         }
-        result.stringValue_ = stringValue_;
-        if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
-          to_bitField0_ |= 0x00000008;
-        }
-        result.numericValue_ = numericValue_;
-        if (((from_bitField0_ & 0x00000010) == 0x00000010)) {
-          to_bitField0_ |= 0x00000010;
-        }
-        result.booleanValue_ = booleanValue_;
-        if (((from_bitField0_ & 0x00000020) == 0x00000020)) {
-          to_bitField0_ |= 0x00000020;
-        }
-        result.stringEvent_ = stringEvent_;
-        if (((from_bitField0_ & 0x00000040) == 0x00000040)) {
-          to_bitField0_ |= 0x00000040;
-        }
-        result.numericEvent_ = numericEvent_;
-        if (((from_bitField0_ & 0x00000080) == 0x00000080)) {
-          to_bitField0_ |= 0x00000080;
+        if (eventBuilder_ == null) {
+          result.event_ = event_;
+        } else {
+          result.event_ = eventBuilder_.build();
         }
-        result.booleanEvent_ = booleanEvent_;
         result.bitField0_ = to_bitField0_;
         onBuilt();
         return result;
       }
 
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.openxc.BinaryMessages.TranslatedMessage) {
-          return mergeFrom((com.openxc.BinaryMessages.TranslatedMessage)other);
+        if (other instanceof com.openxc.BinaryMessages.SimpleMessage) {
+          return mergeFrom((com.openxc.BinaryMessages.SimpleMessage)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(com.openxc.BinaryMessages.TranslatedMessage other) {
-        if (other == com.openxc.BinaryMessages.TranslatedMessage.getDefaultInstance()) return this;
-        if (other.hasType()) {
-          setType(other.getType());
-        }
+      public Builder mergeFrom(com.openxc.BinaryMessages.SimpleMessage other) {
+        if (other == com.openxc.BinaryMessages.SimpleMessage.getDefaultInstance()) return this;
         if (other.hasName()) {
-          bitField0_ |= 0x00000002;
+          bitField0_ |= 0x00000001;
           name_ = other.name_;
           onChanged();
         }
-        if (other.hasStringValue()) {
-          bitField0_ |= 0x00000004;
-          stringValue_ = other.stringValue_;
-          onChanged();
-        }
-        if (other.hasNumericValue()) {
-          setNumericValue(other.getNumericValue());
-        }
-        if (other.hasBooleanValue()) {
-          setBooleanValue(other.getBooleanValue());
-        }
-        if (other.hasStringEvent()) {
-          bitField0_ |= 0x00000020;
-          stringEvent_ = other.stringEvent_;
-          onChanged();
-        }
-        if (other.hasNumericEvent()) {
-          setNumericEvent(other.getNumericEvent());
+        if (other.hasValue()) {
+          mergeValue(other.getValue());
         }
-        if (other.hasBooleanEvent()) {
-          setBooleanEvent(other.getBooleanEvent());
+        if (other.hasEvent()) {
+          mergeEvent(other.getEvent());
         }
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
@@ -5318,423 +14622,341 @@ public final class BinaryMessages {
       }
 
       public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        com.openxc.BinaryMessages.TranslatedMessage parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (com.openxc.BinaryMessages.TranslatedMessage) e.getUnfinishedMessage();
-          throw e;
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
-        return this;
-      }
-      private int bitField0_;
-
-      // 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 = 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)) {
-          java.lang.String s = ((com.google.protobuf.ByteString) ref)
-              .toStringUtf8();
-          name_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * <code>optional string name = 2;</code>
-       */
-      public com.google.protobuf.ByteString
-          getNameBytes() {
-        java.lang.Object ref = name_;
-        if (ref instanceof 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;
-        }
-      }
-      /**
-       * <code>optional string name = 2;</code>
-       */
-      public Builder setName(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
-        name_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>optional string name = 2;</code>
-       */
-      public Builder clearName() {
-        bitField0_ = (bitField0_ & ~0x00000002);
-        name_ = getDefaultInstance().getName();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>optional string name = 2;</code>
-       */
-      public Builder setNameBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
-        name_ = value;
-        onChanged();
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        com.openxc.BinaryMessages.SimpleMessage parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.openxc.BinaryMessages.SimpleMessage) e.getUnfinishedMessage();
+          throw e;
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
         return this;
       }
+      private int bitField0_;
 
-      // optional string string_value = 3;
-      private java.lang.Object stringValue_ = "";
+      // optional string name = 1;
+      private java.lang.Object name_ = "";
       /**
-       * <code>optional string string_value = 3;</code>
+       * <code>optional string name = 1;</code>
        */
-      public boolean hasStringValue() {
-        return ((bitField0_ & 0x00000004) == 0x00000004);
+      public boolean hasName() {
+        return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * <code>optional string string_value = 3;</code>
+       * <code>optional string name = 1;</code>
        */
-      public java.lang.String getStringValue() {
-        java.lang.Object ref = stringValue_;
+      public java.lang.String getName() {
+        java.lang.Object ref = name_;
         if (!(ref instanceof java.lang.String)) {
           java.lang.String s = ((com.google.protobuf.ByteString) ref)
               .toStringUtf8();
-          stringValue_ = s;
+          name_ = s;
           return s;
         } else {
           return (java.lang.String) ref;
         }
       }
       /**
-       * <code>optional string string_value = 3;</code>
+       * <code>optional string name = 1;</code>
        */
       public com.google.protobuf.ByteString
-          getStringValueBytes() {
-        java.lang.Object ref = stringValue_;
+          getNameBytes() {
+        java.lang.Object ref = name_;
         if (ref instanceof String) {
           com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
-          stringValue_ = b;
+          name_ = b;
           return b;
         } else {
           return (com.google.protobuf.ByteString) ref;
         }
       }
       /**
-       * <code>optional string string_value = 3;</code>
+       * <code>optional string name = 1;</code>
        */
-      public Builder setStringValue(
+      public Builder setName(
           java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
   }
-  bitField0_ |= 0x00000004;
-        stringValue_ = value;
+  bitField0_ |= 0x00000001;
+        name_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>optional string string_value = 3;</code>
+       * <code>optional string name = 1;</code>
        */
-      public Builder clearStringValue() {
-        bitField0_ = (bitField0_ & ~0x00000004);
-        stringValue_ = getDefaultInstance().getStringValue();
+      public Builder clearName() {
+        bitField0_ = (bitField0_ & ~0x00000001);
+        name_ = getDefaultInstance().getName();
         onChanged();
         return this;
       }
       /**
-       * <code>optional string string_value = 3;</code>
+       * <code>optional string name = 1;</code>
        */
-      public Builder setStringValueBytes(
+      public Builder setNameBytes(
           com.google.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
-  bitField0_ |= 0x00000004;
-        stringValue_ = value;
+  bitField0_ |= 0x00000001;
+        name_ = value;
         onChanged();
         return this;
       }
 
-      // optional double numeric_value = 4;
-      private double numericValue_ ;
+      // optional .openxc.DynamicField value = 2;
+      private com.openxc.BinaryMessages.DynamicField value_ = com.openxc.BinaryMessages.DynamicField.getDefaultInstance();
+      private com.google.protobuf.SingleFieldBuilder<
+          com.openxc.BinaryMessages.DynamicField, com.openxc.BinaryMessages.DynamicField.Builder, com.openxc.BinaryMessages.DynamicFieldOrBuilder> valueBuilder_;
       /**
-       * <code>optional double numeric_value = 4;</code>
+       * <code>optional .openxc.DynamicField value = 2;</code>
        */
-      public boolean hasNumericValue() {
-        return ((bitField0_ & 0x00000008) == 0x00000008);
+      public boolean hasValue() {
+        return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * <code>optional double numeric_value = 4;</code>
+       * <code>optional .openxc.DynamicField value = 2;</code>
        */
-      public double getNumericValue() {
-        return numericValue_;
+      public com.openxc.BinaryMessages.DynamicField getValue() {
+        if (valueBuilder_ == null) {
+          return value_;
+        } else {
+          return valueBuilder_.getMessage();
+        }
       }
       /**
-       * <code>optional double numeric_value = 4;</code>
+       * <code>optional .openxc.DynamicField value = 2;</code>
        */
-      public Builder setNumericValue(double value) {
-        bitField0_ |= 0x00000008;
-        numericValue_ = value;
-        onChanged();
+      public Builder setValue(com.openxc.BinaryMessages.DynamicField value) {
+        if (valueBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          value_ = value;
+          onChanged();
+        } else {
+          valueBuilder_.setMessage(value);
+        }
+        bitField0_ |= 0x00000002;
         return this;
       }
       /**
-       * <code>optional double numeric_value = 4;</code>
+       * <code>optional .openxc.DynamicField value = 2;</code>
        */
-      public Builder clearNumericValue() {
-        bitField0_ = (bitField0_ & ~0x00000008);
-        numericValue_ = 0D;
-        onChanged();
+      public Builder setValue(
+          com.openxc.BinaryMessages.DynamicField.Builder builderForValue) {
+        if (valueBuilder_ == null) {
+          value_ = builderForValue.build();
+          onChanged();
+        } else {
+          valueBuilder_.setMessage(builderForValue.build());
+        }
+        bitField0_ |= 0x00000002;
         return this;
       }
-
-      // optional bool boolean_value = 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_;
-      }
       /**
-       * <code>optional bool boolean_value = 5;</code>
+       * <code>optional .openxc.DynamicField value = 2;</code>
        */
-      public Builder setBooleanValue(boolean value) {
-        bitField0_ |= 0x00000010;
-        booleanValue_ = value;
-        onChanged();
+      public Builder mergeValue(com.openxc.BinaryMessages.DynamicField value) {
+        if (valueBuilder_ == null) {
+          if (((bitField0_ & 0x00000002) == 0x00000002) &&
+              value_ != com.openxc.BinaryMessages.DynamicField.getDefaultInstance()) {
+            value_ =
+              com.openxc.BinaryMessages.DynamicField.newBuilder(value_).mergeFrom(value).buildPartial();
+          } else {
+            value_ = value;
+          }
+          onChanged();
+        } else {
+          valueBuilder_.mergeFrom(value);
+        }
+        bitField0_ |= 0x00000002;
         return this;
       }
       /**
-       * <code>optional bool boolean_value = 5;</code>
+       * <code>optional .openxc.DynamicField value = 2;</code>
        */
-      public Builder clearBooleanValue() {
-        bitField0_ = (bitField0_ & ~0x00000010);
-        booleanValue_ = false;
-        onChanged();
+      public Builder clearValue() {
+        if (valueBuilder_ == null) {
+          value_ = com.openxc.BinaryMessages.DynamicField.getDefaultInstance();
+          onChanged();
+        } else {
+          valueBuilder_.clear();
+        }
+        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
-
-      // optional string string_event = 6;
-      private java.lang.Object stringEvent_ = "";
       /**
-       * <code>optional string string_event = 6;</code>
+       * <code>optional .openxc.DynamicField value = 2;</code>
        */
-      public boolean hasStringEvent() {
-        return ((bitField0_ & 0x00000020) == 0x00000020);
+      public com.openxc.BinaryMessages.DynamicField.Builder getValueBuilder() {
+        bitField0_ |= 0x00000002;
+        onChanged();
+        return getValueFieldBuilder().getBuilder();
       }
       /**
-       * <code>optional string string_event = 6;</code>
+       * <code>optional .openxc.DynamicField value = 2;</code>
        */
-      public java.lang.String getStringEvent() {
-        java.lang.Object ref = stringEvent_;
-        if (!(ref instanceof java.lang.String)) {
-          java.lang.String s = ((com.google.protobuf.ByteString) ref)
-              .toStringUtf8();
-          stringEvent_ = s;
-          return s;
+      public com.openxc.BinaryMessages.DynamicFieldOrBuilder getValueOrBuilder() {
+        if (valueBuilder_ != null) {
+          return valueBuilder_.getMessageOrBuilder();
         } else {
-          return (java.lang.String) ref;
+          return value_;
         }
       }
       /**
-       * <code>optional string string_event = 6;</code>
+       * <code>optional .openxc.DynamicField value = 2;</code>
        */
-      public com.google.protobuf.ByteString
-          getStringEventBytes() {
-        java.lang.Object ref = stringEvent_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          stringEvent_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
+      private com.google.protobuf.SingleFieldBuilder<
+          com.openxc.BinaryMessages.DynamicField, com.openxc.BinaryMessages.DynamicField.Builder, com.openxc.BinaryMessages.DynamicFieldOrBuilder> 
+          getValueFieldBuilder() {
+        if (valueBuilder_ == null) {
+          valueBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+              com.openxc.BinaryMessages.DynamicField, com.openxc.BinaryMessages.DynamicField.Builder, com.openxc.BinaryMessages.DynamicFieldOrBuilder>(
+                  value_,
+                  getParentForChildren(),
+                  isClean());
+          value_ = null;
         }
+        return valueBuilder_;
       }
+
+      // optional .openxc.DynamicField event = 3;
+      private com.openxc.BinaryMessages.DynamicField event_ = com.openxc.BinaryMessages.DynamicField.getDefaultInstance();
+      private com.google.protobuf.SingleFieldBuilder<
+          com.openxc.BinaryMessages.DynamicField, com.openxc.BinaryMessages.DynamicField.Builder, com.openxc.BinaryMessages.DynamicFieldOrBuilder> eventBuilder_;
       /**
-       * <code>optional string string_event = 6;</code>
+       * <code>optional .openxc.DynamicField event = 3;</code>
        */
-      public Builder setStringEvent(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000020;
-        stringEvent_ = value;
-        onChanged();
-        return this;
+      public boolean hasEvent() {
+        return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * <code>optional string string_event = 6;</code>
+       * <code>optional .openxc.DynamicField event = 3;</code>
        */
-      public Builder clearStringEvent() {
-        bitField0_ = (bitField0_ & ~0x00000020);
-        stringEvent_ = getDefaultInstance().getStringEvent();
-        onChanged();
-        return this;
+      public com.openxc.BinaryMessages.DynamicField getEvent() {
+        if (eventBuilder_ == null) {
+          return event_;
+        } else {
+          return eventBuilder_.getMessage();
+        }
       }
       /**
-       * <code>optional string string_event = 6;</code>
+       * <code>optional .openxc.DynamicField event = 3;</code>
        */
-      public Builder setStringEventBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000020;
-        stringEvent_ = value;
-        onChanged();
+      public Builder setEvent(com.openxc.BinaryMessages.DynamicField value) {
+        if (eventBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          event_ = value;
+          onChanged();
+        } else {
+          eventBuilder_.setMessage(value);
+        }
+        bitField0_ |= 0x00000004;
         return this;
       }
-
-      // optional double numeric_event = 7;
-      private double numericEvent_ ;
-      /**
-       * <code>optional double numeric_event = 7;</code>
-       */
-      public boolean hasNumericEvent() {
-        return ((bitField0_ & 0x00000040) == 0x00000040);
-      }
-      /**
-       * <code>optional double numeric_event = 7;</code>
-       */
-      public double getNumericEvent() {
-        return numericEvent_;
-      }
       /**
-       * <code>optional double numeric_event = 7;</code>
+       * <code>optional .openxc.DynamicField event = 3;</code>
        */
-      public Builder setNumericEvent(double value) {
-        bitField0_ |= 0x00000040;
-        numericEvent_ = value;
-        onChanged();
+      public Builder setEvent(
+          com.openxc.BinaryMessages.DynamicField.Builder builderForValue) {
+        if (eventBuilder_ == null) {
+          event_ = builderForValue.build();
+          onChanged();
+        } else {
+          eventBuilder_.setMessage(builderForValue.build());
+        }
+        bitField0_ |= 0x00000004;
         return this;
       }
       /**
-       * <code>optional double numeric_event = 7;</code>
+       * <code>optional .openxc.DynamicField event = 3;</code>
        */
-      public Builder clearNumericEvent() {
-        bitField0_ = (bitField0_ & ~0x00000040);
-        numericEvent_ = 0D;
-        onChanged();
+      public Builder mergeEvent(com.openxc.BinaryMessages.DynamicField value) {
+        if (eventBuilder_ == null) {
+          if (((bitField0_ & 0x00000004) == 0x00000004) &&
+              event_ != com.openxc.BinaryMessages.DynamicField.getDefaultInstance()) {
+            event_ =
+              com.openxc.BinaryMessages.DynamicField.newBuilder(event_).mergeFrom(value).buildPartial();
+          } else {
+            event_ = value;
+          }
+          onChanged();
+        } else {
+          eventBuilder_.mergeFrom(value);
+        }
+        bitField0_ |= 0x00000004;
         return this;
       }
-
-      // optional bool boolean_event = 8;
-      private boolean booleanEvent_ ;
       /**
-       * <code>optional bool boolean_event = 8;</code>
+       * <code>optional .openxc.DynamicField event = 3;</code>
        */
-      public boolean hasBooleanEvent() {
-        return ((bitField0_ & 0x00000080) == 0x00000080);
+      public Builder clearEvent() {
+        if (eventBuilder_ == null) {
+          event_ = com.openxc.BinaryMessages.DynamicField.getDefaultInstance();
+          onChanged();
+        } else {
+          eventBuilder_.clear();
+        }
+        bitField0_ = (bitField0_ & ~0x00000004);
+        return this;
       }
       /**
-       * <code>optional bool boolean_event = 8;</code>
+       * <code>optional .openxc.DynamicField event = 3;</code>
        */
-      public boolean getBooleanEvent() {
-        return booleanEvent_;
+      public com.openxc.BinaryMessages.DynamicField.Builder getEventBuilder() {
+        bitField0_ |= 0x00000004;
+        onChanged();
+        return getEventFieldBuilder().getBuilder();
       }
       /**
-       * <code>optional bool boolean_event = 8;</code>
+       * <code>optional .openxc.DynamicField event = 3;</code>
        */
-      public Builder setBooleanEvent(boolean value) {
-        bitField0_ |= 0x00000080;
-        booleanEvent_ = value;
-        onChanged();
-        return this;
+      public com.openxc.BinaryMessages.DynamicFieldOrBuilder getEventOrBuilder() {
+        if (eventBuilder_ != null) {
+          return eventBuilder_.getMessageOrBuilder();
+        } else {
+          return event_;
+        }
       }
       /**
-       * <code>optional bool boolean_event = 8;</code>
+       * <code>optional .openxc.DynamicField event = 3;</code>
        */
-      public Builder clearBooleanEvent() {
-        bitField0_ = (bitField0_ & ~0x00000080);
-        booleanEvent_ = false;
-        onChanged();
-        return this;
+      private com.google.protobuf.SingleFieldBuilder<
+          com.openxc.BinaryMessages.DynamicField, com.openxc.BinaryMessages.DynamicField.Builder, com.openxc.BinaryMessages.DynamicFieldOrBuilder> 
+          getEventFieldBuilder() {
+        if (eventBuilder_ == null) {
+          eventBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+              com.openxc.BinaryMessages.DynamicField, com.openxc.BinaryMessages.DynamicField.Builder, com.openxc.BinaryMessages.DynamicFieldOrBuilder>(
+                  event_,
+                  getParentForChildren(),
+                  isClean());
+          event_ = null;
+        }
+        return eventBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:openxc.TranslatedMessage)
+      // @@protoc_insertion_point(builder_scope:openxc.SimpleMessage)
     }
 
     static {
-      defaultInstance = new TranslatedMessage(true);
+      defaultInstance = new SimpleMessage(true);
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:openxc.TranslatedMessage)
+    // @@protoc_insertion_point(class_scope:openxc.SimpleMessage)
   }
 
   private static com.google.protobuf.Descriptors.Descriptor
@@ -5743,15 +14965,75 @@ public final class BinaryMessages {
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_openxc_VehicleMessage_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_openxc_RawMessage_descriptor;
+    internal_static_openxc_CanMessage_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_openxc_RawMessage_fieldAccessorTable;
+      internal_static_openxc_CanMessage_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
     internal_static_openxc_ControlCommand_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_openxc_ControlCommand_fieldAccessorTable;
+  private static com.google.protobuf.Descriptors.Descriptor
+    internal_static_openxc_DiagnosticControlCommand_descriptor;
+  private static
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_openxc_DiagnosticControlCommand_fieldAccessorTable;
+  private static com.google.protobuf.Descriptors.Descriptor
+    internal_static_openxc_PassthroughModeControlCommand_descriptor;
+  private static
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_openxc_PassthroughModeControlCommand_fieldAccessorTable;
+  private static com.google.protobuf.Descriptors.Descriptor
+    internal_static_openxc_AcceptanceFilterBypassCommand_descriptor;
+  private static
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_openxc_AcceptanceFilterBypassCommand_fieldAccessorTable;
+  private static com.google.protobuf.Descriptors.Descriptor
+    internal_static_openxc_PayloadFormatCommand_descriptor;
+  private static
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_openxc_PayloadFormatCommand_fieldAccessorTable;
+  private static com.google.protobuf.Descriptors.Descriptor
+    internal_static_openxc_PredefinedObd2RequestsCommand_descriptor;
+  private static
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_openxc_PredefinedObd2RequestsCommand_fieldAccessorTable;
+  private static com.google.protobuf.Descriptors.Descriptor
+    internal_static_openxc_NetworkOperatorSettings_descriptor;
+  private static
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_openxc_NetworkOperatorSettings_fieldAccessorTable;
+  private static com.google.protobuf.Descriptors.Descriptor
+    internal_static_openxc_NetworkOperatorSettings_NetworkDescriptor_descriptor;
+  private static
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_openxc_NetworkOperatorSettings_NetworkDescriptor_fieldAccessorTable;
+  private static com.google.protobuf.Descriptors.Descriptor
+    internal_static_openxc_NetworkDataSettings_descriptor;
+  private static
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_openxc_NetworkDataSettings_fieldAccessorTable;
+  private static com.google.protobuf.Descriptors.Descriptor
+    internal_static_openxc_ServerConnectSettings_descriptor;
+  private static
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_openxc_ServerConnectSettings_fieldAccessorTable;
+  private static com.google.protobuf.Descriptors.Descriptor
+    internal_static_openxc_ModemConfigurationCommand_descriptor;
+  private static
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_openxc_ModemConfigurationCommand_fieldAccessorTable;
+  private static com.google.protobuf.Descriptors.Descriptor
+    internal_static_openxc_RTCConfigurationCommand_descriptor;
+  private static
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_openxc_RTCConfigurationCommand_fieldAccessorTable;
+  private static com.google.protobuf.Descriptors.Descriptor
+    internal_static_openxc_CommandResponse_descriptor;
+  private static
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_openxc_CommandResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
     internal_static_openxc_DiagnosticRequest_descriptor;
   private static
@@ -5763,10 +15045,15 @@ public final class BinaryMessages {
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_openxc_DiagnosticResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_openxc_TranslatedMessage_descriptor;
+    internal_static_openxc_DynamicField_descriptor;
+  private static
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_openxc_DynamicField_fieldAccessorTable;
+  private static com.google.protobuf.Descriptors.Descriptor
+    internal_static_openxc_SimpleMessage_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_openxc_TranslatedMessage_fieldAccessorTable;
+      internal_static_openxc_SimpleMessage_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -5776,36 +15063,93 @@ public final class BinaryMessages {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\014openxc.proto\022\006openxc\"\205\002\n\016VehicleMessag" +
+      "\n\014openxc.proto\022\006openxc\"\233\003\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\0227\n\023diagnostic_respo" +
-      "nse\030\004 \001(\0132\032.openxc.DiagnosticResponse\"/\n" +
-      "\004Type\022\007\n\003RAW\020\001\022\016\n\nTRANSLATED\020\002\022\016\n\nDIAGNO" +
-      "STIC\020\003\";\n\nRawMessage\022\013\n\003bus\030\001 \001(\005\022\022\n\nmes" +
-      "sage_id\030\002 \001(\r\022\014\n\004data\030\003 \001(\014\"\246\001\n\016ControlC" +
-      "ommand\022)\n\004type\030\001 \001(\0162\033.openxc.ControlCom",
-      "mand.Type\0225\n\022diagnostic_request\030\002 \001(\0132\031." +
-      "openxc.DiagnosticRequest\"2\n\004Type\022\013\n\007VERS" +
-      "ION\020\001\022\r\n\tDEVICE_ID\020\002\022\016\n\nDIAGNOSTIC\020\003\"\252\001\n" +
-      "\021DiagnosticRequest\022\013\n\003bus\030\001 \001(\005\022\022\n\nmessa" +
-      "ge_id\030\002 \001(\r\022\014\n\004mode\030\003 \001(\r\022\013\n\003pid\030\004 \001(\r\022\017" +
-      "\n\007payload\030\005 \001(\014\022\025\n\rparse_payload\030\006 \001(\010\022\016" +
-      "\n\006factor\030\007 \001(\001\022\016\n\006offset\030\010 \001(\001\022\021\n\tfreque" +
-      "ncy\030\t \001(\001\"\241\001\n\022DiagnosticResponse\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\026negativ",
-      "e_response_code\030\006 \001(\r\022\017\n\007payload\030\007 \001(\014\022\r" +
-      "\n\005value\030\010 \001(\001\"\265\002\n\021TranslatedMessage\022,\n\004t" +
-      "ype\030\001 \001(\0162\036.openxc.TranslatedMessage.Typ" +
-      "e\022\014\n\004name\030\002 \001(\t\022\024\n\014string_value\030\003 \001(\t\022\025\n" +
-      "\rnumeric_value\030\004 \001(\001\022\025\n\rboolean_value\030\005 " +
-      "\001(\010\022\024\n\014string_event\030\006 \001(\t\022\025\n\rnumeric_eve" +
-      "nt\030\007 \001(\001\022\025\n\rboolean_event\030\010 \001(\010\"\\\n\004Type\022" +
-      "\n\n\006STRING\020\001\022\007\n\003NUM\020\002\022\010\n\004BOOL\020\003\022\022\n\016EVENTE" +
-      "D_STRING\020\004\022\017\n\013EVENTED_NUM\020\005\022\020\n\014EVENTED_B" +
-      "OOL\020\006B\034\n\ncom.openxcB\016BinaryMessages"
+      "Type\022\'\n\013can_message\030\002 \001(\0132\022.openxc.CanMe" +
+      "ssage\022-\n\016simple_message\030\003 \001(\0132\025.openxc.S" +
+      "impleMessage\0227\n\023diagnostic_response\030\004 \001(" +
+      "\0132\032.openxc.DiagnosticResponse\022/\n\017control" +
+      "_command\030\005 \001(\0132\026.openxc.ControlCommand\0221" +
+      "\n\020command_response\030\006 \001(\0132\027.openxc.Comman" +
+      "dResponse\022\021\n\ttimestamp\030\007 \001(\004\"V\n\004Type\022\007\n\003" +
+      "CAN\020\001\022\n\n\006SIMPLE\020\002\022\016\n\nDIAGNOSTIC\020\003\022\023\n\017CON",
+      "TROL_COMMAND\020\004\022\024\n\020COMMAND_RESPONSE\020\005\"\224\001\n" +
+      "\nCanMessage\022\013\n\003bus\030\001 \001(\005\022\n\n\002id\030\002 \001(\r\022\014\n\004" +
+      "data\030\003 \001(\014\0224\n\014frame_format\030\004 \001(\0162\036.openx" +
+      "c.CanMessage.FrameFormat\")\n\013FrameFormat\022" +
+      "\014\n\010STANDARD\020\001\022\014\n\010EXTENDED\020\002\"\211\006\n\016ControlC" +
+      "ommand\022)\n\004type\030\001 \001(\0162\033.openxc.ControlCom" +
+      "mand.Type\022<\n\022diagnostic_request\030\002 \001(\0132 ." +
+      "openxc.DiagnosticControlCommand\022G\n\030passt" +
+      "hrough_mode_request\030\003 \001(\0132%.openxc.Passt" +
+      "hroughModeControlCommand\022O\n acceptance_f",
+      "ilter_bypass_command\030\004 \001(\0132%.openxc.Acce" +
+      "ptanceFilterBypassCommand\022<\n\026payload_for" +
+      "mat_command\030\005 \001(\0132\034.openxc.PayloadFormat" +
+      "Command\022O\n predefined_obd2_requests_comm" +
+      "and\030\006 \001(\0132%.openxc.PredefinedObd2Request" +
+      "sCommand\022F\n\033modem_configuration_command\030" +
+      "\007 \001(\0132!.openxc.ModemConfigurationCommand" +
+      "\022B\n\031rtc_configuration_command\030\010 \001(\0132\037.op" +
+      "enxc.RTCConfigurationCommand\"\330\001\n\004Type\022\013\n" +
+      "\007VERSION\020\001\022\r\n\tDEVICE_ID\020\002\022\016\n\nDIAGNOSTIC\020",
+      "\003\022\017\n\013PASSTHROUGH\020\004\022\034\n\030ACCEPTANCE_FILTER_" +
+      "BYPASS\020\005\022\022\n\016PAYLOAD_FORMAT\020\006\022\034\n\030PREDEFIN" +
+      "ED_OBD2_REQUESTS\020\007\022\027\n\023MODEM_CONFIGURATIO" +
+      "N\020\010\022\025\n\021RTC_CONFIGURATION\020\t\022\023\n\017SD_MOUNT_S" +
+      "TATUS\020\n\"\236\001\n\030DiagnosticControlCommand\022*\n\007" +
+      "request\030\001 \001(\0132\031.openxc.DiagnosticRequest" +
+      "\0227\n\006action\030\002 \001(\0162\'.openxc.DiagnosticCont" +
+      "rolCommand.Action\"\035\n\006Action\022\007\n\003ADD\020\001\022\n\n\006" +
+      "CANCEL\020\002\"=\n\035PassthroughModeControlComman" +
+      "d\022\013\n\003bus\030\001 \001(\005\022\017\n\007enabled\030\002 \001(\010\"<\n\035Accep",
+      "tanceFilterBypassCommand\022\013\n\003bus\030\001 \001(\005\022\016\n" +
+      "\006bypass\030\002 \001(\010\"\214\001\n\024PayloadFormatCommand\022:" +
+      "\n\006format\030\001 \001(\0162*.openxc.PayloadFormatCom" +
+      "mand.PayloadFormat\"8\n\rPayloadFormat\022\010\n\004J" +
+      "SON\020\001\022\014\n\010PROTOBUF\020\002\022\017\n\013MESSAGEPACK\020\003\"0\n\035" +
+      "PredefinedObd2RequestsCommand\022\017\n\007enabled" +
+      "\030\001 \001(\010\"\321\003\n\027NetworkOperatorSettings\022\030\n\020al" +
+      "lowDataRoaming\030\001 \001(\010\022N\n\022operatorSelectMo" +
+      "de\030\002 \001(\01622.openxc.NetworkOperatorSetting" +
+      "s.OperatorSelectMode\022L\n\021networkDescripto",
+      "r\030\003 \001(\01321.openxc.NetworkOperatorSettings" +
+      ".NetworkDescriptor\032\230\001\n\021NetworkDescriptor" +
+      "\022\014\n\004PLMN\030\001 \001(\r\022R\n\013networkType\030\002 \001(\0162=.op" +
+      "enxc.NetworkOperatorSettings.NetworkDesc" +
+      "riptor.NetworkType\"!\n\013NetworkType\022\007\n\003GSM" +
+      "\020\000\022\t\n\005UTRAN\020\002\"c\n\022OperatorSelectMode\022\r\n\tA" +
+      "UTOMATIC\020\000\022\n\n\006MANUAL\020\001\022\016\n\nDEREGISTER\020\002\022\014" +
+      "\n\010SET_ONLY\020\003\022\024\n\020MANUAL_AUTOMATIC\020\004\"\"\n\023Ne" +
+      "tworkDataSettings\022\013\n\003APN\030\001 \001(\t\"3\n\025Server" +
+      "ConnectSettings\022\014\n\004host\030\001 \001(\t\022\014\n\004port\030\002 ",
+      "\001(\r\"\325\001\n\031ModemConfigurationCommand\022@\n\027net" +
+      "workOperatorSettings\030\001 \001(\0132\037.openxc.Netw" +
+      "orkOperatorSettings\0228\n\023networkDataSettin" +
+      "gs\030\002 \001(\0132\033.openxc.NetworkDataSettings\022<\n" +
+      "\025serverConnectSettings\030\003 \001(\0132\035.openxc.Se" +
+      "rverConnectSettings\",\n\027RTCConfigurationC" +
+      "ommand\022\021\n\tunix_time\030\001 \001(\r\"]\n\017CommandResp" +
+      "onse\022)\n\004type\030\001 \001(\0162\033.openxc.ControlComma" +
+      "nd.Type\022\017\n\007message\030\002 \001(\t\022\016\n\006status\030\003 \001(\010" +
+      "\"\375\001\n\021DiagnosticRequest\022\013\n\003bus\030\001 \001(\005\022\022\n\nm",
+      "essage_id\030\002 \001(\r\022\014\n\004mode\030\003 \001(\r\022\013\n\003pid\030\004 \001" +
+      "(\r\022\017\n\007payload\030\005 \001(\014\022\032\n\022multiple_response" +
+      "s\030\006 \001(\010\022\021\n\tfrequency\030\007 \001(\001\022\014\n\004name\030\010 \001(\t" +
+      "\022;\n\014decoded_type\030\t \001(\0162%.openxc.Diagnost" +
+      "icRequest.DecodedType\"!\n\013DecodedType\022\010\n\004" +
+      "NONE\020\001\022\010\n\004OBD2\020\002\"\241\001\n\022DiagnosticResponse\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\026" +
+      "negative_response_code\030\006 \001(\r\022\017\n\007payload\030" +
+      "\007 \001(\014\022\r\n\005value\030\010 \001(\001\"\242\001\n\014DynamicField\022\'\n",
+      "\004type\030\001 \001(\0162\031.openxc.DynamicField.Type\022\024" +
+      "\n\014string_value\030\002 \001(\t\022\025\n\rnumeric_value\030\003 " +
+      "\001(\001\022\025\n\rboolean_value\030\004 \001(\010\"%\n\004Type\022\n\n\006ST" +
+      "RING\020\001\022\007\n\003NUM\020\002\022\010\n\004BOOL\020\003\"g\n\rSimpleMessa" +
+      "ge\022\014\n\004name\030\001 \001(\t\022#\n\005value\030\002 \001(\0132\024.openxc" +
+      ".DynamicField\022#\n\005event\030\003 \001(\0132\024.openxc.Dy" +
+      "namicFieldB\034\n\ncom.openxcB\016BinaryMessages"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -5817,37 +15161,115 @@ 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", "DiagnosticResponse", });
-          internal_static_openxc_RawMessage_descriptor =
+              new java.lang.String[] { "Type", "CanMessage", "SimpleMessage", "DiagnosticResponse", "ControlCommand", "CommandResponse", "Timestamp", });
+          internal_static_openxc_CanMessage_descriptor =
             getDescriptor().getMessageTypes().get(1);
-          internal_static_openxc_RawMessage_fieldAccessorTable = new
+          internal_static_openxc_CanMessage_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_openxc_RawMessage_descriptor,
-              new java.lang.String[] { "Bus", "MessageId", "Data", });
+              internal_static_openxc_CanMessage_descriptor,
+              new java.lang.String[] { "Bus", "Id", "Data", "FrameFormat", });
           internal_static_openxc_ControlCommand_descriptor =
             getDescriptor().getMessageTypes().get(2);
           internal_static_openxc_ControlCommand_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_openxc_ControlCommand_descriptor,
-              new java.lang.String[] { "Type", "DiagnosticRequest", });
-          internal_static_openxc_DiagnosticRequest_descriptor =
+              new java.lang.String[] { "Type", "DiagnosticRequest", "PassthroughModeRequest", "AcceptanceFilterBypassCommand", "PayloadFormatCommand", "PredefinedObd2RequestsCommand", "ModemConfigurationCommand", "RtcConfigurationCommand", });
+          internal_static_openxc_DiagnosticControlCommand_descriptor =
             getDescriptor().getMessageTypes().get(3);
+          internal_static_openxc_DiagnosticControlCommand_fieldAccessorTable = new
+            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+              internal_static_openxc_DiagnosticControlCommand_descriptor,
+              new java.lang.String[] { "Request", "Action", });
+          internal_static_openxc_PassthroughModeControlCommand_descriptor =
+            getDescriptor().getMessageTypes().get(4);
+          internal_static_openxc_PassthroughModeControlCommand_fieldAccessorTable = new
+            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+              internal_static_openxc_PassthroughModeControlCommand_descriptor,
+              new java.lang.String[] { "Bus", "Enabled", });
+          internal_static_openxc_AcceptanceFilterBypassCommand_descriptor =
+            getDescriptor().getMessageTypes().get(5);
+          internal_static_openxc_AcceptanceFilterBypassCommand_fieldAccessorTable = new
+            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+              internal_static_openxc_AcceptanceFilterBypassCommand_descriptor,
+              new java.lang.String[] { "Bus", "Bypass", });
+          internal_static_openxc_PayloadFormatCommand_descriptor =
+            getDescriptor().getMessageTypes().get(6);
+          internal_static_openxc_PayloadFormatCommand_fieldAccessorTable = new
+            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+              internal_static_openxc_PayloadFormatCommand_descriptor,
+              new java.lang.String[] { "Format", });
+          internal_static_openxc_PredefinedObd2RequestsCommand_descriptor =
+            getDescriptor().getMessageTypes().get(7);
+          internal_static_openxc_PredefinedObd2RequestsCommand_fieldAccessorTable = new
+            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+              internal_static_openxc_PredefinedObd2RequestsCommand_descriptor,
+              new java.lang.String[] { "Enabled", });
+          internal_static_openxc_NetworkOperatorSettings_descriptor =
+            getDescriptor().getMessageTypes().get(8);
+          internal_static_openxc_NetworkOperatorSettings_fieldAccessorTable = new
+            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+              internal_static_openxc_NetworkOperatorSettings_descriptor,
+              new java.lang.String[] { "AllowDataRoaming", "OperatorSelectMode", "NetworkDescriptor", });
+          internal_static_openxc_NetworkOperatorSettings_NetworkDescriptor_descriptor =
+            internal_static_openxc_NetworkOperatorSettings_descriptor.getNestedTypes().get(0);
+          internal_static_openxc_NetworkOperatorSettings_NetworkDescriptor_fieldAccessorTable = new
+            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+              internal_static_openxc_NetworkOperatorSettings_NetworkDescriptor_descriptor,
+              new java.lang.String[] { "PLMN", "NetworkType", });
+          internal_static_openxc_NetworkDataSettings_descriptor =
+            getDescriptor().getMessageTypes().get(9);
+          internal_static_openxc_NetworkDataSettings_fieldAccessorTable = new
+            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+              internal_static_openxc_NetworkDataSettings_descriptor,
+              new java.lang.String[] { "APN", });
+          internal_static_openxc_ServerConnectSettings_descriptor =
+            getDescriptor().getMessageTypes().get(10);
+          internal_static_openxc_ServerConnectSettings_fieldAccessorTable = new
+            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+              internal_static_openxc_ServerConnectSettings_descriptor,
+              new java.lang.String[] { "Host", "Port", });
+          internal_static_openxc_ModemConfigurationCommand_descriptor =
+            getDescriptor().getMessageTypes().get(11);
+          internal_static_openxc_ModemConfigurationCommand_fieldAccessorTable = new
+            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+              internal_static_openxc_ModemConfigurationCommand_descriptor,
+              new java.lang.String[] { "NetworkOperatorSettings", "NetworkDataSettings", "ServerConnectSettings", });
+          internal_static_openxc_RTCConfigurationCommand_descriptor =
+            getDescriptor().getMessageTypes().get(12);
+          internal_static_openxc_RTCConfigurationCommand_fieldAccessorTable = new
+            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+              internal_static_openxc_RTCConfigurationCommand_descriptor,
+              new java.lang.String[] { "UnixTime", });
+          internal_static_openxc_CommandResponse_descriptor =
+            getDescriptor().getMessageTypes().get(13);
+          internal_static_openxc_CommandResponse_fieldAccessorTable = new
+            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+              internal_static_openxc_CommandResponse_descriptor,
+              new java.lang.String[] { "Type", "Message", "Status", });
+          internal_static_openxc_DiagnosticRequest_descriptor =
+            getDescriptor().getMessageTypes().get(14);
           internal_static_openxc_DiagnosticRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_openxc_DiagnosticRequest_descriptor,
-              new java.lang.String[] { "Bus", "MessageId", "Mode", "Pid", "Payload", "ParsePayload", "Factor", "Offset", "Frequency", });
+              new java.lang.String[] { "Bus", "MessageId", "Mode", "Pid", "Payload", "MultipleResponses", "Frequency", "Name", "DecodedType", });
           internal_static_openxc_DiagnosticResponse_descriptor =
-            getDescriptor().getMessageTypes().get(4);
+            getDescriptor().getMessageTypes().get(15);
           internal_static_openxc_DiagnosticResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_openxc_DiagnosticResponse_descriptor,
               new java.lang.String[] { "Bus", "MessageId", "Mode", "Pid", "Success", "NegativeResponseCode", "Payload", "Value", });
-          internal_static_openxc_TranslatedMessage_descriptor =
-            getDescriptor().getMessageTypes().get(5);
-          internal_static_openxc_TranslatedMessage_fieldAccessorTable = new
+          internal_static_openxc_DynamicField_descriptor =
+            getDescriptor().getMessageTypes().get(16);
+          internal_static_openxc_DynamicField_fieldAccessorTable = new
+            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+              internal_static_openxc_DynamicField_descriptor,
+              new java.lang.String[] { "Type", "StringValue", "NumericValue", "BooleanValue", });
+          internal_static_openxc_SimpleMessage_descriptor =
+            getDescriptor().getMessageTypes().get(17);
+          internal_static_openxc_SimpleMessage_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_openxc_TranslatedMessage_descriptor,
-              new java.lang.String[] { "Type", "Name", "StringValue", "NumericValue", "BooleanValue", "StringEvent", "NumericEvent", "BooleanEvent", });
+              internal_static_openxc_SimpleMessage_descriptor,
+              new java.lang.String[] { "Name", "Value", "Event", });
           return null;
         }
       };