Add a command to change message format while running.

1 files changed, 827 insertions, 41 deletions

diff --git a/gen/java/com/openxc/BinaryMessages.java b/gen/java/com/openxc/BinaryMessages.java
index e46cab69..7a745c5c 100644
--- a/gen/java/com/openxc/BinaryMessages.java
+++ b/gen/java/com/openxc/BinaryMessages.java
@@ -2097,6 +2097,20 @@ public final class BinaryMessages {
      * <code>optional .openxc.AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4;</code>
      */
     com.openxc.BinaryMessages.AcceptanceFilterBypassCommandOrBuilder getAcceptanceFilterBypassCommandOrBuilder();
+
+    // optional .openxc.MessageFormatCommand message_format_command = 5;
+    /**
+     * <code>optional .openxc.MessageFormatCommand message_format_command = 5;</code>
+     */
+    boolean hasMessageFormatCommand();
+    /**
+     * <code>optional .openxc.MessageFormatCommand message_format_command = 5;</code>
+     */
+    com.openxc.BinaryMessages.MessageFormatCommand getMessageFormatCommand();
+    /**
+     * <code>optional .openxc.MessageFormatCommand message_format_command = 5;</code>
+     */
+    com.openxc.BinaryMessages.MessageFormatCommandOrBuilder getMessageFormatCommandOrBuilder();
   }
   /**
    * Protobuf type {@code openxc.ControlCommand}
@@ -2199,6 +2213,19 @@ public final class BinaryMessages {
               bitField0_ |= 0x00000008;
               break;
             }
+            case 42: {
+              com.openxc.BinaryMessages.MessageFormatCommand.Builder subBuilder = null;
+              if (((bitField0_ & 0x00000010) == 0x00000010)) {
+                subBuilder = messageFormatCommand_.toBuilder();
+              }
+              messageFormatCommand_ = input.readMessage(com.openxc.BinaryMessages.MessageFormatCommand.PARSER, extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(messageFormatCommand_);
+                messageFormatCommand_ = subBuilder.buildPartial();
+              }
+              bitField0_ |= 0x00000010;
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -2263,6 +2290,10 @@ public final class BinaryMessages {
        * <code>ACCEPTANCE_FILTER_BYPASS = 5;</code>
        */
       ACCEPTANCE_FILTER_BYPASS(4, 5),
+      /**
+       * <code>MESSAGE_FORMAT = 6;</code>
+       */
+      MESSAGE_FORMAT(5, 6),
       ;
 
       /**
@@ -2285,6 +2316,10 @@ public final class BinaryMessages {
        * <code>ACCEPTANCE_FILTER_BYPASS = 5;</code>
        */
       public static final int ACCEPTANCE_FILTER_BYPASS_VALUE = 5;
+      /**
+       * <code>MESSAGE_FORMAT = 6;</code>
+       */
+      public static final int MESSAGE_FORMAT_VALUE = 6;
 
 
       public final int getNumber() { return value; }
@@ -2296,6 +2331,7 @@ public final class BinaryMessages {
           case 3: return DIAGNOSTIC;
           case 4: return PASSTHROUGH;
           case 5: return ACCEPTANCE_FILTER_BYPASS;
+          case 6: return MESSAGE_FORMAT;
           default: return null;
         }
       }
@@ -2430,11 +2466,34 @@ public final class BinaryMessages {
       return acceptanceFilterBypassCommand_;
     }
 
+    // optional .openxc.MessageFormatCommand message_format_command = 5;
+    public static final int MESSAGE_FORMAT_COMMAND_FIELD_NUMBER = 5;
+    private com.openxc.BinaryMessages.MessageFormatCommand messageFormatCommand_;
+    /**
+     * <code>optional .openxc.MessageFormatCommand message_format_command = 5;</code>
+     */
+    public boolean hasMessageFormatCommand() {
+      return ((bitField0_ & 0x00000010) == 0x00000010);
+    }
+    /**
+     * <code>optional .openxc.MessageFormatCommand message_format_command = 5;</code>
+     */
+    public com.openxc.BinaryMessages.MessageFormatCommand getMessageFormatCommand() {
+      return messageFormatCommand_;
+    }
+    /**
+     * <code>optional .openxc.MessageFormatCommand message_format_command = 5;</code>
+     */
+    public com.openxc.BinaryMessages.MessageFormatCommandOrBuilder getMessageFormatCommandOrBuilder() {
+      return messageFormatCommand_;
+    }
+
     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();
