X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=gen%2Fcpp%2Fopenxc.pb.h;h=792aa9353c8a99736ed0e89ec6147be718d9949f;hb=e3162f7da4b6b5ad422bccdb9b2a4e1b144ab9c9;hp=4c86b8800e55a97181922bdff072daf7782cbf16;hpb=ef7c7dc0afab46f0e2e5eb8b051e769fb7a1a6b5;p=apps%2Fagl-service-can-low-level.git

diff --git a/gen/cpp/openxc.pb.h b/gen/cpp/openxc.pb.h
index 4c86b880..792aa935 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 22:56:34 2014. */
+/* Generated by nanopb-0.3.1 at Sat Sep 27 19:56:19 2014. */
 
 #ifndef PB_OPENXC_PB_H_INCLUDED
 #define PB_OPENXC_PB_H_INCLUDED
@@ -26,7 +26,9 @@ typedef enum _openxc_ControlCommand_Type {
     openxc_ControlCommand_Type_VERSION = 1,
     openxc_ControlCommand_Type_DEVICE_ID = 2,
     openxc_ControlCommand_Type_DIAGNOSTIC = 3,
-    openxc_ControlCommand_Type_PASSTHROUGH = 4
+    openxc_ControlCommand_Type_PASSTHROUGH = 4,
+    openxc_ControlCommand_Type_ACCEPTANCE_FILTER_BYPASS = 5,
+    openxc_ControlCommand_Type_MESSAGE_FORMAT = 6
 } openxc_ControlCommand_Type;
 
 typedef enum _openxc_DiagnosticControlCommand_Action {
@@ -34,6 +36,11 @@ typedef enum _openxc_DiagnosticControlCommand_Action {
     openxc_DiagnosticControlCommand_Action_CANCEL = 2
 } openxc_DiagnosticControlCommand_Action;
 
+typedef enum _openxc_MessageFormatCommand_MessageFormat {
+    openxc_MessageFormatCommand_MessageFormat_JSON = 1,
+    openxc_MessageFormatCommand_MessageFormat_BINARY = 2
+} openxc_MessageFormatCommand_MessageFormat;
+
 typedef enum _openxc_DiagnosticRequest_DecodedType {
     openxc_DiagnosticRequest_DecodedType_NONE = 1,
     openxc_DiagnosticRequest_DecodedType_OBD2 = 2
@@ -55,6 +62,13 @@ typedef enum _openxc_TranslatedMessage_Type {
 } openxc_TranslatedMessage_Type;
 
 /* Struct definitions */
+typedef struct _openxc_AcceptanceFilterBypassCommand {
+    bool has_bus;
+    int32_t bus;
+    bool has_bypass;
+    bool bypass;
+} openxc_AcceptanceFilterBypassCommand;
+
 typedef struct _openxc_CommandResponse {
     bool has_type;
     openxc_ControlCommand_Type type;
@@ -119,6 +133,13 @@ typedef struct _openxc_DynamicField {
     bool boolean_value;
 } openxc_DynamicField;
 
+typedef struct _openxc_MessageFormatCommand {
+    bool has_bus;
+    int32_t bus;
+    bool has_format;
+    openxc_MessageFormatCommand_MessageFormat format;
+} openxc_MessageFormatCommand;
+
 typedef struct _openxc_PassthroughModeControlCommand {
     bool has_bus;
     int32_t bus;
@@ -162,6 +183,10 @@ typedef struct _openxc_ControlCommand {
     openxc_DiagnosticControlCommand diagnostic_request;
     bool has_passthrough_mode_request;
     openxc_PassthroughModeControlCommand passthrough_mode_request;
+    bool has_acceptance_filter_bypass_command;
+    openxc_AcceptanceFilterBypassCommand acceptance_filter_bypass_command;
+    bool has_message_format_command;
+    openxc_MessageFormatCommand message_format_command;
 } openxc_ControlCommand;
 
 typedef struct _openxc_VehicleMessage {
@@ -184,9 +209,11 @@ typedef struct _openxc_VehicleMessage {
 /* Initializer values for message structs */
 #define openxc_VehicleMessage_init_default       {false, (openxc_VehicleMessage_Type)0, false, openxc_RawMessage_init_default, false, openxc_TranslatedMessage_init_default, false, openxc_DiagnosticResponse_init_default, false, openxc_ControlCommand_init_default, false, openxc_CommandResponse_init_default}
 #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_ControlCommand_init_default       {false, (openxc_ControlCommand_Type)0, false, openxc_DiagnosticControlCommand_init_default, false, openxc_PassthroughModeControlCommand_init_default, false, openxc_AcceptanceFilterBypassCommand_init_default, false, openxc_MessageFormatCommand_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, 0}
+#define openxc_AcceptanceFilterBypassCommand_init_default {false, 0, false, 0}
+#define openxc_MessageFormatCommand_init_default {false, 0, 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}
@@ -194,9 +221,11 @@ typedef struct _openxc_VehicleMessage {
 #define openxc_TranslatedMessage_init_default    {false, (openxc_TranslatedMessage_Type)0, false, "", false, openxc_DynamicField_init_default, false, openxc_DynamicField_init_default}
 #define openxc_VehicleMessage_init_zero          {false, (openxc_VehicleMessage_Type)0, false, openxc_RawMessage_init_zero, false, openxc_TranslatedMessage_init_zero, false, openxc_DiagnosticResponse_init_zero, false, openxc_ControlCommand_init_zero, false, openxc_CommandResponse_init_zero}
 #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_ControlCommand_init_zero          {false, (openxc_ControlCommand_Type)0, false, openxc_DiagnosticControlCommand_init_zero, false, openxc_PassthroughModeControlCommand_init_zero, false, openxc_AcceptanceFilterBypassCommand_init_zero, false, openxc_MessageFormatCommand_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, 0}
+#define openxc_AcceptanceFilterBypassCommand_init_zero {false, 0, false, 0}
+#define openxc_MessageFormatCommand_init_zero    {false, 0, 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}
@@ -204,6 +233,8 @@ typedef struct _openxc_VehicleMessage {
 #define openxc_TranslatedMessage_init_zero       {false, (openxc_TranslatedMessage_Type)0, false, "", false, openxc_DynamicField_init_zero, false, openxc_DynamicField_init_zero}
 
 /* Field tags (for use in manual encoding/decoding) */
+#define openxc_AcceptanceFilterBypassCommand_bus_tag 1
+#define openxc_AcceptanceFilterBypassCommand_bypass_tag 2
 #define openxc_CommandResponse_type_tag          1
 #define openxc_CommandResponse_message_tag       2
 #define openxc_CommandResponse_status_tag        3
@@ -228,6 +259,8 @@ 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_PassthroughModeControlCommand_bus_tag 1
 #define openxc_PassthroughModeControlCommand_enabled_tag 2
 #define openxc_RawMessage_bus_tag                1
@@ -242,6 +275,8 @@ typedef struct _openxc_VehicleMessage {
 #define openxc_ControlCommand_type_tag           1
 #define openxc_ControlCommand_diagnostic_request_tag 2
 #define openxc_ControlCommand_passthrough_mode_request_tag 3
+#define openxc_ControlCommand_acceptance_filter_bypass_command_tag 4
+#define openxc_ControlCommand_message_format_command_tag 5
 #define openxc_VehicleMessage_type_tag           1
 #define openxc_VehicleMessage_raw_message_tag    2
 #define openxc_VehicleMessage_translated_message_tag 3
@@ -252,9 +287,11 @@ 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[4];
+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_CommandResponse_fields[4];
 extern const pb_field_t openxc_DiagnosticRequest_fields[10];
 extern const pb_field_t openxc_DiagnosticResponse_fields[9];
@@ -262,11 +299,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               689
+#define openxc_VehicleMessage_size               724
 #define openxc_RawMessage_size                   27
-#define openxc_ControlCommand_size               99
+#define openxc_ControlCommand_size               133
 #define openxc_DiagnosticControlCommand_size     76
 #define openxc_PassthroughModeControlCommand_size 13
+#define openxc_AcceptanceFilterBypassCommand_size 13
+#define openxc_MessageFormatCommand_size         17
 #define openxc_CommandResponse_size              139
 #define openxc_DiagnosticRequest_size            68
 #define openxc_DiagnosticResponse_size           56