Merge branch 'master' into diagnostic

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

diff --git a/gen/cpp/openxc.pb.h b/gen/cpp/openxc.pb.h
index e4619ce..95276b4 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 Fri Jan 17 14:12:22 2014. */
+/* Generated by nanopb-0.2.5 at Fri Jan 17 14:40:08 2014. */
 
 #ifndef _PB_OPENXC_PB_H_
 #define _PB_OPENXC_PB_H_
@@ -12,7 +12,8 @@ extern "C" {
 /* Enum definitions */
 typedef enum _openxc_VehicleMessage_Type {
     openxc_VehicleMessage_Type_RAW = 1,
-    openxc_VehicleMessage_Type_TRANSLATED = 2
+    openxc_VehicleMessage_Type_TRANSLATED = 2,
+    openxc_VehicleMessage_Type_DIAGNOSTIC = 3
 } openxc_VehicleMessage_Type;
 
 typedef enum _openxc_TranslatedMessage_Type {
@@ -25,6 +26,11 @@ typedef enum _openxc_TranslatedMessage_Type {
 } openxc_TranslatedMessage_Type;
 
 /* Struct definitions */
+typedef struct {
+    size_t size;
+    uint8_t bytes[8];
+} openxc_DiagnosticMessage_payload_t;
+
 typedef struct _openxc_DiagnosticMessage {
     bool has_bus;
     int32_t bus;
@@ -39,7 +45,7 @@ typedef struct _openxc_DiagnosticMessage {
     bool has_negative_response_code;
     uint32_t negative_response_code;
     bool has_payload;
-    uint64_t payload;
+    openxc_DiagnosticMessage_payload_t payload;
 } openxc_DiagnosticMessage;
 
 typedef struct _openxc_RawMessage {
@@ -77,6 +83,8 @@ typedef struct _openxc_VehicleMessage {
     openxc_RawMessage raw_message;
     bool has_translated_message;
     openxc_TranslatedMessage translated_message;
+    bool has_diagnostic_message;
+    openxc_DiagnosticMessage diagnostic_message;
 } openxc_VehicleMessage;
 
 /* Default values for struct fields */
@@ -103,17 +111,18 @@ typedef struct _openxc_VehicleMessage {
 #define openxc_VehicleMessage_type_tag           1
 #define openxc_VehicleMessage_raw_message_tag    2
 #define openxc_VehicleMessage_translated_message_tag 3
+#define openxc_VehicleMessage_diagnostic_message_tag 4
 
 /* Struct field encoding specification for nanopb */
-extern const pb_field_t openxc_VehicleMessage_fields[4];
+extern const pb_field_t openxc_VehicleMessage_fields[5];
 extern const pb_field_t openxc_RawMessage_fields[4];
 extern const pb_field_t openxc_DiagnosticMessage_fields[8];
 extern const pb_field_t openxc_TranslatedMessage_fields[9];
 
 /* Maximum encoded size of messages (where known) */
-#define openxc_VehicleMessage_size               373
+#define openxc_VehicleMessage_size               422
 #define openxc_RawMessage_size                   28
-#define openxc_DiagnosticMessage_size            48
+#define openxc_DiagnosticMessage_size            47
 #define openxc_TranslatedMessage_size            334
 
 #ifdef __cplusplus