Remove unnecessary 'bus' field from message format command.

3 files changed, 15 insertions, 20 deletions

diff --git a/gen/cpp/openxc.pb b/gen/cpp/openxc.pb
index dfad822b..5b90df96 100644
--- a/gen/cpp/openxc.pb
+++ b/gen/cpp/openxc.pb
@@ -1,5 +1,5 @@
 
-œ
+Ž
 openxc.protoopenxc"”
 VehicleMessage)
 type
 
(2.openxc.VehicleMessage.Type'
@@ -48,10 +48,9 @@ DIAGNOSTIC
 enabled 
("<
 AcceptanceFilterBypassCommand
 bus
 
(
-bypass 
("†

-MessageFormatCommand
-bus
 
(:
-format 
(2*.openxc.MessageFormatCommand.MessageFormat"%
+bypass 
("y
+MessageFormatCommand:
+format
 
(2*.openxc.MessageFormatCommand.MessageFormat"%
 
MessageFormat
 JSON

 
diff --git a/gen/cpp/openxc.pb.c b/gen/cpp/openxc.pb.c
index 3fd1b4ab..0c04bc4f 100644
--- 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 Sat Sep 27 19:56:19 2014. */
+/* Generated by nanopb-0.3.1 at Sat Sep 27 20:17:56 2014. */
 
 #include "openxc.pb.h"
 
@@ -53,9 +53,8 @@ const pb_field_t openxc_AcceptanceFilterBypassCommand_fields[3] = {
     PB_LAST_FIELD
 };
 
-const pb_field_t openxc_MessageFormatCommand_fields[3] = {
-    PB_FIELD(  1, INT32   , OPTIONAL, STATIC  , FIRST, openxc_MessageFormatCommand, bus, bus, 0),
-    PB_FIELD(  2, ENUM    , OPTIONAL, STATIC  , OTHER, openxc_MessageFormatCommand, format, bus, 0),
+const pb_field_t openxc_MessageFormatCommand_fields[2] = {
+    PB_FIELD(  1, ENUM    , OPTIONAL, STATIC  , FIRST, openxc_MessageFormatCommand, format, format, 0),
     PB_LAST_FIELD
 };
 
diff --git a/gen/cpp/openxc.pb.h b/gen/cpp/openxc.pb.h
index 792aa935..2091dfaf 100644
--- a/gen/cpp/openxc.pb.h
+++ b/gen/cpp/openxc.pb.h
@@ -1,5 +1,5 @@
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.1 at Sat Sep 27 19:56:19 2014. */
+/* Generated by nanopb-0.3.1 at Sat Sep 27 20:17:56 2014. */
 
 #ifndef PB_OPENXC_PB_H_INCLUDED
 #define PB_OPENXC_PB_H_INCLUDED
@@ -134,8 +134,6 @@ typedef struct _openxc_DynamicField {
 } openxc_DynamicField;
 
 typedef struct _openxc_MessageFormatCommand {
-    bool has_bus;
-    int32_t bus;
     bool has_format;
     openxc_MessageFormatCommand_MessageFormat format;
 } openxc_MessageFormatCommand;
@@ -213,7 +211,7 @@ typedef struct _openxc_VehicleMessage {
 #define openxc_DiagnosticControlCommand_init_default {false, openxc_DiagnosticRequest_init_default, false, (openxc_DiagnosticControlCommand_Action)0}
 #define openxc_PassthroughModeControlCommand_init_default {false, 0, false, 0}
 #define openxc_AcceptanceFilterBypassCommand_init_default {false, 0, false, 0}
-#define openxc_MessageFormatCommand_init_default {false, 0, false, (openxc_MessageFormatCommand_MessageFormat)0}
+#define openxc_MessageFormatCommand_init_default {false, (openxc_MessageFormatCommand_MessageFormat)0}
 #define openxc_CommandResponse_init_default      {false, (openxc_ControlCommand_Type)0, false, "", false, 0}
 #define openxc_DiagnosticRequest_init_default    {false, 0, false, 0, false, 0, false, 0, false, {0, {0}}, false, 0, false, 0, false, "", false, (openxc_DiagnosticRequest_DecodedType)0}
 #define openxc_DiagnosticResponse_init_default   {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, {0, {0}}, false, 0}
@@ -225,7 +223,7 @@ typedef struct _openxc_VehicleMessage {
 #define openxc_DiagnosticControlCommand_init_zero {false, openxc_DiagnosticRequest_init_zero, false, (openxc_DiagnosticControlCommand_Action)0}
 #define openxc_PassthroughModeControlCommand_init_zero {false, 0, false, 0}
 #define openxc_AcceptanceFilterBypassCommand_init_zero {false, 0, false, 0}
-#define openxc_MessageFormatCommand_init_zero    {false, 0, false, (openxc_MessageFormatCommand_MessageFormat)0}
+#define openxc_MessageFormatCommand_init_zero    {false, (openxc_MessageFormatCommand_MessageFormat)0}
 #define openxc_CommandResponse_init_zero         {false, (openxc_ControlCommand_Type)0, false, "", false, 0}
 #define openxc_DiagnosticRequest_init_zero       {false, 0, false, 0, false, 0, false, 0, false, {0, {0}}, false, 0, false, 0, false, "", false, (openxc_DiagnosticRequest_DecodedType)0}
 #define openxc_DiagnosticResponse_init_zero      {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, {0, {0}}, false, 0}
@@ -259,8 +257,7 @@ typedef struct _openxc_VehicleMessage {
 #define openxc_DynamicField_string_value_tag     2
 #define openxc_DynamicField_numeric_value_tag    3
 #define openxc_DynamicField_boolean_value_tag    4
-#define openxc_MessageFormatCommand_bus_tag      1
-#define openxc_MessageFormatCommand_format_tag   2
+#define openxc_MessageFormatCommand_format_tag   1
 #define openxc_PassthroughModeControlCommand_bus_tag 1
 #define openxc_PassthroughModeControlCommand_enabled_tag 2
 #define openxc_RawMessage_bus_tag                1
@@ -291,7 +288,7 @@ extern const pb_field_t openxc_ControlCommand_fields[6];
 extern const pb_field_t openxc_DiagnosticControlCommand_fields[3];
 extern const pb_field_t openxc_PassthroughModeControlCommand_fields[3];
 extern const pb_field_t openxc_AcceptanceFilterBypassCommand_fields[3];
-extern const pb_field_t openxc_MessageFormatCommand_fields[3];
+extern const pb_field_t openxc_MessageFormatCommand_fields[2];
 extern const pb_field_t openxc_CommandResponse_fields[4];
 extern const pb_field_t openxc_DiagnosticRequest_fields[10];
 extern const pb_field_t openxc_DiagnosticResponse_fields[9];
@@ -299,13 +296,13 @@ extern const pb_field_t openxc_DynamicField_fields[5];
 extern const pb_field_t openxc_TranslatedMessage_fields[5];
 
 /* Maximum encoded size of messages (where known) */
-#define openxc_VehicleMessage_size               724
+#define openxc_VehicleMessage_size               712
 #define openxc_RawMessage_size                   27
-#define openxc_ControlCommand_size               133
+#define openxc_ControlCommand_size               122
 #define openxc_DiagnosticControlCommand_size     76
 #define openxc_PassthroughModeControlCommand_size 13
 #define openxc_AcceptanceFilterBypassCommand_size 13
-#define openxc_MessageFormatCommand_size         17
+#define openxc_MessageFormatCommand_size         6
 #define openxc_CommandResponse_size              139
 #define openxc_DiagnosticRequest_size            68
 #define openxc_DiagnosticResponse_size           56