Add 'name' and 'multiple_responses' fields to diag requests.

3 files changed, 30 insertions, 19 deletions

diff --git a/gen/cpp/openxc.pb b/gen/cpp/openxc.pb
index 929e6a2c..54ddb8be 100644
--- a/gen/cpp/openxc.pb
+++ b/gen/cpp/openxc.pb
@@ -1,5 +1,5 @@
 
-ð
+š
 openxc.protoopenxc"”
 VehicleMessage)
 type
 
(2.openxc.VehicleMessage.Type'
@@ -32,7 +32,7 @@ message_id 
(

 DIAGNOSTIC"M
 CommandResponse)
 type
 
(2.openxc.ControlCommand.Type
-message 
(	"ª

+message 
(	"Ô

 DiagnosticRequest
 bus
 
(
 
@@ -40,10 +40,13 @@ message_id 
(

 mode 
(

 pid 
(

 payload 
(
-
parse_payload 
(
-factor 
(

-offset 
(

-	frequency	 
(
"¡

+
parse_payload 
(
+multiple_responses 
(
+factor 
(

+offset	 
(

+	frequency
+ 
(

+name 
(	"¡

 DiagnosticResponse
 bus
 
(
 
diff --git a/gen/cpp/openxc.pb.c b/gen/cpp/openxc.pb.c
index b4cace32..25ed2bbf 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 Thu Mar  6 16:21:37 2014. */
+/* Generated by nanopb-0.2.5 at Sat Mar 15 12:44:03 2014. */
 
 #include "openxc.pb.h"
 
@@ -34,16 +34,18 @@ const pb_field_t openxc_CommandResponse_fields[3] = {
     PB_LAST_FIELD
 };
 
-const pb_field_t openxc_DiagnosticRequest_fields[10] = {
+const pb_field_t openxc_DiagnosticRequest_fields[12] = {
     PB_FIELD2(  1, INT32   , OPTIONAL, STATIC  , FIRST, openxc_DiagnosticRequest, bus, bus, 0),
     PB_FIELD2(  2, UINT32  , OPTIONAL, STATIC  , OTHER, openxc_DiagnosticRequest, message_id, bus, 0),
     PB_FIELD2(  3, UINT32  , OPTIONAL, STATIC  , OTHER, openxc_DiagnosticRequest, mode, message_id, 0),
     PB_FIELD2(  4, UINT32  , OPTIONAL, STATIC  , OTHER, openxc_DiagnosticRequest, pid, mode, 0),
     PB_FIELD2(  5, BYTES   , OPTIONAL, STATIC  , OTHER, openxc_DiagnosticRequest, payload, pid, 0),
     PB_FIELD2(  6, BOOL    , OPTIONAL, STATIC  , OTHER, openxc_DiagnosticRequest, parse_payload, payload, 0),
-    PB_FIELD2(  7, DOUBLE  , OPTIONAL, STATIC  , OTHER, openxc_DiagnosticRequest, factor, parse_payload, 0),
-    PB_FIELD2(  8, DOUBLE  , OPTIONAL, STATIC  , OTHER, openxc_DiagnosticRequest, offset, factor, 0),
-    PB_FIELD2(  9, DOUBLE  , OPTIONAL, STATIC  , OTHER, openxc_DiagnosticRequest, frequency, offset, 0),
+    PB_FIELD2(  7, BOOL    , OPTIONAL, STATIC  , OTHER, openxc_DiagnosticRequest, multiple_responses, parse_payload, 0),
+    PB_FIELD2(  8, DOUBLE  , OPTIONAL, STATIC  , OTHER, openxc_DiagnosticRequest, factor, multiple_responses, 0),
+    PB_FIELD2(  9, DOUBLE  , OPTIONAL, STATIC  , OTHER, openxc_DiagnosticRequest, offset, factor, 0),
+    PB_FIELD2( 10, DOUBLE  , OPTIONAL, STATIC  , OTHER, openxc_DiagnosticRequest, frequency, offset, 0),
+    PB_FIELD2( 11, STRING  , OPTIONAL, STATIC  , OTHER, openxc_DiagnosticRequest, name, frequency, 0),
     PB_LAST_FIELD
 };
 
diff --git a/gen/cpp/openxc.pb.h b/gen/cpp/openxc.pb.h
index 5db13577..267f785c 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 Thu Mar  6 16:21:37 2014. */
+/* Generated by nanopb-0.2.5 at Sat Mar 15 12:44:03 2014. */
 
 #ifndef _PB_OPENXC_PB_H_
 #define _PB_OPENXC_PB_H_
@@ -65,12 +65,16 @@ typedef struct _openxc_DiagnosticRequest {
     openxc_DiagnosticRequest_payload_t payload;
     bool has_parse_payload;
     bool parse_payload;
+    bool has_multiple_responses;
+    bool multiple_responses;
     bool has_factor;
     double factor;
     bool has_offset;
     double offset;
     bool has_frequency;
     double frequency;
+    bool has_name;
+    char name[10];
 } openxc_DiagnosticRequest;
 
 typedef struct {
@@ -166,9 +170,11 @@ typedef struct _openxc_VehicleMessage {
 #define openxc_DiagnosticRequest_pid_tag         4
 #define openxc_DiagnosticRequest_payload_tag     5
 #define openxc_DiagnosticRequest_parse_payload_tag 6
-#define openxc_DiagnosticRequest_factor_tag      7
-#define openxc_DiagnosticRequest_offset_tag      8
-#define openxc_DiagnosticRequest_frequency_tag   9
+#define openxc_DiagnosticRequest_multiple_responses_tag 7
+#define openxc_DiagnosticRequest_factor_tag      8
+#define openxc_DiagnosticRequest_offset_tag      9
+#define openxc_DiagnosticRequest_frequency_tag   10
+#define openxc_DiagnosticRequest_name_tag        11
 #define openxc_DiagnosticResponse_bus_tag        1
 #define openxc_DiagnosticResponse_message_id_tag 2
 #define openxc_DiagnosticResponse_mode_tag       3
@@ -202,17 +208,17 @@ 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[10];
+extern const pb_field_t openxc_DiagnosticRequest_fields[12];
 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               664
+#define openxc_VehicleMessage_size               678
 #define openxc_RawMessage_size                   27
-#define openxc_ControlCommand_size               76
+#define openxc_ControlCommand_size               90
 #define openxc_CommandResponse_size              137
-#define openxc_DiagnosticRequest_size            68
+#define openxc_DiagnosticRequest_size            82
 #define openxc_DiagnosticResponse_size           56
 #define openxc_DynamicField_size                 119
 #define openxc_TranslatedMessage_size            350