X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=gen%2Fcpp%2Fopenxc.pb.h;h=879dbb806c4eb182883535d6332ccafdd2947389;hb=6f4799ca62b964e5626d9b22c4d292e6bd378d57;hp=d278c6816a35e9cec2951e7dcabf1b9628811556;hpb=4904749890b1f2570f9197da99a07a76471e8400;p=apps%2Fagl-service-can-low-level.git

diff --git a/gen/cpp/openxc.pb.h b/gen/cpp/openxc.pb.h
index d278c681..879dbb80 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.2.4-dev at Wed Oct  9 14:26:13 2013. */
+/* Generated by nanopb-0.2.5 at Fri Jan 17 16:33:23 2014. */
 
 #ifndef _PB_OPENXC_PB_H_
 #define _PB_OPENXC_PB_H_
@@ -12,32 +12,71 @@ 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 {
+    openxc_TranslatedMessage_Type_STRING = 1,
+    openxc_TranslatedMessage_Type_NUM = 2,
+    openxc_TranslatedMessage_Type_BOOL = 3,
+    openxc_TranslatedMessage_Type_EVENTED_STRING = 4,
+    openxc_TranslatedMessage_Type_EVENTED_NUM = 5,
+    openxc_TranslatedMessage_Type_EVENTED_BOOL = 6
+} 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;
+    bool has_message_id;
+    uint32_t message_id;
+    bool has_mode;
+    uint32_t mode;
+    bool has_pid;
+    uint32_t pid;
+    bool has_success;
+    bool success;
+    bool has_negative_response_code;
+    uint32_t negative_response_code;
+    bool has_payload;
+    openxc_DiagnosticMessage_payload_t payload;
+} openxc_DiagnosticMessage;
+
+typedef struct {
+    size_t size;
+    uint8_t bytes[8];
+} openxc_RawMessage_data_t;
+
 typedef struct _openxc_RawMessage {
     bool has_bus;
     int32_t bus;
     bool has_message_id;
     uint32_t message_id;
     bool has_data;
-    uint64_t data;
+    openxc_RawMessage_data_t data;
 } openxc_RawMessage;
 
 typedef struct _openxc_TranslatedMessage {
+    bool has_type;
+    openxc_TranslatedMessage_Type type;
     bool has_name;
     char name[100];
     bool has_string_value;
     char string_value[100];
-    bool has_numerical_value;
-    double numerical_value;
+    bool has_numeric_value;
+    double numeric_value;
     bool has_boolean_value;
     bool boolean_value;
     bool has_string_event;
     char string_event[100];
-    bool has_numerical_event;
-    double numerical_event;
+    bool has_numeric_event;
+    double numeric_event;
     bool has_boolean_event;
     bool boolean_event;
 } openxc_TranslatedMessage;
@@ -49,34 +88,47 @@ 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 */
 
 /* Field tags (for use in manual encoding/decoding) */
+#define openxc_DiagnosticMessage_bus_tag         1
+#define openxc_DiagnosticMessage_message_id_tag  2
+#define openxc_DiagnosticMessage_mode_tag        3
+#define openxc_DiagnosticMessage_pid_tag         4
+#define openxc_DiagnosticMessage_success_tag     5
+#define openxc_DiagnosticMessage_negative_response_code_tag 6
+#define openxc_DiagnosticMessage_payload_tag     7
 #define openxc_RawMessage_bus_tag                1
 #define openxc_RawMessage_message_id_tag         2
 #define openxc_RawMessage_data_tag               3
-#define openxc_TranslatedMessage_name_tag        1
-#define openxc_TranslatedMessage_string_value_tag 2
-#define openxc_TranslatedMessage_numerical_value_tag 3
-#define openxc_TranslatedMessage_boolean_value_tag 4
-#define openxc_TranslatedMessage_string_event_tag 5
-#define openxc_TranslatedMessage_numerical_event_tag 6
-#define openxc_TranslatedMessage_boolean_event_tag 7
+#define openxc_TranslatedMessage_type_tag        1
+#define openxc_TranslatedMessage_name_tag        2
+#define openxc_TranslatedMessage_string_value_tag 3
+#define openxc_TranslatedMessage_numeric_value_tag 4
+#define openxc_TranslatedMessage_boolean_value_tag 5
+#define openxc_TranslatedMessage_string_event_tag 6
+#define openxc_TranslatedMessage_numeric_event_tag 7
+#define openxc_TranslatedMessage_boolean_event_tag 8
 #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_TranslatedMessage_fields[8];
+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               362
-#define openxc_RawMessage_size                   23
-#define openxc_TranslatedMessage_size            328
+#define openxc_VehicleMessage_size               421
+#define openxc_RawMessage_size                   27
+#define openxc_DiagnosticMessage_size            47
+#define openxc_TranslatedMessage_size            334
 
 #ifdef __cplusplus
 } /* extern "C" */