Require an 'action' in diagnostic requests.

It wasn't very clean to try and infer a delete/create/update based on
the value of the frequency field - this will require a little more code,
but as they say in Python, explicit is better than implicit.

Fixed https://github.com/openxc/openxc-message-format/issues/12

3 files changed, 30 insertions, 11 deletions

diff --git a/gen/cpp/openxc.pb b/gen/cpp/openxc.pb
index da312337..282e5818 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
 
(
 
@@ -43,10 +43,19 @@ message_id 
(

 multiple_responses 
(
 	frequency 
(

 name 
(	;
-decoded_type	 
(2%.openxc.DiagnosticRequest.DecodedType"!
+decoded_type	 
(2%.openxc.DiagnosticRequest.DecodedType0
+action
+ 
(2 .openxc.DiagnosticRequest.Action"!
 DecodedType
 NONE

-OBD2"¡

+OBD2",
+Action
+
+CREATE

+
+UPDATE
+
+DELETE"¡

 DiagnosticResponse
 bus
 
(
 
diff --git a/gen/cpp/openxc.pb.c b/gen/cpp/openxc.pb.c
index e3be2570..24f4b3c6 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 Wed Mar 26 09:29:06 2014. */
+/* Generated by nanopb-0.2.5 at Mon Aug  4 23:15:59 2014. */
 
 #include "openxc.pb.h"
 
@@ -34,7 +34,7 @@ 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[11] = {
     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),
@@ -44,6 +44,7 @@ const pb_field_t openxc_DiagnosticRequest_fields[10] = {
     PB_FIELD2(  7, DOUBLE  , OPTIONAL, STATIC  , OTHER, openxc_DiagnosticRequest, frequency, multiple_responses, 0),
     PB_FIELD2(  8, STRING  , OPTIONAL, STATIC  , OTHER, openxc_DiagnosticRequest, name, frequency, 0),
     PB_FIELD2(  9, ENUM    , OPTIONAL, STATIC  , OTHER, openxc_DiagnosticRequest, decoded_type, name, 0),
+    PB_FIELD2( 10, ENUM    , OPTIONAL, STATIC  , OTHER, openxc_DiagnosticRequest, action, decoded_type, 0),
     PB_LAST_FIELD
 };
 
diff --git a/gen/cpp/openxc.pb.h b/gen/cpp/openxc.pb.h
index e70324f0..d0c7da49 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 Wed Mar 26 09:29:06 2014. */
+/* Generated by nanopb-0.2.5 at Mon Aug  4 23:15:59 2014. */
 
 #ifndef _PB_OPENXC_PB_H_
 #define _PB_OPENXC_PB_H_
@@ -29,6 +29,12 @@ typedef enum _openxc_DiagnosticRequest_DecodedType {
     openxc_DiagnosticRequest_DecodedType_OBD2 = 2
 } openxc_DiagnosticRequest_DecodedType;
 
+typedef enum _openxc_DiagnosticRequest_Action {
+    openxc_DiagnosticRequest_Action_CREATE = 1,
+    openxc_DiagnosticRequest_Action_UPDATE = 2,
+    openxc_DiagnosticRequest_Action_DELETE = 3
+} openxc_DiagnosticRequest_Action;
+
 typedef enum _openxc_DynamicField_Type {
     openxc_DynamicField_Type_STRING = 1,
     openxc_DynamicField_Type_NUM = 2,
@@ -76,6 +82,8 @@ typedef struct _openxc_DiagnosticRequest {
     char name[10];
     bool has_decoded_type;
     openxc_DiagnosticRequest_DecodedType decoded_type;
+    bool has_action;
+    openxc_DiagnosticRequest_Action action;
 } openxc_DiagnosticRequest;
 
 typedef struct {
@@ -174,6 +182,7 @@ typedef struct _openxc_VehicleMessage {
 #define openxc_DiagnosticRequest_frequency_tag   7
 #define openxc_DiagnosticRequest_name_tag        8
 #define openxc_DiagnosticRequest_decoded_type_tag 9
+#define openxc_DiagnosticRequest_action_tag      10
 #define openxc_DiagnosticResponse_bus_tag        1
 #define openxc_DiagnosticResponse_message_id_tag 2
 #define openxc_DiagnosticResponse_mode_tag       3
@@ -207,17 +216,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[11];
 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               670
 #define openxc_RawMessage_size                   27
-#define openxc_ControlCommand_size               76
+#define openxc_ControlCommand_size               82
 #define openxc_CommandResponse_size              137
-#define openxc_DiagnosticRequest_size            68
+#define openxc_DiagnosticRequest_size            74
 #define openxc_DiagnosticResponse_size           56
 #define openxc_DynamicField_size                 119
 #define openxc_TranslatedMessage_size            350