Give frame format field a more specific name.

diff --git a/gen/cpp/openxc.pb b/gen/cpp/openxc.pb
index 66f214f..e89c253 100644 (file)
--- a/gen/cpp/openxc.pb
+++ b/gen/cpp/openxc.pb
@@ -1,5 +1,5 @@
 
-\8e\14
+\94\14
 \fopenxc.proto\12\ 6openxc"\94\ 3
 \ eVehicleMessage\12)
 \ 4type\18\ 1 \ 1(\ e2\e.openxc.VehicleMessage.Type\12'
@@ -15,14 +15,14 @@ TRANSLATED\10\ 2\12\ e
 
 DIAGNOSTIC\10\ 3\12\13
 \ fCONTROL_COMMAND\10\ 4\12\14
-\10COMMAND_RESPONSE\10\ 5"\96\ 1
+\10COMMAND_RESPONSE\10\ 5"\9c\ 1
 
 RawMessage\12\v
 \ 3bus\18\ 1 \ 1(\ 5\12\12
 
 message_id\18\ 2 \ 1(\r\12\f
-\ 4data\18\ 3 \ 1(\f\12.
-\ 6format\18\ 4 \ 1(\ e2\1e.openxc.RawMessage.FrameFormat")
+\ 4data\18\ 3 \ 1(\f\124
+\fframe_format\18\ 4 \ 1(\ e2\1e.openxc.RawMessage.FrameFormat")
 \vFrameFormat\12\f
 \bSTANDARD\10\ 1\12\f
 \bEXTENDED\10\ 2"¸\ 4

diff --git a/gen/cpp/openxc.pb.c b/gen/cpp/openxc.pb.c
index 3a5ca0f..a99c7dd 100644 (file)
--- a/gen/cpp/openxc.pb.c
+++ b/gen/cpp/openxc.pb.c
@@ -1,5 +1,5 @@
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.1 at Mon Oct  6 21:30:25 2014. */
+/* Generated by nanopb-0.3.1 at Mon Oct  6 22:07:24 2014. */
 
 #include "openxc.pb.h"
 
@@ -23,7 +23,7 @@ const pb_field_t openxc_RawMessage_fields[5] = {
     PB_FIELD(  1, INT32   , OPTIONAL, STATIC  , FIRST, openxc_RawMessage, bus, bus, 0),
     PB_FIELD(  2, UINT32  , OPTIONAL, STATIC  , OTHER, openxc_RawMessage, message_id, bus, 0),
     PB_FIELD(  3, BYTES   , OPTIONAL, STATIC  , OTHER, openxc_RawMessage, data, message_id, 0),
-    PB_FIELD(  4, ENUM    , OPTIONAL, STATIC  , OTHER, openxc_RawMessage, format, data, 0),
+    PB_FIELD(  4, ENUM    , OPTIONAL, STATIC  , OTHER, openxc_RawMessage, frame_format, data, 0),
     PB_LAST_FIELD
 };
 

diff --git a/gen/cpp/openxc.pb.h b/gen/cpp/openxc.pb.h
index 5f11ec1..ca87e0b 100644 (file)
--- a/gen/cpp/openxc.pb.h
+++ b/gen/cpp/openxc.pb.h
@@ -1,5 +1,5 @@
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.1 at Mon Oct  6 21:30:25 2014. */
+/* Generated by nanopb-0.3.1 at Mon Oct  6 22:07:24 2014. */
 
 #ifndef PB_OPENXC_PB_H_INCLUDED
 #define PB_OPENXC_PB_H_INCLUDED
@@ -165,8 +165,8 @@ typedef struct _openxc_RawMessage {
     uint32_t message_id;
     bool has_data;
     openxc_RawMessage_data_t data;
-    bool has_format;
-    openxc_RawMessage_FrameFormat format;
+    bool has_frame_format;
+    openxc_RawMessage_FrameFormat frame_format;
 } openxc_RawMessage;
 
 typedef struct _openxc_DiagnosticControlCommand {
@@ -281,7 +281,7 @@ typedef struct _openxc_VehicleMessage {
 #define openxc_RawMessage_bus_tag                1
 #define openxc_RawMessage_message_id_tag         2
 #define openxc_RawMessage_data_tag               3
-#define openxc_RawMessage_format_tag             4
+#define openxc_RawMessage_frame_format_tag       4
 #define openxc_DiagnosticControlCommand_request_tag 1
 #define openxc_DiagnosticControlCommand_action_tag 2
 #define openxc_TranslatedMessage_type_tag        1

diff --git a/gen/java/com/openxc/BinaryMessages.java b/gen/java/com/openxc/BinaryMessages.java
index 0937ef5..2e3cd56 100644 (file)
--- a/gen/java/com/openxc/BinaryMessages.java
+++ b/gen/java/com/openxc/BinaryMessages.java
@@ -1515,15 +1515,15 @@ public final class BinaryMessages {
      */
     com.google.protobuf.ByteString getData();
 
-    // optional .openxc.RawMessage.FrameFormat format = 4;
+    // optional .openxc.RawMessage.FrameFormat frame_format = 4;
     /**
-     * <code>optional .openxc.RawMessage.FrameFormat format = 4;</code>
+     * <code>optional .openxc.RawMessage.FrameFormat frame_format = 4;</code>
      */
-    boolean hasFormat();
+    boolean hasFrameFormat();
     /**
-     * <code>optional .openxc.RawMessage.FrameFormat format = 4;</code>
+     * <code>optional .openxc.RawMessage.FrameFormat frame_format = 4;</code>
      */
-    com.openxc.BinaryMessages.RawMessage.FrameFormat getFormat();
+    com.openxc.BinaryMessages.RawMessage.FrameFormat getFrameFormat();
   }
   /**
    * Protobuf type {@code openxc.RawMessage}
@@ -1598,7 +1598,7 @@ public final class BinaryMessages {
                 unknownFields.mergeVarintField(4, rawValue);
               } else {
                 bitField0_ |= 0x00000008;
-                format_ = value;
+                frameFormat_ = value;
               }
               break;
             }
@@ -1772,27 +1772,27 @@ public final class BinaryMessages {
       return data_;
     }
 
-    // optional .openxc.RawMessage.FrameFormat format = 4;
-    public static final int FORMAT_FIELD_NUMBER = 4;
-    private com.openxc.BinaryMessages.RawMessage.FrameFormat format_;
+    // optional .openxc.RawMessage.FrameFormat frame_format = 4;
+    public static final int FRAME_FORMAT_FIELD_NUMBER = 4;
+    private com.openxc.BinaryMessages.RawMessage.FrameFormat frameFormat_;
     /**
-     * <code>optional .openxc.RawMessage.FrameFormat format = 4;</code>
+     * <code>optional .openxc.RawMessage.FrameFormat frame_format = 4;</code>
      */
-    public boolean hasFormat() {
+    public boolean hasFrameFormat() {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
     /**
-     * <code>optional .openxc.RawMessage.FrameFormat format = 4;</code>
+     * <code>optional .openxc.RawMessage.FrameFormat frame_format = 4;</code>
      */
-    public com.openxc.BinaryMessages.RawMessage.FrameFormat getFormat() {
-      return format_;
+    public com.openxc.BinaryMessages.RawMessage.FrameFormat getFrameFormat() {
+      return frameFormat_;
     }
 
     private void initFields() {
       bus_ = 0;
       messageId_ = 0;
       data_ = com.google.protobuf.ByteString.EMPTY;
-      format_ = com.openxc.BinaryMessages.RawMessage.FrameFormat.STANDARD;
+      frameFormat_ = com.openxc.BinaryMessages.RawMessage.FrameFormat.STANDARD;
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -1816,7 +1816,7 @@ public final class BinaryMessages {
         output.writeBytes(3, data_);
       }
       if (((bitField0_ & 0x00000008) == 0x00000008)) {
-        output.writeEnum(4, format_.getNumber());
+        output.writeEnum(4, frameFormat_.getNumber());
       }
       getUnknownFields().writeTo(output);
     }
@@ -1841,7 +1841,7 @@ public final class BinaryMessages {
       }
       if (((bitField0_ & 0x00000008) == 0x00000008)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(4, format_.getNumber());
+          .computeEnumSize(4, frameFormat_.getNumber());
       }
       size += getUnknownFields().getSerializedSize();
       memoizedSerializedSize = size;
@@ -1965,7 +1965,7 @@ public final class BinaryMessages {
         bitField0_ = (bitField0_ & ~0x00000002);
         data_ = com.google.protobuf.ByteString.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000004);
-        format_ = com.openxc.BinaryMessages.RawMessage.FrameFormat.STANDARD;
+        frameFormat_ = com.openxc.BinaryMessages.RawMessage.FrameFormat.STANDARD;
         bitField0_ = (bitField0_ & ~0x00000008);
         return this;
       }
@@ -2010,7 +2010,7 @@ public final class BinaryMessages {
         if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
           to_bitField0_ |= 0x00000008;
         }
-        result.format_ = format_;
+        result.frameFormat_ = frameFormat_;
         result.bitField0_ = to_bitField0_;
         onBuilt();
         return result;
@@ -2036,8 +2036,8 @@ public final class BinaryMessages {
         if (other.hasData()) {
           setData(other.getData());
         }
-        if (other.hasFormat()) {
-          setFormat(other.getFormat());
+        if (other.hasFrameFormat()) {
+          setFrameFormat(other.getFrameFormat());
         }
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
@@ -2168,38 +2168,38 @@ public final class BinaryMessages {
         return this;
       }
 
-      // optional .openxc.RawMessage.FrameFormat format = 4;
-      private com.openxc.BinaryMessages.RawMessage.FrameFormat format_ = com.openxc.BinaryMessages.RawMessage.FrameFormat.STANDARD;
+      // optional .openxc.RawMessage.FrameFormat frame_format = 4;
+      private com.openxc.BinaryMessages.RawMessage.FrameFormat frameFormat_ = com.openxc.BinaryMessages.RawMessage.FrameFormat.STANDARD;
       /**
-       * <code>optional .openxc.RawMessage.FrameFormat format = 4;</code>
+       * <code>optional .openxc.RawMessage.FrameFormat frame_format = 4;</code>
        */
-      public boolean hasFormat() {
+      public boolean hasFrameFormat() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * <code>optional .openxc.RawMessage.FrameFormat format = 4;</code>
+       * <code>optional .openxc.RawMessage.FrameFormat frame_format = 4;</code>
        */
-      public com.openxc.BinaryMessages.RawMessage.FrameFormat getFormat() {
-        return format_;
+      public com.openxc.BinaryMessages.RawMessage.FrameFormat getFrameFormat() {
+        return frameFormat_;
       }
       /**
-       * <code>optional .openxc.RawMessage.FrameFormat format = 4;</code>
+       * <code>optional .openxc.RawMessage.FrameFormat frame_format = 4;</code>
        */
-      public Builder setFormat(com.openxc.BinaryMessages.RawMessage.FrameFormat value) {
+      public Builder setFrameFormat(com.openxc.BinaryMessages.RawMessage.FrameFormat value) {
         if (value == null) {
           throw new NullPointerException();
         }
         bitField0_ |= 0x00000008;
-        format_ = value;
+        frameFormat_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>optional .openxc.RawMessage.FrameFormat format = 4;</code>
+       * <code>optional .openxc.RawMessage.FrameFormat frame_format = 4;</code>
        */
-      public Builder clearFormat() {
+      public Builder clearFrameFormat() {
         bitField0_ = (bitField0_ & ~0x00000008);
-        format_ = com.openxc.BinaryMessages.RawMessage.FrameFormat.STANDARD;
+        frameFormat_ = com.openxc.BinaryMessages.RawMessage.FrameFormat.STANDARD;
         onChanged();
         return this;
       }
@@ -11085,61 +11085,61 @@ public final class BinaryMessages {
       "ommand\0221\n\020command_response\030\006 \001(\0132\027.openx" +
       "c.CommandResponse\"Z\n\004Type\022\007\n\003RAW\020\001\022\016\n\nTR" +
       "ANSLATED\020\002\022\016\n\nDIAGNOSTIC\020\003\022\023\n\017CONTROL_CO",
-      "MMAND\020\004\022\024\n\020COMMAND_RESPONSE\020\005\"\226\001\n\nRawMes" +
+      "MMAND\020\004\022\024\n\020COMMAND_RESPONSE\020\005\"\234\001\n\nRawMes" +
       "sage\022\013\n\003bus\030\001 \001(\005\022\022\n\nmessage_id\030\002 \001(\r\022\014\n" +
-      "\004data\030\003 \001(\014\022.\n\006format\030\004 \001(\0162\036.openxc.Raw" +
-      "Message.FrameFormat\")\n\013FrameFormat\022\014\n\010ST" +
-      "ANDARD\020\001\022\014\n\010EXTENDED\020\002\"\270\004\n\016ControlComman" +
-      "d\022)\n\004type\030\001 \001(\0162\033.openxc.ControlCommand." +
-      "Type\022<\n\022diagnostic_request\030\002 \001(\0132 .openx" +
-      "c.DiagnosticControlCommand\022G\n\030passthroug" +
-      "h_mode_request\030\003 \001(\0132%.openxc.Passthroug" +
-      "hModeControlCommand\022O\n acceptance_filter",
-      "_bypass_command\030\004 \001(\0132%.openxc.Acceptanc" +
-      "eFilterBypassCommand\022<\n\026payload_format_c" +
-      "ommand\030\005 \001(\0132\034.openxc.PayloadFormatComma" +
-      "nd\022O\n predefined_obd2_requests_command\030\006" +
-      " \001(\0132%.openxc.PredefinedObd2RequestsComm" +
-      "and\"\223\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\030ACC" +
-      "EPTANCE_FILTER_BYPASS\020\005\022\022\n\016PAYLOAD_FORMA" +
-      "T\020\006\022\034\n\030PREDEFINED_OBD2_REQUESTS\020\007\"\236\001\n\030Di" +
-      "agnosticControlCommand\022*\n\007request\030\001 \001(\0132",
-      "\031.openxc.DiagnosticRequest\0227\n\006action\030\002 \001" +
-      "(\0162\'.openxc.DiagnosticControlCommand.Act" +
-      "ion\"\035\n\006Action\022\007\n\003ADD\020\001\022\n\n\006CANCEL\020\002\"=\n\035Pa" +
-      "ssthroughModeControlCommand\022\013\n\003bus\030\001 \001(\005" +
-      "\022\017\n\007enabled\030\002 \001(\010\"<\n\035AcceptanceFilterByp" +
-      "assCommand\022\013\n\003bus\030\001 \001(\005\022\016\n\006bypass\030\002 \001(\010\"" +
-      "{\n\024PayloadFormatCommand\022:\n\006format\030\001 \001(\0162" +
-      "*.openxc.PayloadFormatCommand.PayloadFor" +
-      "mat\"\'\n\rPayloadFormat\022\010\n\004JSON\020\001\022\014\n\010PROTOB" +
-      "UF\020\002\"0\n\035PredefinedObd2RequestsCommand\022\017\n",
-      "\007enabled\030\001 \001(\010\"]\n\017CommandResponse\022)\n\004typ" +
-      "e\030\001 \001(\0162\033.openxc.ControlCommand.Type\022\017\n\007" +
-      "message\030\002 \001(\t\022\016\n\006status\030\003 \001(\010\"\375\001\n\021Diagno" +
-      "sticRequest\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\007paylo" +
-      "ad\030\005 \001(\014\022\032\n\022multiple_responses\030\006 \001(\010\022\021\n\t" +
-      "frequency\030\007 \001(\001\022\014\n\004name\030\010 \001(\t\022;\n\014decoded" +
-      "_type\030\t \001(\0162%.openxc.DiagnosticRequest.D" +
-      "ecodedType\"!\n\013DecodedType\022\010\n\004NONE\020\001\022\010\n\004O" +
-      "BD2\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\003p" +
-      "id\030\004 \001(\r\022\017\n\007success\030\005 \001(\010\022\036\n\026negative_re" +
-      "sponse_code\030\006 \001(\r\022\017\n\007payload\030\007 \001(\014\022\r\n\005va" +
-      "lue\030\010 \001(\001\"\242\001\n\014DynamicField\022\'\n\004type\030\001 \001(\016" +
-      "2\031.openxc.DynamicField.Type\022\024\n\014string_va" +
-      "lue\030\002 \001(\t\022\025\n\rnumeric_value\030\003 \001(\001\022\025\n\rbool" +
-      "ean_value\030\004 \001(\010\"%\n\004Type\022\n\n\006STRING\020\001\022\007\n\003N" +
-      "UM\020\002\022\010\n\004BOOL\020\003\"\367\001\n\021TranslatedMessage\022,\n\004" +
-      "type\030\001 \001(\0162\036.openxc.TranslatedMessage.Ty" +
-      "pe\022\014\n\004name\030\002 \001(\t\022#\n\005value\030\003 \001(\0132\024.openxc",
-      ".DynamicField\022#\n\005event\030\004 \001(\0132\024.openxc.Dy" +
-      "namicField\"\\\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_BOOL\020\006B\034\n\ncom.openxcB\016" +
-      "BinaryMessages"
+      "\004data\030\003 \001(\014\0224\n\014frame_format\030\004 \001(\0162\036.open" +
+      "xc.RawMessage.FrameFormat\")\n\013FrameFormat" +
+      "\022\014\n\010STANDARD\020\001\022\014\n\010EXTENDED\020\002\"\270\004\n\016Control" +
+      "Command\022)\n\004type\030\001 \001(\0162\033.openxc.ControlCo" +
+      "mmand.Type\022<\n\022diagnostic_request\030\002 \001(\0132 " +
+      ".openxc.DiagnosticControlCommand\022G\n\030pass" +
+      "through_mode_request\030\003 \001(\0132%.openxc.Pass" +
+      "throughModeControlCommand\022O\n acceptance_",
+      "filter_bypass_command\030\004 \001(\0132%.openxc.Acc" +
+      "eptanceFilterBypassCommand\022<\n\026payload_fo" +
+      "rmat_command\030\005 \001(\0132\034.openxc.PayloadForma" +
+      "tCommand\022O\n predefined_obd2_requests_com" +
+      "mand\030\006 \001(\0132%.openxc.PredefinedObd2Reques" +
+      "tsCommand\"\223\001\n\004Type\022\013\n\007VERSION\020\001\022\r\n\tDEVIC" +
+      "E_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\030PREDEFINED_OBD2_REQUESTS\020\007\"" +
+      "\236\001\n\030DiagnosticControlCommand\022*\n\007request\030",
+      "\001 \001(\0132\031.openxc.DiagnosticRequest\0227\n\006acti" +
+      "on\030\002 \001(\0162\'.openxc.DiagnosticControlComma" +
+      "nd.Action\"\035\n\006Action\022\007\n\003ADD\020\001\022\n\n\006CANCEL\020\002" +
+      "\"=\n\035PassthroughModeControlCommand\022\013\n\003bus" +
+      "\030\001 \001(\005\022\017\n\007enabled\030\002 \001(\010\"<\n\035AcceptanceFil" +
+      "terBypassCommand\022\013\n\003bus\030\001 \001(\005\022\016\n\006bypass\030" +
+      "\002 \001(\010\"{\n\024PayloadFormatCommand\022:\n\006format\030" +
+      "\001 \001(\0162*.openxc.PayloadFormatCommand.Payl" +
+      "oadFormat\"\'\n\rPayloadFormat\022\010\n\004JSON\020\001\022\014\n\010" +
+      "PROTOBUF\020\002\"0\n\035PredefinedObd2RequestsComm",
+      "and\022\017\n\007enabled\030\001 \001(\010\"]\n\017CommandResponse\022" +
+      ")\n\004type\030\001 \001(\0162\033.openxc.ControlCommand.Ty" +
+      "pe\022\017\n\007message\030\002 \001(\t\022\016\n\006status\030\003 \001(\010\"\375\001\n\021" +
+      "DiagnosticRequest\022\013\n\003bus\030\001 \001(\005\022\022\n\nmessag" +
+      "e_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\004name\030\010 \001(\t\022;\n\014d" +
+      "ecoded_type\030\t \001(\0162%.openxc.DiagnosticReq" +
+      "uest.DecodedType\"!\n\013DecodedType\022\010\n\004NONE\020" +
+      "\001\022\010\n\004OBD2\020\002\"\241\001\n\022DiagnosticResponse\022\013\n\003bu",
+      "s\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\026negat" +
+      "ive_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\014str" +
+      "ing_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\006STRING\020" +
+      "\001\022\007\n\003NUM\020\002\022\010\n\004BOOL\020\003\"\367\001\n\021TranslatedMessa" +
+      "ge\022,\n\004type\030\001 \001(\0162\036.openxc.TranslatedMess" +
+      "age.Type\022\014\n\004name\030\002 \001(\t\022#\n\005value\030\003 \001(\0132\024.",
+      "openxc.DynamicField\022#\n\005event\030\004 \001(\0132\024.ope" +
+      "nxc.DynamicField\"\\\n\004Type\022\n\n\006STRING\020\001\022\007\n\003" +
+      "NUM\020\002\022\010\n\004BOOL\020\003\022\022\n\016EVENTED_STRING\020\004\022\017\n\013E" +
+      "VENTED_NUM\020\005\022\020\n\014EVENTED_BOOL\020\006B\034\n\ncom.op" +
+      "enxcB\016BinaryMessages"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -11157,7 +11157,7 @@ public final class BinaryMessages {
           internal_static_openxc_RawMessage_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_openxc_RawMessage_descriptor,
-              new java.lang.String[] { "Bus", "MessageId", "Data", "Format", });
+              new java.lang.String[] { "Bus", "MessageId", "Data", "FrameFormat", });
           internal_static_openxc_ControlCommand_descriptor =
             getDescriptor().getMessageTypes().get(2);
           internal_static_openxc_ControlCommand_fieldAccessorTable = new

diff --git a/gen/python/openxc_pb2.py b/gen/python/openxc_pb2.py
index b2721d3..d69dcb5 100644 (file)
--- a/gen/python/openxc_pb2.py
+++ b/gen/python/openxc_pb2.py
@@ -13,7 +13,7 @@ from google.protobuf import descriptor_pb2
 DESCRIPTOR = _descriptor.FileDescriptor(
   name='openxc.proto',
   package='openxc',
-  serialized_pb='\n\x0copenxc.proto\x12\x06openxc\"\x94\x03\n\x0eVehicleMessage\x12)\n\x04type\x18\x01 \x01(\x0e\x32\x1b.openxc.VehicleMessage.Type\x12\'\n\x0braw_message\x18\x02 \x01(\x0b\x32\x12.openxc.RawMessage\x12\x35\n\x12translated_message\x18\x03 \x01(\x0b\x32\x19.openxc.TranslatedMessage\x12\x37\n\x13\x64iagnostic_response\x18\x04 \x01(\x0b\x32\x1a.openxc.DiagnosticResponse\x12/\n\x0f\x63ontrol_command\x18\x05 \x01(\x0b\x32\x16.openxc.ControlCommand\x12\x31\n\x10\x63ommand_response\x18\x06 \x01(\x0b\x32\x17.openxc.CommandResponse\"Z\n\x04Type\x12\x07\n\x03RAW\x10\x01\x12\x0e\n\nTRANSLATED\x10\x02\x12\x0e\n\nDIAGNOSTIC\x10\x03\x12\x13\n\x0f\x43ONTROL_COMMAND\x10\x04\x12\x14\n\x10\x43OMMAND_RESPONSE\x10\x05\"\x96\x01\n\nRawMessage\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x12\n\nmessage_id\x18\x02 \x01(\r\x12\x0c\n\x04\x64\x61ta\x18\x03 \x01(\x0c\x12.\n\x06\x66ormat\x18\x04 \x01(\x0e\x32\x1e.openxc.RawMessage.FrameFormat\")\n\x0b\x46rameFormat\x12\x0c\n\x08STANDARD\x10\x01\x12\x0c\n\x08\x45XTENDED\x10\x02\"\xb8\x04\n\x0e\x43ontrolCommand\x12)\n\x04type\x18\x01 \x01(\x0e\x32\x1b.openxc.ControlCommand.Type\x12<\n\x12\x64iagnostic_request\x18\x02 \x01(\x0b\x32 .openxc.DiagnosticControlCommand\x12G\n\x18passthrough_mode_request\x18\x03 \x01(\x0b\x32%.openxc.PassthroughModeControlCommand\x12O\n acceptance_filter_bypass_command\x18\x04 \x01(\x0b\x32%.openxc.AcceptanceFilterBypassCommand\x12<\n\x16payload_format_command\x18\x05 \x01(\x0b\x32\x1c.openxc.PayloadFormatCommand\x12O\n predefined_obd2_requests_command\x18\x06 \x01(\x0b\x32%.openxc.PredefinedObd2RequestsCommand\"\x93\x01\n\x04Type\x12\x0b\n\x07VERSION\x10\x01\x12\r\n\tDEVICE_ID\x10\x02\x12\x0e\n\nDIAGNOSTIC\x10\x03\x12\x0f\n\x0bPASSTHROUGH\x10\x04\x12\x1c\n\x18\x41\x43\x43\x45PTANCE_FILTER_BYPASS\x10\x05\x12\x12\n\x0ePAYLOAD_FORMAT\x10\x06\x12\x1c\n\x18PREDEFINED_OBD2_REQUESTS\x10\x07\"\x9e\x01\n\x18\x44iagnosticControlCommand\x12*\n\x07request\x18\x01 \x01(\x0b\x32\x19.openxc.DiagnosticRequest\x12\x37\n\x06\x61\x63tion\x18\x02 \x01(\x0e\x32\'.openxc.DiagnosticControlCommand.Action\"\x1d\n\x06\x41\x63tion\x12\x07\n\x03\x41\x44\x44\x10\x01\x12\n\n\x06\x43\x41NCEL\x10\x02\"=\n\x1dPassthroughModeControlCommand\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x0f\n\x07\x65nabled\x18\x02 \x01(\x08\"<\n\x1d\x41\x63\x63\x65ptanceFilterBypassCommand\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x0e\n\x06\x62ypass\x18\x02 \x01(\x08\"{\n\x14PayloadFormatCommand\x12:\n\x06\x66ormat\x18\x01 \x01(\x0e\x32*.openxc.PayloadFormatCommand.PayloadFormat\"\'\n\rPayloadFormat\x12\x08\n\x04JSON\x10\x01\x12\x0c\n\x08PROTOBUF\x10\x02\"0\n\x1dPredefinedObd2RequestsCommand\x12\x0f\n\x07\x65nabled\x18\x01 \x01(\x08\"]\n\x0f\x43ommandResponse\x12)\n\x04type\x18\x01 \x01(\x0e\x32\x1b.openxc.ControlCommand.Type\x12\x0f\n\x07message\x18\x02 \x01(\t\x12\x0e\n\x06status\x18\x03 \x01(\x08\"\xfd\x01\n\x11\x44iagnosticRequest\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x12\n\nmessage_id\x18\x02 \x01(\r\x12\x0c\n\x04mode\x18\x03 \x01(\r\x12\x0b\n\x03pid\x18\x04 \x01(\r\x12\x0f\n\x07payload\x18\x05 \x01(\x0c\x12\x1a\n\x12multiple_responses\x18\x06 \x01(\x08\x12\x11\n\tfrequency\x18\x07 \x01(\x01\x12\x0c\n\x04name\x18\x08 \x01(\t\x12;\n\x0c\x64\x65\x63oded_type\x18\t \x01(\x0e\x32%.openxc.DiagnosticRequest.DecodedType\"!\n\x0b\x44\x65\x63odedType\x12\x08\n\x04NONE\x10\x01\x12\x08\n\x04OBD2\x10\x02\"\xa1\x01\n\x12\x44iagnosticResponse\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x12\n\nmessage_id\x18\x02 \x01(\r\x12\x0c\n\x04mode\x18\x03 \x01(\r\x12\x0b\n\x03pid\x18\x04 \x01(\r\x12\x0f\n\x07success\x18\x05 \x01(\x08\x12\x1e\n\x16negative_response_code\x18\x06 \x01(\r\x12\x0f\n\x07payload\x18\x07 \x01(\x0c\x12\r\n\x05value\x18\x08 \x01(\x01\"\xa2\x01\n\x0c\x44ynamicField\x12\'\n\x04type\x18\x01 \x01(\x0e\x32\x19.openxc.DynamicField.Type\x12\x14\n\x0cstring_value\x18\x02 \x01(\t\x12\x15\n\rnumeric_value\x18\x03 \x01(\x01\x12\x15\n\rboolean_value\x18\x04 \x01(\x08\"%\n\x04Type\x12\n\n\x06STRING\x10\x01\x12\x07\n\x03NUM\x10\x02\x12\x08\n\x04\x42OOL\x10\x03\"\xf7\x01\n\x11TranslatedMessage\x12,\n\x04type\x18\x01 \x01(\x0e\x32\x1e.openxc.TranslatedMessage.Type\x12\x0c\n\x04name\x18\x02 \x01(\t\x12#\n\x05value\x18\x03 \x01(\x0b\x32\x14.openxc.DynamicField\x12#\n\x05\x65vent\x18\x04 \x01(\x0b\x32\x14.openxc.DynamicField\"\\\n\x04Type\x12\n\n\x06STRING\x10\x01\x12\x07\n\x03NUM\x10\x02\x12\x08\n\x04\x42OOL\x10\x03\x12\x12\n\x0e\x45VENTED_STRING\x10\x04\x12\x0f\n\x0b\x45VENTED_NUM\x10\x05\x12\x10\n\x0c\x45VENTED_BOOL\x10\x06\x42\x1c\n\ncom.openxcB\x0e\x42inaryMessages')
+  serialized_pb='\n\x0copenxc.proto\x12\x06openxc\"\x94\x03\n\x0eVehicleMessage\x12)\n\x04type\x18\x01 \x01(\x0e\x32\x1b.openxc.VehicleMessage.Type\x12\'\n\x0braw_message\x18\x02 \x01(\x0b\x32\x12.openxc.RawMessage\x12\x35\n\x12translated_message\x18\x03 \x01(\x0b\x32\x19.openxc.TranslatedMessage\x12\x37\n\x13\x64iagnostic_response\x18\x04 \x01(\x0b\x32\x1a.openxc.DiagnosticResponse\x12/\n\x0f\x63ontrol_command\x18\x05 \x01(\x0b\x32\x16.openxc.ControlCommand\x12\x31\n\x10\x63ommand_response\x18\x06 \x01(\x0b\x32\x17.openxc.CommandResponse\"Z\n\x04Type\x12\x07\n\x03RAW\x10\x01\x12\x0e\n\nTRANSLATED\x10\x02\x12\x0e\n\nDIAGNOSTIC\x10\x03\x12\x13\n\x0f\x43ONTROL_COMMAND\x10\x04\x12\x14\n\x10\x43OMMAND_RESPONSE\x10\x05\"\x9c\x01\n\nRawMessage\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x12\n\nmessage_id\x18\x02 \x01(\r\x12\x0c\n\x04\x64\x61ta\x18\x03 \x01(\x0c\x12\x34\n\x0c\x66rame_format\x18\x04 \x01(\x0e\x32\x1e.openxc.RawMessage.FrameFormat\")\n\x0b\x46rameFormat\x12\x0c\n\x08STANDARD\x10\x01\x12\x0c\n\x08\x45XTENDED\x10\x02\"\xb8\x04\n\x0e\x43ontrolCommand\x12)\n\x04type\x18\x01 \x01(\x0e\x32\x1b.openxc.ControlCommand.Type\x12<\n\x12\x64iagnostic_request\x18\x02 \x01(\x0b\x32 .openxc.DiagnosticControlCommand\x12G\n\x18passthrough_mode_request\x18\x03 \x01(\x0b\x32%.openxc.PassthroughModeControlCommand\x12O\n acceptance_filter_bypass_command\x18\x04 \x01(\x0b\x32%.openxc.AcceptanceFilterBypassCommand\x12<\n\x16payload_format_command\x18\x05 \x01(\x0b\x32\x1c.openxc.PayloadFormatCommand\x12O\n predefined_obd2_requests_command\x18\x06 \x01(\x0b\x32%.openxc.PredefinedObd2RequestsCommand\"\x93\x01\n\x04Type\x12\x0b\n\x07VERSION\x10\x01\x12\r\n\tDEVICE_ID\x10\x02\x12\x0e\n\nDIAGNOSTIC\x10\x03\x12\x0f\n\x0bPASSTHROUGH\x10\x04\x12\x1c\n\x18\x41\x43\x43\x45PTANCE_FILTER_BYPASS\x10\x05\x12\x12\n\x0ePAYLOAD_FORMAT\x10\x06\x12\x1c\n\x18PREDEFINED_OBD2_REQUESTS\x10\x07\"\x9e\x01\n\x18\x44iagnosticControlCommand\x12*\n\x07request\x18\x01 \x01(\x0b\x32\x19.openxc.DiagnosticRequest\x12\x37\n\x06\x61\x63tion\x18\x02 \x01(\x0e\x32\'.openxc.DiagnosticControlCommand.Action\"\x1d\n\x06\x41\x63tion\x12\x07\n\x03\x41\x44\x44\x10\x01\x12\n\n\x06\x43\x41NCEL\x10\x02\"=\n\x1dPassthroughModeControlCommand\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x0f\n\x07\x65nabled\x18\x02 \x01(\x08\"<\n\x1d\x41\x63\x63\x65ptanceFilterBypassCommand\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x0e\n\x06\x62ypass\x18\x02 \x01(\x08\"{\n\x14PayloadFormatCommand\x12:\n\x06\x66ormat\x18\x01 \x01(\x0e\x32*.openxc.PayloadFormatCommand.PayloadFormat\"\'\n\rPayloadFormat\x12\x08\n\x04JSON\x10\x01\x12\x0c\n\x08PROTOBUF\x10\x02\"0\n\x1dPredefinedObd2RequestsCommand\x12\x0f\n\x07\x65nabled\x18\x01 \x01(\x08\"]\n\x0f\x43ommandResponse\x12)\n\x04type\x18\x01 \x01(\x0e\x32\x1b.openxc.ControlCommand.Type\x12\x0f\n\x07message\x18\x02 \x01(\t\x12\x0e\n\x06status\x18\x03 \x01(\x08\"\xfd\x01\n\x11\x44iagnosticRequest\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x12\n\nmessage_id\x18\x02 \x01(\r\x12\x0c\n\x04mode\x18\x03 \x01(\r\x12\x0b\n\x03pid\x18\x04 \x01(\r\x12\x0f\n\x07payload\x18\x05 \x01(\x0c\x12\x1a\n\x12multiple_responses\x18\x06 \x01(\x08\x12\x11\n\tfrequency\x18\x07 \x01(\x01\x12\x0c\n\x04name\x18\x08 \x01(\t\x12;\n\x0c\x64\x65\x63oded_type\x18\t \x01(\x0e\x32%.openxc.DiagnosticRequest.DecodedType\"!\n\x0b\x44\x65\x63odedType\x12\x08\n\x04NONE\x10\x01\x12\x08\n\x04OBD2\x10\x02\"\xa1\x01\n\x12\x44iagnosticResponse\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x12\n\nmessage_id\x18\x02 \x01(\r\x12\x0c\n\x04mode\x18\x03 \x01(\r\x12\x0b\n\x03pid\x18\x04 \x01(\r\x12\x0f\n\x07success\x18\x05 \x01(\x08\x12\x1e\n\x16negative_response_code\x18\x06 \x01(\r\x12\x0f\n\x07payload\x18\x07 \x01(\x0c\x12\r\n\x05value\x18\x08 \x01(\x01\"\xa2\x01\n\x0c\x44ynamicField\x12\'\n\x04type\x18\x01 \x01(\x0e\x32\x19.openxc.DynamicField.Type\x12\x14\n\x0cstring_value\x18\x02 \x01(\t\x12\x15\n\rnumeric_value\x18\x03 \x01(\x01\x12\x15\n\rboolean_value\x18\x04 \x01(\x08\"%\n\x04Type\x12\n\n\x06STRING\x10\x01\x12\x07\n\x03NUM\x10\x02\x12\x08\n\x04\x42OOL\x10\x03\"\xf7\x01\n\x11TranslatedMessage\x12,\n\x04type\x18\x01 \x01(\x0e\x32\x1e.openxc.TranslatedMessage.Type\x12\x0c\n\x04name\x18\x02 \x01(\t\x12#\n\x05value\x18\x03 \x01(\x0b\x32\x14.openxc.DynamicField\x12#\n\x05\x65vent\x18\x04 \x01(\x0b\x32\x14.openxc.DynamicField\"\\\n\x04Type\x12\n\n\x06STRING\x10\x01\x12\x07\n\x03NUM\x10\x02\x12\x08\n\x04\x42OOL\x10\x03\x12\x12\n\x0e\x45VENTED_STRING\x10\x04\x12\x0f\n\x0b\x45VENTED_NUM\x10\x05\x12\x10\n\x0c\x45VENTED_BOOL\x10\x06\x42\x1c\n\ncom.openxcB\x0e\x42inaryMessages')
 
 
 
@@ -67,8 +67,8 @@ _RAWMESSAGE_FRAMEFORMAT = _descriptor.EnumDescriptor(
   ],
   containing_type=None,
   options=None,
-  serialized_start=541,
-  serialized_end=582,
+  serialized_start=547,
+  serialized_end=588,
 )
 
 _CONTROLCOMMAND_TYPE = _descriptor.EnumDescriptor(
@@ -108,8 +108,8 @@ _CONTROLCOMMAND_TYPE = _descriptor.EnumDescriptor(
   ],
   containing_type=None,
   options=None,
-  serialized_start=1006,
-  serialized_end=1153,
+  serialized_start=1012,
+  serialized_end=1159,
 )
 
 _DIAGNOSTICCONTROLCOMMAND_ACTION = _descriptor.EnumDescriptor(
@@ -129,8 +129,8 @@ _DIAGNOSTICCONTROLCOMMAND_ACTION = _descriptor.EnumDescriptor(
   ],
   containing_type=None,
   options=None,
-  serialized_start=1285,
-  serialized_end=1314,
+  serialized_start=1291,
+  serialized_end=1320,
 )
 
 _PAYLOADFORMATCOMMAND_PAYLOADFORMAT = _descriptor.EnumDescriptor(
@@ -150,8 +150,8 @@ _PAYLOADFORMATCOMMAND_PAYLOADFORMAT = _descriptor.EnumDescriptor(
   ],
   containing_type=None,
   options=None,
-  serialized_start=1525,
-  serialized_end=1564,
+  serialized_start=1531,
+  serialized_end=1570,
 )
 
 _DIAGNOSTICREQUEST_DECODEDTYPE = _descriptor.EnumDescriptor(
@@ -171,8 +171,8 @@ _DIAGNOSTICREQUEST_DECODEDTYPE = _descriptor.EnumDescriptor(
   ],
   containing_type=None,
   options=None,
-  serialized_start=1932,
-  serialized_end=1965,
+  serialized_start=1938,
+  serialized_end=1971,
 )
 
 _DYNAMICFIELD_TYPE = _descriptor.EnumDescriptor(
@@ -196,8 +196,8 @@ _DYNAMICFIELD_TYPE = _descriptor.EnumDescriptor(
   ],
   containing_type=None,
   options=None,
-  serialized_start=2257,
-  serialized_end=2294,
+  serialized_start=2263,
+  serialized_end=2300,
 )
 
 _TRANSLATEDMESSAGE_TYPE = _descriptor.EnumDescriptor(
@@ -233,8 +233,8 @@ _TRANSLATEDMESSAGE_TYPE = _descriptor.EnumDescriptor(
   ],
   containing_type=None,
   options=None,
-  serialized_start=2452,
-  serialized_end=2544,
+  serialized_start=2458,
+  serialized_end=2550,
 )
 
 
@@ -331,7 +331,7 @@ _RAWMESSAGE = _descriptor.Descriptor(
       is_extension=False, extension_scope=None,
       options=None),
     _descriptor.FieldDescriptor(
-      name='format', full_name='openxc.RawMessage.format', index=3,
+      name='frame_format', full_name='openxc.RawMessage.frame_format', index=3,
       number=4, type=14, cpp_type=8, label=1,
       has_default_value=False, default_value=1,
       message_type=None, enum_type=None, containing_type=None,
@@ -348,7 +348,7 @@ _RAWMESSAGE = _descriptor.Descriptor(
   is_extendable=False,
   extension_ranges=[],
   serialized_start=432,
-  serialized_end=582,
+  serialized_end=588,
 )
 
 
@@ -411,8 +411,8 @@ _CONTROLCOMMAND = _descriptor.Descriptor(
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=585,
-  serialized_end=1153,
+  serialized_start=591,
+  serialized_end=1159,
 )
 
 
@@ -447,8 +447,8 @@ _DIAGNOSTICCONTROLCOMMAND = _descriptor.Descriptor(
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=1156,
-  serialized_end=1314,
+  serialized_start=1162,
+  serialized_end=1320,
 )
 
 
@@ -482,8 +482,8 @@ _PASSTHROUGHMODECONTROLCOMMAND = _descriptor.Descriptor(
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=1316,
-  serialized_end=1377,
+  serialized_start=1322,
+  serialized_end=1383,
 )
 
 
@@ -517,8 +517,8 @@ _ACCEPTANCEFILTERBYPASSCOMMAND = _descriptor.Descriptor(
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=1379,
-  serialized_end=1439,
+  serialized_start=1385,
+  serialized_end=1445,
 )
 
 
@@ -546,8 +546,8 @@ _PAYLOADFORMATCOMMAND = _descriptor.Descriptor(
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=1441,
-  serialized_end=1564,
+  serialized_start=1447,
+  serialized_end=1570,
 )
 
 
@@ -574,8 +574,8 @@ _PREDEFINEDOBD2REQUESTSCOMMAND = _descriptor.Descriptor(
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=1566,
-  serialized_end=1614,
+  serialized_start=1572,
+  serialized_end=1620,
 )
 
 
@@ -616,8 +616,8 @@ _COMMANDRESPONSE = _descriptor.Descriptor(
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=1616,
-  serialized_end=1709,
+  serialized_start=1622,
+  serialized_end=1715,
 )
 
 
@@ -701,8 +701,8 @@ _DIAGNOSTICREQUEST = _descriptor.Descriptor(
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=1712,
-  serialized_end=1965,
+  serialized_start=1718,
+  serialized_end=1971,
 )
 
 
@@ -778,8 +778,8 @@ _DIAGNOSTICRESPONSE = _descriptor.Descriptor(
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=1968,
-  serialized_end=2129,
+  serialized_start=1974,
+  serialized_end=2135,
 )
 
 
@@ -828,8 +828,8 @@ _DYNAMICFIELD = _descriptor.Descriptor(
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=2132,
-  serialized_end=2294,
+  serialized_start=2138,
+  serialized_end=2300,
 )
 
 
@@ -878,8 +878,8 @@ _TRANSLATEDMESSAGE = _descriptor.Descriptor(
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=2297,
-  serialized_end=2544,
+  serialized_start=2303,
+  serialized_end=2550,
 )
 
 _VEHICLEMESSAGE.fields_by_name['type'].enum_type = _VEHICLEMESSAGE_TYPE
@@ -889,7 +889,7 @@ _VEHICLEMESSAGE.fields_by_name['diagnostic_response'].message_type = _DIAGNOSTIC
 _VEHICLEMESSAGE.fields_by_name['control_command'].message_type = _CONTROLCOMMAND
 _VEHICLEMESSAGE.fields_by_name['command_response'].message_type = _COMMANDRESPONSE
 _VEHICLEMESSAGE_TYPE.containing_type = _VEHICLEMESSAGE;
-_RAWMESSAGE.fields_by_name['format'].enum_type = _RAWMESSAGE_FRAMEFORMAT
+_RAWMESSAGE.fields_by_name['frame_format'].enum_type = _RAWMESSAGE_FRAMEFORMAT
 _RAWMESSAGE_FRAMEFORMAT.containing_type = _RAWMESSAGE;
 _CONTROLCOMMAND.fields_by_name['type'].enum_type = _CONTROLCOMMAND_TYPE
 _CONTROLCOMMAND.fields_by_name['diagnostic_request'].message_type = _DIAGNOSTICCONTROLCOMMAND

diff --git a/openxc.proto b/openxc.proto
index 3b23be5..3c0a51d 100644 (file)
--- a/openxc.proto
+++ b/openxc.proto
@@ -23,7 +23,7 @@ message RawMessage {
     optional int32 bus = 1;
     optional uint32 message_id = 2;
     optional bytes data = 3;
-    optional FrameFormat format = 4;
+    optional FrameFormat frame_format = 4;
 }
 
 message ControlCommand {