Add passthrough command and refactor commands in binary format.

[apps/agl-service-can-low-level.git] / gen / cpp / openxc.pb.h

diff --git a/gen/cpp/openxc.pb.h b/gen/cpp/openxc.pb.h
index d0c7da4..48002b1 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.2.5 at Mon Aug  4 23:15:59 2014. */
+/* Generated by nanopb-0.2.5 at Sat Sep 20 21:48:43 2014. */
 
 #ifndef _PB_OPENXC_PB_H_
 #define _PB_OPENXC_PB_H_
@@ -21,20 +21,26 @@ typedef enum _openxc_VehicleMessage_Type {
 typedef enum _openxc_ControlCommand_Type {
     openxc_ControlCommand_Type_VERSION = 1,
     openxc_ControlCommand_Type_DEVICE_ID = 2,
-    openxc_ControlCommand_Type_DIAGNOSTIC = 3
+    openxc_ControlCommand_Type_DIAGNOSTIC = 3,
+    openxc_ControlCommand_Type_PASSTHROUGH = 4
 } openxc_ControlCommand_Type;
 
+typedef enum _openxc_DiagnosticControlCommand_Action {
+    openxc_DiagnosticControlCommand_Action_ADD = 1,
+    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
 } openxc_DiagnosticRequest_DecodedType;
 
-typedef enum _openxc_DiagnosticRequest_Action {
-    openxc_DiagnosticRequest_Action_CREATE = 1,
-    openxc_DiagnosticRequest_Action_UPDATE = 2,
-    openxc_DiagnosticRequest_Action_DELETE = 3
-} openxc_DiagnosticRequest_Action;
-
 typedef enum _openxc_DynamicField_Type {
     openxc_DynamicField_Type_STRING = 1,
     openxc_DynamicField_Type_NUM = 2,
@@ -56,6 +62,8 @@ typedef struct _openxc_CommandResponse {
     openxc_ControlCommand_Type type;
     bool has_message;
     char message[128];
+    bool has_status;
+    bool status;
 } openxc_CommandResponse;
 
 typedef struct {
@@ -82,8 +90,6 @@ typedef struct _openxc_DiagnosticRequest {
     char name[10];
     bool has_decoded_type;
     openxc_DiagnosticRequest_DecodedType decoded_type;
-    bool has_action;
-    openxc_DiagnosticRequest_Action action;
 } openxc_DiagnosticRequest;
 
 typedef struct {
@@ -121,6 +127,13 @@ typedef struct _openxc_DynamicField {
     bool boolean_value;
 } openxc_DynamicField;
 
+typedef struct _openxc_PassthroughModeControlCommand {
+    bool has_bus;
+    int32_t bus;
+    bool has_mode;
+    openxc_PassthroughModeControlCommand_PassthroughMode mode;
+} openxc_PassthroughModeControlCommand;
+
 typedef struct {
     size_t size;
     uint8_t bytes[8];
@@ -135,12 +148,12 @@ typedef struct _openxc_RawMessage {
     openxc_RawMessage_data_t data;
 } openxc_RawMessage;
 
-typedef struct _openxc_ControlCommand {
-    bool has_type;
-    openxc_ControlCommand_Type type;
-    bool has_diagnostic_request;
-    openxc_DiagnosticRequest diagnostic_request;
-} openxc_ControlCommand;
+typedef struct _openxc_DiagnosticControlCommand {
+    bool has_request;
+    openxc_DiagnosticRequest request;
+    bool has_action;
+    openxc_DiagnosticControlCommand_Action action;
+} openxc_DiagnosticControlCommand;
 
 typedef struct _openxc_TranslatedMessage {
     bool has_type;
@@ -153,6 +166,15 @@ typedef struct _openxc_TranslatedMessage {
     openxc_DynamicField event;
 } openxc_TranslatedMessage;
 
+typedef struct _openxc_ControlCommand {
+    bool has_type;
+    openxc_ControlCommand_Type type;
+    bool has_diagnostic_request;
+    openxc_DiagnosticControlCommand diagnostic_request;
+    bool has_passthrough_mode_request;
+    openxc_PassthroughModeControlCommand passthrough_mode_request;
+} openxc_ControlCommand;
+
 typedef struct _openxc_VehicleMessage {
     bool has_type;
     openxc_VehicleMessage_Type type;
@@ -173,6 +195,7 @@ typedef struct _openxc_VehicleMessage {
 /* Field tags (for use in manual encoding/decoding) */
 #define openxc_CommandResponse_type_tag          1
 #define openxc_CommandResponse_message_tag       2
+#define openxc_CommandResponse_status_tag        3
 #define openxc_DiagnosticRequest_bus_tag         1
 #define openxc_DiagnosticRequest_message_id_tag  2
 #define openxc_DiagnosticRequest_mode_tag        3
@@ -182,7 +205,6 @@ typedef struct _openxc_VehicleMessage {
 #define openxc_DiagnosticRequest_frequency_tag   7
 #define openxc_DiagnosticRequest_name_tag        8
 #define openxc_DiagnosticRequest_decoded_type_tag 9
-#define openxc_DiagnosticRequest_action_tag      10
 #define openxc_DiagnosticResponse_bus_tag        1
 #define openxc_DiagnosticResponse_message_id_tag 2
 #define openxc_DiagnosticResponse_mode_tag       3
@@ -195,15 +217,20 @@ 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_PassthroughModeControlCommand_bus_tag 1
+#define openxc_PassthroughModeControlCommand_mode_tag 2
 #define openxc_RawMessage_bus_tag                1
 #define openxc_RawMessage_message_id_tag         2
 #define openxc_RawMessage_data_tag               3
-#define openxc_ControlCommand_type_tag           1
-#define openxc_ControlCommand_diagnostic_request_tag 2
+#define openxc_DiagnosticControlCommand_request_tag 1
+#define openxc_DiagnosticControlCommand_action_tag 2
 #define openxc_TranslatedMessage_type_tag        1
 #define openxc_TranslatedMessage_name_tag        2
 #define openxc_TranslatedMessage_value_tag       3
 #define openxc_TranslatedMessage_event_tag       4
+#define openxc_ControlCommand_type_tag           1
+#define openxc_ControlCommand_diagnostic_request_tag 2
+#define openxc_ControlCommand_passthrough_mode_request_tag 3
 #define openxc_VehicleMessage_type_tag           1
 #define openxc_VehicleMessage_raw_message_tag    2
 #define openxc_VehicleMessage_translated_message_tag 3
@@ -214,19 +241,23 @@ typedef struct _openxc_VehicleMessage {
 /* Struct field encoding specification for nanopb */
 extern const pb_field_t openxc_VehicleMessage_fields[7];
 extern const pb_field_t openxc_RawMessage_fields[4];
-extern const pb_field_t openxc_ControlCommand_fields[3];
-extern const pb_field_t openxc_CommandResponse_fields[3];
-extern const pb_field_t openxc_DiagnosticRequest_fields[11];
+extern const pb_field_t openxc_ControlCommand_fields[4];
+extern const pb_field_t openxc_DiagnosticControlCommand_fields[3];
+extern const pb_field_t openxc_PassthroughModeControlCommand_fields[3];
+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];
 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               670
+#define openxc_VehicleMessage_size               693
 #define openxc_RawMessage_size                   27
-#define openxc_ControlCommand_size               82
-#define openxc_CommandResponse_size              137
-#define openxc_DiagnosticRequest_size            74
+#define openxc_ControlCommand_size               103
+#define openxc_DiagnosticControlCommand_size     76
+#define openxc_PassthroughModeControlCommand_size 17
+#define openxc_CommandResponse_size              139
+#define openxc_DiagnosticRequest_size            68
 #define openxc_DiagnosticResponse_size           56
 #define openxc_DynamicField_size                 119
 #define openxc_TranslatedMessage_size            350