+      messageFormatCommand_ = com.openxc.BinaryMessages.MessageFormatCommand.getDefaultInstance();
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -2460,6 +2519,9 @@ public final class BinaryMessages {
       if (((bitField0_ & 0x00000008) == 0x00000008)) {
         output.writeMessage(4, acceptanceFilterBypassCommand_);
       }
+      if (((bitField0_ & 0x00000010) == 0x00000010)) {
+        output.writeMessage(5, messageFormatCommand_);
+      }
       getUnknownFields().writeTo(output);
     }
 
@@ -2485,6 +2547,10 @@ public final class BinaryMessages {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(4, acceptanceFilterBypassCommand_);
       }
+      if (((bitField0_ & 0x00000010) == 0x00000010)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(5, messageFormatCommand_);
+      }
       size += getUnknownFields().getSerializedSize();
       memoizedSerializedSize = size;
       return size;
@@ -2596,6 +2662,7 @@ public final class BinaryMessages {
           getDiagnosticRequestFieldBuilder();
           getPassthroughModeRequestFieldBuilder();
           getAcceptanceFilterBypassCommandFieldBuilder();
+          getMessageFormatCommandFieldBuilder();
         }
       }
       private static Builder create() {
@@ -2624,6 +2691,12 @@ public final class BinaryMessages {
           acceptanceFilterBypassCommandBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000008);
+        if (messageFormatCommandBuilder_ == null) {
+          messageFormatCommand_ = com.openxc.BinaryMessages.MessageFormatCommand.getDefaultInstance();
+        } else {
+          messageFormatCommandBuilder_.clear();
+        }
+        bitField0_ = (bitField0_ & ~0x00000010);
         return this;
       }
 
@@ -2680,6 +2753,14 @@ public final class BinaryMessages {
         } else {
           result.acceptanceFilterBypassCommand_ = acceptanceFilterBypassCommandBuilder_.build();
         }
+        if (((from_bitField0_ & 0x00000010) == 0x00000010)) {
+          to_bitField0_ |= 0x00000010;
+        }
+        if (messageFormatCommandBuilder_ == null) {
+          result.messageFormatCommand_ = messageFormatCommand_;
+        } else {
+          result.messageFormatCommand_ = messageFormatCommandBuilder_.build();
+        }
         result.bitField0_ = to_bitField0_;
         onBuilt();
         return result;
@@ -2708,6 +2789,9 @@ public final class BinaryMessages {
         if (other.hasAcceptanceFilterBypassCommand()) {
           mergeAcceptanceFilterBypassCommand(other.getAcceptanceFilterBypassCommand());
         }
+        if (other.hasMessageFormatCommand()) {
+          mergeMessageFormatCommand(other.getMessageFormatCommand());
+        }
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
       }
@@ -3122,6 +3206,123 @@ public final class BinaryMessages {
         return acceptanceFilterBypassCommandBuilder_;
       }
 
