Add a protobuf type for diagnostic message responses.

3 files changed, 52 insertions, 6 deletions

diff --git a/gen/cpp/openxc.pb b/gen/cpp/openxc.pb
index 88cf91aa..2267f21c 100644
--- a/gen/cpp/openxc.pb
+++ b/gen/cpp/openxc.pb
@@ -1,5 +1,5 @@
 
-è
+ü
 openxc.protoopenxc"¼

 VehicleMessage)
 type
 
(2.openxc.VehicleMessage.Type'
@@ -14,7 +14,16 @@ RawMessage
 bus
 
(
 
 message_id 
(

-data 
("µ
+data 
("‘

+DiagnosticMessage
+bus
 
(
+
+message_id 
(

+mode 
(

+pid 
(

+success 
(
+negative_response_code 
(

+payload 
("µ
 TranslatedMessage,
 type
 
(2.openxc.TranslatedMessage.Type
 name 
(	
diff --git a/gen/cpp/openxc.pb.c b/gen/cpp/openxc.pb.c
index 8451121a..da616556 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.2.5 at Fri Jan 17 14:02:23 2014. */
+/* Generated by nanopb-0.2.5 at Fri Jan 17 14:12:22 2014. */
 
 #include "openxc.pb.h"
 
@@ -19,6 +19,17 @@ const pb_field_t openxc_RawMessage_fields[4] = {
     PB_LAST_FIELD
 };
 
+const pb_field_t openxc_DiagnosticMessage_fields[8] = {
+    PB_FIELD2(  1, INT32   , OPTIONAL, STATIC  , FIRST, openxc_DiagnosticMessage, bus, bus, 0),
+    PB_FIELD2(  2, UINT32  , OPTIONAL, STATIC  , OTHER, openxc_DiagnosticMessage, message_id, bus, 0),
+    PB_FIELD2(  3, UINT32  , OPTIONAL, STATIC  , OTHER, openxc_DiagnosticMessage, mode, message_id, 0),
+    PB_FIELD2(  4, UINT32  , OPTIONAL, STATIC  , OTHER, openxc_DiagnosticMessage, pid, mode, 0),
+    PB_FIELD2(  5, BOOL    , OPTIONAL, STATIC  , OTHER, openxc_DiagnosticMessage, success, pid, 0),
+    PB_FIELD2(  6, UINT32  , OPTIONAL, STATIC  , OTHER, openxc_DiagnosticMessage, negative_response_code, success, 0),
+    PB_FIELD2(  7, UINT64  , OPTIONAL, STATIC  , OTHER, openxc_DiagnosticMessage, payload, negative_response_code, 0),
+    PB_LAST_FIELD
+};
+
 const pb_field_t openxc_TranslatedMessage_fields[9] = {
     PB_FIELD2(  1, ENUM    , OPTIONAL, STATIC  , FIRST, openxc_TranslatedMessage, type, type, 0),
     PB_FIELD2(  2, STRING  , OPTIONAL, STATIC  , OTHER, openxc_TranslatedMessage, name, type, 0),
@@ -34,11 +45,11 @@ const pb_field_t openxc_TranslatedMessage_fields[9] = {
 
 /* Check that field information fits in pb_field_t */
 #if !defined(PB_FIELD_16BIT) && !defined(PB_FIELD_32BIT)
-STATIC_ASSERT((pb_membersize(openxc_VehicleMessage, raw_message) < 256 && pb_membersize(openxc_VehicleMessage, translated_message) < 256), YOU_MUST_DEFINE_PB_FIELD_16BIT_FOR_MESSAGES_openxc_VehicleMessage_openxc_RawMessage_openxc_TranslatedMessage)
+STATIC_ASSERT((pb_membersize(openxc_VehicleMessage, raw_message) < 256 && pb_membersize(openxc_VehicleMessage, translated_message) < 256), YOU_MUST_DEFINE_PB_FIELD_16BIT_FOR_MESSAGES_openxc_VehicleMessage_openxc_RawMessage_openxc_DiagnosticMessage_openxc_TranslatedMessage)
 #endif
 
 #if !defined(PB_FIELD_32BIT)
-STATIC_ASSERT((pb_membersize(openxc_VehicleMessage, raw_message) < 65536 && pb_membersize(openxc_VehicleMessage, translated_message) < 65536), YOU_MUST_DEFINE_PB_FIELD_32BIT_FOR_MESSAGES_openxc_VehicleMessage_openxc_RawMessage_openxc_TranslatedMessage)
+STATIC_ASSERT((pb_membersize(openxc_VehicleMessage, raw_message) < 65536 && pb_membersize(openxc_VehicleMessage, translated_message) < 65536), YOU_MUST_DEFINE_PB_FIELD_32BIT_FOR_MESSAGES_openxc_VehicleMessage_openxc_RawMessage_openxc_DiagnosticMessage_openxc_TranslatedMessage)
 #endif
 
 /* On some platforms (such as AVR), double is really float.
diff --git a/gen/cpp/openxc.pb.h b/gen/cpp/openxc.pb.h
index bc845159..e4619ce1 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.5 at Fri Jan 17 14:02:23 2014. */
+/* Generated by nanopb-0.2.5 at Fri Jan 17 14:12:22 2014. */
 
 #ifndef _PB_OPENXC_PB_H_
 #define _PB_OPENXC_PB_H_
@@ -25,6 +25,23 @@ typedef enum _openxc_TranslatedMessage_Type {
 } openxc_TranslatedMessage_Type;
 
 /* Struct definitions */
+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;
+    uint64_t payload;
+} openxc_DiagnosticMessage;
+
 typedef struct _openxc_RawMessage {
     bool has_bus;
     int32_t bus;
@@ -65,6 +82,13 @@ typedef struct _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
@@ -83,11 +107,13 @@ typedef struct _openxc_VehicleMessage {
 /* Struct field encoding specification for nanopb */
 extern const pb_field_t openxc_VehicleMessage_fields[4];
 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_RawMessage_size                   28
+#define openxc_DiagnosticMessage_size            48
 #define openxc_TranslatedMessage_size            334
 
 #ifdef __cplusplus