Simplify passthrough command to just a boolean.

3 files changed, 15 insertions, 26 deletions

diff --git a/gen/cpp/openxc.pb b/gen/cpp/openxc.pb
index aa302360..90fe8778 100644
--- a/gen/cpp/openxc.pb
+++ b/gen/cpp/openxc.pb
@@ -1,5 +1,5 @@
 
-ƒ
+”
 openxc.protoopenxc"”
 VehicleMessage)
 type
 
(2.openxc.VehicleMessage.Type'
@@ -38,15 +38,10 @@ DIAGNOSTIC
 Action
 ADD

 
-CANCEL"«

+CANCEL"=
 PassthroughModeControlCommand
-bus
 
(C
-mode 
(25.openxc.PassthroughModeControlCommand.PassthroughMode"8
-PassthroughMode
-OFF

-FILTERED
-
-UNFILTERED"]
+bus
 
(
+enabled 
("]
 CommandResponse)
 type
 
(2.openxc.ControlCommand.Type
 message 
(	
diff --git a/gen/cpp/openxc.pb.c b/gen/cpp/openxc.pb.c
index 2ca5768c..f11ad592 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 20 21:59:09 2014. */
+/* Generated by nanopb-0.3.1 at Sat Sep 20 22:56:34 2014. */
 
 #include "openxc.pb.h"
 
@@ -41,7 +41,7 @@ const pb_field_t openxc_DiagnosticControlCommand_fields[3] = {
 
 const pb_field_t openxc_PassthroughModeControlCommand_fields[3] = {
     PB_FIELD(  1, INT32   , OPTIONAL, STATIC  , FIRST, openxc_PassthroughModeControlCommand, bus, bus, 0),
-    PB_FIELD(  2, ENUM    , OPTIONAL, STATIC  , OTHER, openxc_PassthroughModeControlCommand, mode, bus, 0),
+    PB_FIELD(  2, BOOL    , OPTIONAL, STATIC  , OTHER, openxc_PassthroughModeControlCommand, enabled, bus, 0),
     PB_LAST_FIELD
 };
 
diff --git a/gen/cpp/openxc.pb.h b/gen/cpp/openxc.pb.h
index 555a672e..4c86b880 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 20 21:59:09 2014. */
+/* Generated by nanopb-0.3.1 at Sat Sep 20 22:56:34 2014. */
 
 #ifndef PB_OPENXC_PB_H_INCLUDED
 #define PB_OPENXC_PB_H_INCLUDED
@@ -34,12 +34,6 @@ typedef enum _openxc_DiagnosticControlCommand_Action {
     openxc_DiagnosticControlCommand_Action_CANCEL = 2
 } openxc_DiagnosticControlCommand_Action;
 
-typedef enum _openxc_PassthroughModeControlCommand_PassthroughMode {
-    openxc_PassthroughModeControlCommand_PassthroughMode_OFF = 1,
-    openxc_PassthroughModeControlCommand_PassthroughMode_FILTERED = 2,
-    openxc_PassthroughModeControlCommand_PassthroughMode_UNFILTERED = 3
-} openxc_PassthroughModeControlCommand_PassthroughMode;
-
 typedef enum _openxc_DiagnosticRequest_DecodedType {
     openxc_DiagnosticRequest_DecodedType_NONE = 1,
     openxc_DiagnosticRequest_DecodedType_OBD2 = 2
@@ -128,8 +122,8 @@ typedef struct _openxc_DynamicField {
 typedef struct _openxc_PassthroughModeControlCommand {
     bool has_bus;
     int32_t bus;
-    bool has_mode;
-    openxc_PassthroughModeControlCommand_PassthroughMode mode;
+    bool has_enabled;
+    bool enabled;
 } openxc_PassthroughModeControlCommand;
 
 typedef PB_BYTES_ARRAY_T(8) openxc_RawMessage_data_t;
@@ -192,7 +186,7 @@ typedef struct _openxc_VehicleMessage {
 #define openxc_RawMessage_init_default           {false, 0, false, 0, false, {0, {0}}}
 #define openxc_ControlCommand_init_default       {false, (openxc_ControlCommand_Type)0, false, openxc_DiagnosticControlCommand_init_default, false, openxc_PassthroughModeControlCommand_init_default}
 #define openxc_DiagnosticControlCommand_init_default {false, openxc_DiagnosticRequest_init_default, false, (openxc_DiagnosticControlCommand_Action)0}
-#define openxc_PassthroughModeControlCommand_init_default {false, 0, false, (openxc_PassthroughModeControlCommand_PassthroughMode)0}
+#define openxc_PassthroughModeControlCommand_init_default {false, 0, false, 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}
@@ -202,7 +196,7 @@ typedef struct _openxc_VehicleMessage {
 #define openxc_RawMessage_init_zero              {false, 0, false, 0, false, {0, {0}}}
 #define openxc_ControlCommand_init_zero          {false, (openxc_ControlCommand_Type)0, false, openxc_DiagnosticControlCommand_init_zero, false, openxc_PassthroughModeControlCommand_init_zero}
 #define openxc_DiagnosticControlCommand_init_zero {false, openxc_DiagnosticRequest_init_zero, false, (openxc_DiagnosticControlCommand_Action)0}
-#define openxc_PassthroughModeControlCommand_init_zero {false, 0, false, (openxc_PassthroughModeControlCommand_PassthroughMode)0}
+#define openxc_PassthroughModeControlCommand_init_zero {false, 0, false, 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}
@@ -235,7 +229,7 @@ typedef struct _openxc_VehicleMessage {
 #define openxc_DynamicField_numeric_value_tag    3
 #define openxc_DynamicField_boolean_value_tag    4
 #define openxc_PassthroughModeControlCommand_bus_tag 1
-#define openxc_PassthroughModeControlCommand_mode_tag 2
+#define openxc_PassthroughModeControlCommand_enabled_tag 2
 #define openxc_RawMessage_bus_tag                1
 #define openxc_RawMessage_message_id_tag         2
 #define openxc_RawMessage_data_tag               3
@@ -268,11 +262,11 @@ 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               693
+#define openxc_VehicleMessage_size               689
 #define openxc_RawMessage_size                   27
-#define openxc_ControlCommand_size               103
+#define openxc_ControlCommand_size               99
 #define openxc_DiagnosticControlCommand_size     76
-#define openxc_PassthroughModeControlCommand_size 17
+#define openxc_PassthroughModeControlCommand_size 13
 #define openxc_CommandResponse_size              139
 #define openxc_DiagnosticRequest_size            68
 #define openxc_DiagnosticResponse_size           56