+      // optional .openxc.MessageFormatCommand message_format_command = 5;
+      private com.openxc.BinaryMessages.MessageFormatCommand messageFormatCommand_ = com.openxc.BinaryMessages.MessageFormatCommand.getDefaultInstance();
+      private com.google.protobuf.SingleFieldBuilder<
+          com.openxc.BinaryMessages.MessageFormatCommand, com.openxc.BinaryMessages.MessageFormatCommand.Builder, com.openxc.BinaryMessages.MessageFormatCommandOrBuilder> messageFormatCommandBuilder_;
+      /**
+       * <code>optional .openxc.MessageFormatCommand message_format_command = 5;</code>
+       */
+      public boolean hasMessageFormatCommand() {
+        return ((bitField0_ & 0x00000010) == 0x00000010);
+      }
+      /**
+       * <code>optional .openxc.MessageFormatCommand message_format_command = 5;</code>
+       */
+      public com.openxc.BinaryMessages.MessageFormatCommand getMessageFormatCommand() {
+        if (messageFormatCommandBuilder_ == null) {
+          return messageFormatCommand_;
+        } else {
+          return messageFormatCommandBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>optional .openxc.MessageFormatCommand message_format_command = 5;</code>
+       */
+      public Builder setMessageFormatCommand(com.openxc.BinaryMessages.MessageFormatCommand value) {
+        if (messageFormatCommandBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          messageFormatCommand_ = value;
+          onChanged();
+        } else {
+          messageFormatCommandBuilder_.setMessage(value);
+        }
+        bitField0_ |= 0x00000010;
+        return this;
+      }
+      /**
+       * <code>optional .openxc.MessageFormatCommand message_format_command = 5;</code>
+       */
+      public Builder setMessageFormatCommand(
+          com.openxc.BinaryMessages.MessageFormatCommand.Builder builderForValue) {
+        if (messageFormatCommandBuilder_ == null) {
+          messageFormatCommand_ = builderForValue.build();
+          onChanged();
+        } else {
+          messageFormatCommandBuilder_.setMessage(builderForValue.build());
+        }
+        bitField0_ |= 0x00000010;
+        return this;
+      }
+      /**
+       * <code>optional .openxc.MessageFormatCommand message_format_command = 5;</code>
+       */
+      public Builder mergeMessageFormatCommand(com.openxc.BinaryMessages.MessageFormatCommand value) {
+        if (messageFormatCommandBuilder_ == null) {
+          if (((bitField0_ & 0x00000010) == 0x00000010) &&
+              messageFormatCommand_ != com.openxc.BinaryMessages.MessageFormatCommand.getDefaultInstance()) {
+            messageFormatCommand_ =
+              com.openxc.BinaryMessages.MessageFormatCommand.newBuilder(messageFormatCommand_).mergeFrom(value).buildPartial();
+          } else {
+            messageFormatCommand_ = value;
+          }
+          onChanged();
+        } else {
+          messageFormatCommandBuilder_.mergeFrom(value);
+        }
+        bitField0_ |= 0x00000010;
+        return this;
+      }
+      /**
+       * <code>optional .openxc.MessageFormatCommand message_format_command = 5;</code>
+       */
+      public Builder clearMessageFormatCommand() {
+        if (messageFormatCommandBuilder_ == null) {
+          messageFormatCommand_ = com.openxc.BinaryMessages.MessageFormatCommand.getDefaultInstance();
+          onChanged();
+        } else {
+          messageFormatCommandBuilder_.clear();
+        }
+        bitField0_ = (bitField0_ & ~0x00000010);
+        return this;
+      }
+      /**
+       * <code>optional .openxc.MessageFormatCommand message_format_command = 5;</code>
+       */
+      public com.openxc.BinaryMessages.MessageFormatCommand.Builder getMessageFormatCommandBuilder() {
+        bitField0_ |= 0x00000010;
+        onChanged();
+        return getMessageFormatCommandFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>optional .openxc.MessageFormatCommand message_format_command = 5;</code>
+       */
+      public com.openxc.BinaryMessages.MessageFormatCommandOrBuilder getMessageFormatCommandOrBuilder() {
+        if (messageFormatCommandBuilder_ != null) {
+          return messageFormatCommandBuilder_.getMessageOrBuilder();
+        } else {
+          return messageFormatCommand_;
+        }
+      }
+      /**
+       * <code>optional .openxc.MessageFormatCommand message_format_command = 5;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilder<
+          com.openxc.BinaryMessages.MessageFormatCommand, com.openxc.BinaryMessages.MessageFormatCommand.Builder, com.openxc.BinaryMessages.MessageFormatCommandOrBuilder> 
+          getMessageFormatCommandFieldBuilder() {
+        if (messageFormatCommandBuilder_ == null) {
+          messageFormatCommandBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+              com.openxc.BinaryMessages.MessageFormatCommand, com.openxc.BinaryMessages.MessageFormatCommand.Builder, com.openxc.BinaryMessages.MessageFormatCommandOrBuilder>(
+                  messageFormatCommand_,
+                  getParentForChildren(),
+                  isClean());
+          messageFormatCommand_ = null;
+        }
+        return messageFormatCommandBuilder_;
+      }
+
       // @@protoc_insertion_point(builder_scope:openxc.ControlCommand)
     }
 
@@ -4766,6 +4967,574 @@ public final class BinaryMessages {
     // @@protoc_insertion_point(class_scope:openxc.AcceptanceFilterBypassCommand)
   }
 
+  public interface MessageFormatCommandOrBuilder
+      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 .openxc.MessageFormatCommand.MessageFormat format = 2;
+    /**
+     * <code>optional .openxc.MessageFormatCommand.MessageFormat format = 2;</code>
+     */
+    boolean hasFormat();
+    /**
+     * <code>optional .openxc.MessageFormatCommand.MessageFormat format = 2;</code>
+     */
+    com.openxc.BinaryMessages.MessageFormatCommand.MessageFormat getFormat();
+  }
+  /**
+   * Protobuf type {@code openxc.MessageFormatCommand}
+   */
+  public static final class MessageFormatCommand extends
+      com.google.protobuf.GeneratedMessage
+      implements MessageFormatCommandOrBuilder {
+    // Use MessageFormatCommand.newBuilder() to construct.
+    private MessageFormatCommand(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+      super(builder);
+      this.unknownFields = builder.getUnknownFields();
+    }
+    private MessageFormatCommand(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+
+    private static final MessageFormatCommand defaultInstance;
+    public static MessageFormatCommand getDefaultInstance() {
+      return defaultInstance;
+    }
+
+    public MessageFormatCommand getDefaultInstanceForType() {
+      return defaultInstance;
+    }
+
+    private final com.google.protobuf.UnknownFieldSet unknownFields;
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+        getUnknownFields() {
+      return this.unknownFields;
+    }
+    private MessageFormatCommand(
+        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: {
+              int rawValue = input.readEnum();
+              com.openxc.BinaryMessages.MessageFormatCommand.MessageFormat value = com.openxc.BinaryMessages.MessageFormatCommand.MessageFormat.valueOf(rawValue);
+              if (value == null) {
+                unknownFields.mergeVarintField(2, rawValue);
+              } else {
+                bitField0_ |= 0x00000002;
+                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_MessageFormatCommand_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.openxc.BinaryMessages.internal_static_openxc_MessageFormatCommand_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.openxc.BinaryMessages.MessageFormatCommand.class, com.openxc.BinaryMessages.MessageFormatCommand.Builder.class);
+    }
+
+    public static com.google.protobuf.Parser<MessageFormatCommand> PARSER =
+        new com.google.protobuf.AbstractParser<MessageFormatCommand>() {
+      public MessageFormatCommand parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new MessageFormatCommand(input, extensionRegistry);
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<MessageFormatCommand> getParserForType() {
+      return PARSER;
+    }
+
+    /**
+     * Protobuf enum {@code openxc.MessageFormatCommand.MessageFormat}
+     */
+    public enum MessageFormat
+        implements com.google.protobuf.ProtocolMessageEnum {
+      /**
+       * <code>JSON = 1;</code>
+       */
+      JSON(0, 1),
+      /**
+       * <code>BINARY = 2;</code>
+       */
+      BINARY(1, 2),
+      ;
+
+      /**
+       * <code>JSON = 1;</code>
+       */
+      public static final int JSON_VALUE = 1;
+      /**
+       * <code>BINARY = 2;</code>
+       */
+      public static final int BINARY_VALUE = 2;
+
+
+      public final int getNumber() { return value; }
+
+      public static MessageFormat valueOf(int value) {
+        switch (value) {
+          case 1: return JSON;
+          case 2: return BINARY;
+          default: return null;
+        }
+      }
+
+      public static com.google.protobuf.Internal.EnumLiteMap<MessageFormat>
+          internalGetValueMap() {
+        return internalValueMap;
+      }
+      private static com.google.protobuf.Internal.EnumLiteMap<MessageFormat>
+          internalValueMap =
+            new com.google.protobuf.Internal.EnumLiteMap<MessageFormat>() {
+              public MessageFormat findValueByNumber(int number) {
+                return MessageFormat.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.MessageFormatCommand.getDescriptor().getEnumTypes().get(0);
+      }
+
+      private static final MessageFormat[] VALUES = values();
+
+      public static MessageFormat 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 MessageFormat(int index, int value) {
+        this.index = index;
+        this.value = value;
+      }
+
+      // @@protoc_insertion_point(enum_scope:openxc.MessageFormatCommand.MessageFormat)
+    }
+
+    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 .openxc.MessageFormatCommand.MessageFormat format = 2;
+    public static final int FORMAT_FIELD_NUMBER = 2;
+    private com.openxc.BinaryMessages.MessageFormatCommand.MessageFormat format_;
+    /**
+     * <code>optional .openxc.MessageFormatCommand.MessageFormat format = 2;</code>
+     */
+    public boolean hasFormat() {
+      return ((bitField0_ & 0x00000002) == 0x00000002);
+    }
+    /**
+     * <code>optional .openxc.MessageFormatCommand.MessageFormat format = 2;</code>
+     */
+    public com.openxc.BinaryMessages.MessageFormatCommand.MessageFormat getFormat() {
+      return format_;
+    }
+
+    private void initFields() {
+      bus_ = 0;
+      format_ = com.openxc.BinaryMessages.MessageFormatCommand.MessageFormat.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.writeInt32(1, bus_);
+      }
+      if (((bitField0_ & 0x00000002) == 0x00000002)) {
+        output.writeEnum(2, 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
+          .computeInt32Size(1, bus_);
+      }
+      if (((bitField0_ & 0x00000002) == 0x00000002)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(2, 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.MessageFormatCommand parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static com.openxc.BinaryMessages.MessageFormatCommand 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.MessageFormatCommand parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static com.openxc.BinaryMessages.MessageFormatCommand parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static com.openxc.BinaryMessages.MessageFormatCommand parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input);
+    }
+    public static com.openxc.BinaryMessages.MessageFormatCommand parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input, extensionRegistry);
+    }
+    public static com.openxc.BinaryMessages.MessageFormatCommand parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return PARSER.parseDelimitedFrom(input);
+    }
+    public static com.openxc.BinaryMessages.MessageFormatCommand parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+    }
+    public static com.openxc.BinaryMessages.MessageFormatCommand parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input);
+    }
+    public static com.openxc.BinaryMessages.MessageFormatCommand 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.MessageFormatCommand 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.MessageFormatCommand}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessage.Builder<Builder>
+       implements com.openxc.BinaryMessages.MessageFormatCommandOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return com.openxc.BinaryMessages.internal_static_openxc_MessageFormatCommand_descriptor;
+      }
+
+      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return com.openxc.BinaryMessages.internal_static_openxc_MessageFormatCommand_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                com.openxc.BinaryMessages.MessageFormatCommand.class, com.openxc.BinaryMessages.MessageFormatCommand.Builder.class);
+      }
+
+      // Construct using com.openxc.BinaryMessages.MessageFormatCommand.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);
+        format_ = com.openxc.BinaryMessages.MessageFormatCommand.MessageFormat.JSON;
+        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_MessageFormatCommand_descriptor;
+      }
+
+      public com.openxc.BinaryMessages.MessageFormatCommand getDefaultInstanceForType() {
+        return com.openxc.BinaryMessages.MessageFormatCommand.getDefaultInstance();
+      }
+
+      public com.openxc.BinaryMessages.MessageFormatCommand build() {
+        com.openxc.BinaryMessages.MessageFormatCommand result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      public com.openxc.BinaryMessages.MessageFormatCommand buildPartial() {
+        com.openxc.BinaryMessages.MessageFormatCommand result = new com.openxc.BinaryMessages.MessageFormatCommand(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.format_ = format_;
+        result.bitField0_ = to_bitField0_;
+        onBuilt();
+        return result;
+      }
+
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof com.openxc.BinaryMessages.MessageFormatCommand) {
+          return mergeFrom((com.openxc.BinaryMessages.MessageFormatCommand)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(com.openxc.BinaryMessages.MessageFormatCommand other) {
+        if (other == com.openxc.BinaryMessages.MessageFormatCommand.getDefaultInstance()) return this;
+        if (other.hasBus()) {
+          setBus(other.getBus());
+        }
+        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.MessageFormatCommand parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.openxc.BinaryMessages.MessageFormatCommand) 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 .openxc.MessageFormatCommand.MessageFormat format = 2;
+      private com.openxc.BinaryMessages.MessageFormatCommand.MessageFormat format_ = com.openxc.BinaryMessages.MessageFormatCommand.MessageFormat.JSON;
+      /**
+       * <code>optional .openxc.MessageFormatCommand.MessageFormat format = 2;</code>
+       */
+      public boolean hasFormat() {
+        return ((bitField0_ & 0x00000002) == 0x00000002);
+      }
+      /**
+       * <code>optional .openxc.MessageFormatCommand.MessageFormat format = 2;</code>
+       */
+      public com.openxc.BinaryMessages.MessageFormatCommand.MessageFormat getFormat() {
+        return format_;
+      }
+      /**
+       * <code>optional .openxc.MessageFormatCommand.MessageFormat format = 2;</code>
+       */
+      public Builder setFormat(com.openxc.BinaryMessages.MessageFormatCommand.MessageFormat value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        bitField0_ |= 0x00000002;
+        format_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .openxc.MessageFormatCommand.MessageFormat format = 2;</code>
+       */
+      public Builder clearFormat() {
+        bitField0_ = (bitField0_ & ~0x00000002);
+        format_ = com.openxc.BinaryMessages.MessageFormatCommand.MessageFormat.JSON;
+        onChanged();
+        return this;
+      }
+
+      // @@protoc_insertion_point(builder_scope:openxc.MessageFormatCommand)
+    }
+
+    static {
+      defaultInstance = new MessageFormatCommand(true);
+      defaultInstance.initFields();
+    }
+
+    // @@protoc_insertion_point(class_scope:openxc.MessageFormatCommand)
+  }
+
   public interface CommandResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
@@ -9575,6 +10344,11 @@ public final class BinaryMessages {
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_openxc_AcceptanceFilterBypassCommand_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
+    internal_static_openxc_MessageFormatCommand_descriptor;
+  private static
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_openxc_MessageFormatCommand_fieldAccessorTable;
+  private static com.google.protobuf.Descriptors.Descriptor
     internal_static_openxc_CommandResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
@@ -9620,47 +10394,53 @@ public final class BinaryMessages {
       "ANSLATED\020\002\022\016\n\nDIAGNOSTIC\020\003\022\023\n\017CONTROL_CO",
       "MMAND\020\004\022\024\n\020COMMAND_RESPONSE\020\005\";\n\nRawMess" +
       "age\022\013\n\003bus\030\001 \001(\005\022\022\n\nmessage_id\030\002 \001(\r\022\014\n\004" +
-      "data\030\003 \001(\014\"\366\002\n\016ControlCommand\022)\n\004type\030\001 " +
+      "data\030\003 \001(\014\"\310\003\n\016ControlCommand\022)\n\004type\030\001 " +
       "\001(\0162\033.openxc.ControlCommand.Type\022<\n\022diag" +
       "nostic_request\030\002 \001(\0132 .openxc.Diagnostic" +
       "ControlCommand\022G\n\030passthrough_mode_reque" +
       "st\030\003 \001(\0132%.openxc.PassthroughModeControl" +
       "Command\022O\n acceptance_filter_bypass_comm" +
       "and\030\004 \001(\0132%.openxc.AcceptanceFilterBypas" +
-      "sCommand\"a\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\"\236\001\n\030Diagnost" +
-      "icControlCommand\022*\n\007request\030\001 \001(\0132\031.open" +
-      "xc.DiagnosticRequest\0227\n\006action\030\002 \001(\0162\'.o" +
-      "penxc.DiagnosticControlCommand.Action\"\035\n" +
-      "\006Action\022\007\n\003ADD\020\001\022\n\n\006CANCEL\020\002\"=\n\035Passthro" +
-      "ughModeControlCommand\022\013\n\003bus\030\001 \001(\005\022\017\n\007en" +
-      "abled\030\002 \001(\010\"<\n\035AcceptanceFilterBypassCom" +
-      "mand\022\013\n\003bus\030\001 \001(\005\022\016\n\006bypass\030\002 \001(\010\"]\n\017Com" +
-      "mandResponse\022)\n\004type\030\001 \001(\0162\033.openxc.Cont",
-      "rolCommand.Type\022\017\n\007message\030\002 \001(\t\022\016\n\006stat" +
-      "us\030\003 \001(\010\"\375\001\n\021DiagnosticRequest\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\007payload\030\005 \001(\014\022\032\n\022multiple_" +
-      "responses\030\006 \001(\010\022\021\n\tfrequency\030\007 \001(\001\022\014\n\004na" +
-      "me\030\010 \001(\t\022;\n\014decoded_type\030\t \001(\0162%.openxc." +
-      "DiagnosticRequest.DecodedType\"!\n\013Decoded" +
-      "Type\022\010\n\004NONE\020\001\022\010\n\004OBD2\020\002\"\241\001\n\022DiagnosticR" +
-      "esponse\022\013\n\003bus\030\001 \001(\005\022\022\n\nmessage_id\030\002 \001(\r" +
-      "\022\014\n\004mode\030\003 \001(\r\022\013\n\003pid\030\004 \001(\r\022\017\n\007success\030\005",
-      " \001(\010\022\036\n\026negative_response_code\030\006 \001(\r\022\017\n\007" +
-      "payload\030\007 \001(\014\022\r\n\005value\030\010 \001(\001\"\242\001\n\014Dynamic" +
-      "Field\022\'\n\004type\030\001 \001(\0162\031.openxc.DynamicFiel" +
-      "d.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\004Ty" +
-      "pe\022\n\n\006STRING\020\001\022\007\n\003NUM\020\002\022\010\n\004BOOL\020\003\"\367\001\n\021Tr" +
-      "anslatedMessage\022,\n\004type\030\001 \001(\0162\036.openxc.T" +
-      "ranslatedMessage.Type\022\014\n\004name\030\002 \001(\t\022#\n\005v" +
-      "alue\030\003 \001(\0132\024.openxc.DynamicField\022#\n\005even" +
-      "t\030\004 \001(\0132\024.openxc.DynamicField\"\\\n\004Type\022\n\n",
-      "\006STRING\020\001\022\007\n\003NUM\020\002\022\010\n\004BOOL\020\003\022\022\n\016EVENTED_" +
-      "STRING\020\004\022\017\n\013EVENTED_NUM\020\005\022\020\n\014EVENTED_BOO" +
-      "L\020\006B\034\n\ncom.openxcB\016BinaryMessages"
+      "sCommand\022<\n\026message_format_command\030\005 \001(\013",
+      "2\034.openxc.MessageFormatCommand\"u\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\016MESSAGE_FORMAT\020\006\"\236\001\n\030Diagno" +
+      "sticControlCommand\022*\n\007request\030\001 \001(\0132\031.op" +
+      "enxc.DiagnosticRequest\0227\n\006action\030\002 \001(\0162\'" +
+      ".openxc.DiagnosticControlCommand.Action\"" +
+      "\035\n\006Action\022\007\n\003ADD\020\001\022\n\n\006CANCEL\020\002\"=\n\035Passth" +
+      "roughModeControlCommand\022\013\n\003bus\030\001 \001(\005\022\017\n\007" +
+      "enabled\030\002 \001(\010\"<\n\035AcceptanceFilterBypassC",
+      "ommand\022\013\n\003bus\030\001 \001(\005\022\016\n\006bypass\030\002 \001(\010\"\206\001\n\024" +
+      "MessageFormatCommand\022\013\n\003bus\030\001 \001(\005\022:\n\006for" +
+      "mat\030\002 \001(\0162*.openxc.MessageFormatCommand." +
+      "MessageFormat\"%\n\rMessageFormat\022\010\n\004JSON\020\001" +
+      "\022\n\n\006BINARY\020\002\"]\n\017CommandResponse\022)\n\004type\030" +
+      "\001 \001(\0162\033.openxc.ControlCommand.Type\022\017\n\007me" +
+      "ssage\030\002 \001(\t\022\016\n\006status\030\003 \001(\010\"\375\001\n\021Diagnost" +
+      "icRequest\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\007payload" +
+      "\030\005 \001(\014\022\032\n\022multiple_responses\030\006 \001(\010\022\021\n\tfr",
+      "equency\030\007 \001(\001\022\014\n\004name\030\010 \001(\t\022;\n\014decoded_t" +
+      "ype\030\t \001(\0162%.openxc.DiagnosticRequest.Dec" +
+      "odedType\"!\n\013DecodedType\022\010\n\004NONE\020\001\022\010\n\004OBD" +
+      "2\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\026negative_resp" +
+      "onse_code\030\006 \001(\r\022\017\n\007payload\030\007 \001(\014\022\r\n\005valu" +
+      "e\030\010 \001(\001\"\242\001\n\014DynamicField\022\'\n\004type\030\001 \001(\0162\031" +
+      ".openxc.DynamicField.Type\022\024\n\014string_valu" +
+      "e\030\002 \001(\t\022\025\n\rnumeric_value\030\003 \001(\001\022\025\n\rboolea",
+      "n_value\030\004 \001(\010\"%\n\004Type\022\n\n\006STRING\020\001\022\007\n\003NUM" +
+      "\020\002\022\010\n\004BOOL\020\003\"\367\001\n\021TranslatedMessage\022,\n\004ty" +
+      "pe\030\001 \001(\0162\036.openxc.TranslatedMessage.Type" +
+      "\022\014\n\004name\030\002 \001(\t\022#\n\005value\030\003 \001(\0132\024.openxc.D" +
+      "ynamicField\022#\n\005event\030\004 \001(\0132\024.openxc.Dyna" +
+      "micField\"\\\n\004Type\022\n\n\006STRING\020\001\022\007\n\003NUM\020\002\022\010\n" +
+      "\004BOOL\020\003\022\022\n\016EVENTED_STRING\020\004\022\017\n\013EVENTED_N" +
+      "UM\020\005\022\020\n\014EVENTED_BOOL\020\006B\034\n\ncom.openxcB\016Bi" +
+      "naryMessages"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -9684,7 +10464,7 @@ public final class BinaryMessages {
           internal_static_openxc_ControlCommand_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_openxc_ControlCommand_descriptor,
-              new java.lang.String[] { "Type", "DiagnosticRequest", "PassthroughModeRequest", "AcceptanceFilterBypassCommand", });
+              new java.lang.String[] { "Type", "DiagnosticRequest", "PassthroughModeRequest", "AcceptanceFilterBypassCommand", "MessageFormatCommand", });
           internal_static_openxc_DiagnosticControlCommand_descriptor =
             getDescriptor().getMessageTypes().get(3);
           internal_static_openxc_DiagnosticControlCommand_fieldAccessorTable = new
@@ -9703,32 +10483,38 @@ public final class BinaryMessages {
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_openxc_AcceptanceFilterBypassCommand_descriptor,
               new java.lang.String[] { "Bus", "Bypass", });
-          internal_static_openxc_CommandResponse_descriptor =
+          internal_static_openxc_MessageFormatCommand_descriptor =
             getDescriptor().getMessageTypes().get(6);
+          internal_static_openxc_MessageFormatCommand_fieldAccessorTable = new
+            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+              internal_static_openxc_MessageFormatCommand_descriptor,
+              new java.lang.String[] { "Bus", "Format", });
+          internal_static_openxc_CommandResponse_descriptor =
+            getDescriptor().getMessageTypes().get(7);
           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(7);
+            getDescriptor().getMessageTypes().get(8);
           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", "MultipleResponses", "Frequency", "Name", "DecodedType", });
           internal_static_openxc_DiagnosticResponse_descriptor =
-            getDescriptor().getMessageTypes().get(8);
+            getDescriptor().getMessageTypes().get(9);
           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_DynamicField_descriptor =
-            getDescriptor().getMessageTypes().get(9);
+            getDescriptor().getMessageTypes().get(10);
           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_TranslatedMessage_descriptor =
-            getDescriptor().getMessageTypes().get(10);
+            getDescriptor().getMessageTypes().get(11);
           internal_static_openxc_TranslatedMessage_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_openxc_TranslatedMessage_descriptor,