3 files changed, 129 insertions, 37 deletions

diff --git a/gen/cpp/openxc.pb b/gen/cpp/openxc.pb
index ead68af6..d4bd0a80 100644
--- a/gen/cpp/openxc.pb
+++ b/gen/cpp/openxc.pb
@@ -1,11 +1,11 @@
 
-Ò
-openxc.protoopenxc"ƒ
+«	
+openxc.protoopenxc"…
 VehicleMessage)
 type
 
(2.openxc.VehicleMessage.Type'
 raw_message 
(2.openxc.RawMessage5
-translated_message 
(2.openxc.TranslatedMessage5
-diagnostic_message 
(2.openxc.DiagnosticMessage"/
+translated_message 
(2.openxc.TranslatedMessage7
+diagnostic_response 
(2.openxc.DiagnosticResponse"/
 Type
 RAW

 
@@ -17,8 +17,27 @@ RawMessage
 bus
 
(
 
 message_id 
(

-data 
(" 

-DiagnosticMessage
+data 
("¦

+ControlCommand)
+type
 
(2.openxc.ControlCommand.Type5
+diagnostic_request 
(2.openxc.DiagnosticRequest"2
+Type
+VERSION


+	DEVICE_ID
+
+DIAGNOSTIC"ª

+DiagnosticRequest
+bus
 
(
+
+message_id 
(

+mode 
(

+pid 
(

+payload 
(
+
parse_payload 
(
+factor 
(

+offset 
(

+	frequency	 
(
"¡

+DiagnosticResponse
 bus
 
(
 
 message_id 
(

diff --git a/gen/cpp/openxc.pb.c b/gen/cpp/openxc.pb.c
index d473fd3b..8c663ef1 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 Feb 19 14:35:41 2014. */
+/* Generated by nanopb-0.2.5 at Mon Mar  3 15:48:39 2014. */
 
 #include "openxc.pb.h"
 
@@ -9,7 +9,7 @@ const pb_field_t openxc_VehicleMessage_fields[5] = {
     PB_FIELD2(  1, ENUM    , OPTIONAL, STATIC  , FIRST, openxc_VehicleMessage, type, type, 0),
     PB_FIELD2(  2, MESSAGE , OPTIONAL, STATIC  , OTHER, openxc_VehicleMessage, raw_message, type, &openxc_RawMessage_fields),
     PB_FIELD2(  3, MESSAGE , OPTIONAL, STATIC  , OTHER, openxc_VehicleMessage, translated_message, raw_message, &openxc_TranslatedMessage_fields),
-    PB_FIELD2(  4, MESSAGE , OPTIONAL, STATIC  , OTHER, openxc_VehicleMessage, diagnostic_message, translated_message, &openxc_DiagnosticMessage_fields),
+    PB_FIELD2(  4, MESSAGE , OPTIONAL, STATIC  , OTHER, openxc_VehicleMessage, diagnostic_response, translated_message, &openxc_DiagnosticResponse_fields),
     PB_LAST_FIELD
 };
 
@@ -20,15 +20,34 @@ const pb_field_t openxc_RawMessage_fields[4] = {
     PB_LAST_FIELD
 };
 
-const pb_field_t openxc_DiagnosticMessage_fields[9] = {
-    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, BYTES   , OPTIONAL, STATIC  , OTHER, openxc_DiagnosticMessage, payload, negative_response_code, 0),
-    PB_FIELD2(  8, DOUBLE  , OPTIONAL, STATIC  , OTHER, openxc_DiagnosticMessage, value, payload, 0),
+const pb_field_t openxc_ControlCommand_fields[3] = {
+    PB_FIELD2(  1, ENUM    , OPTIONAL, STATIC  , FIRST, openxc_ControlCommand, type, type, 0),
+    PB_FIELD2(  2, MESSAGE , OPTIONAL, STATIC  , OTHER, openxc_ControlCommand, diagnostic_request, type, &openxc_DiagnosticRequest_fields),
+    PB_LAST_FIELD
+};
+
+const pb_field_t openxc_DiagnosticRequest_fields[10] = {
+    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_LAST_FIELD
+};
+
+const pb_field_t openxc_DiagnosticResponse_fields[9] = {
+    PB_FIELD2(  1, INT32   , OPTIONAL, STATIC  , FIRST, openxc_DiagnosticResponse, bus, bus, 0),
+    PB_FIELD2(  2, UINT32  , OPTIONAL, STATIC  , OTHER, openxc_DiagnosticResponse, message_id, bus, 0),
+    PB_FIELD2(  3, UINT32  , OPTIONAL, STATIC  , OTHER, openxc_DiagnosticResponse, mode, message_id, 0),
+    PB_FIELD2(  4, UINT32  , OPTIONAL, STATIC  , OTHER, openxc_DiagnosticResponse, pid, mode, 0),
+    PB_FIELD2(  5, BOOL    , OPTIONAL, STATIC  , OTHER, openxc_DiagnosticResponse, success, pid, 0),
+    PB_FIELD2(  6, UINT32  , OPTIONAL, STATIC  , OTHER, openxc_DiagnosticResponse, negative_response_code, success, 0),
+    PB_FIELD2(  7, BYTES   , OPTIONAL, STATIC  , OTHER, openxc_DiagnosticResponse, payload, negative_response_code, 0),
+    PB_FIELD2(  8, DOUBLE  , OPTIONAL, STATIC  , OTHER, openxc_DiagnosticResponse, value, payload, 0),
     PB_LAST_FIELD
 };
 
@@ -47,11 +66,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 && pb_membersize(openxc_VehicleMessage, diagnostic_message) < 256), YOU_MUST_DEFINE_PB_FIELD_16BIT_FOR_MESSAGES_openxc_VehicleMessage_openxc_RawMessage_openxc_DiagnosticMessage_openxc_TranslatedMessage)
+STATIC_ASSERT((pb_membersize(openxc_VehicleMessage, raw_message) < 256 && pb_membersize(openxc_VehicleMessage, translated_message) < 256 && pb_membersize(openxc_VehicleMessage, diagnostic_response) < 256 && pb_membersize(openxc_ControlCommand, diagnostic_request) < 256), YOU_MUST_DEFINE_PB_FIELD_16BIT_FOR_MESSAGES_openxc_VehicleMessage_openxc_RawMessage_openxc_ControlCommand_openxc_DiagnosticRequest_openxc_DiagnosticResponse_openxc_TranslatedMessage)
 #endif
 
 #if !defined(PB_FIELD_32BIT)
-STATIC_ASSERT((pb_membersize(openxc_VehicleMessage, raw_message) < 65536 && pb_membersize(openxc_VehicleMessage, translated_message) < 65536 && pb_membersize(openxc_VehicleMessage, diagnostic_message) < 65536), YOU_MUST_DEFINE_PB_FIELD_32BIT_FOR_MESSAGES_openxc_VehicleMessage_openxc_RawMessage_openxc_DiagnosticMessage_openxc_TranslatedMessage)
+STATIC_ASSERT((pb_membersize(openxc_VehicleMessage, raw_message) < 65536 && pb_membersize(openxc_VehicleMessage, translated_message) < 65536 && pb_membersize(openxc_VehicleMessage, diagnostic_response) < 65536 && pb_membersize(openxc_ControlCommand, diagnostic_request) < 65536), YOU_MUST_DEFINE_PB_FIELD_32BIT_FOR_MESSAGES_openxc_VehicleMessage_openxc_RawMessage_openxc_ControlCommand_openxc_DiagnosticRequest_openxc_DiagnosticResponse_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 9e4c3a27..cfb0ef74 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 Feb 19 14:35:41 2014. */
+/* Generated by nanopb-0.2.5 at Mon Mar  3 15:48:39 2014. */
 
 #ifndef _PB_OPENXC_PB_H_
 #define _PB_OPENXC_PB_H_
@@ -16,6 +16,12 @@ typedef enum _openxc_VehicleMessage_Type {
     openxc_VehicleMessage_Type_DIAGNOSTIC = 3
 } openxc_VehicleMessage_Type;
 
+typedef enum _openxc_ControlCommand_Type {
+    openxc_ControlCommand_Type_VERSION = 1,
+    openxc_ControlCommand_Type_DEVICE_ID = 2,
+    openxc_ControlCommand_Type_DIAGNOSTIC = 3
+} openxc_ControlCommand_Type;
+
 typedef enum _openxc_TranslatedMessage_Type {
     openxc_TranslatedMessage_Type_STRING = 1,
     openxc_TranslatedMessage_Type_NUM = 2,
@@ -29,9 +35,35 @@ typedef enum _openxc_TranslatedMessage_Type {
 typedef struct {
     size_t size;
     uint8_t bytes[8];
-} openxc_DiagnosticMessage_payload_t;
+} openxc_DiagnosticRequest_payload_t;
 
-typedef struct _openxc_DiagnosticMessage {
+typedef struct _openxc_DiagnosticRequest {
+    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_payload;
+    openxc_DiagnosticRequest_payload_t payload;
+    bool has_parse_payload;
+    bool parse_payload;
+    bool has_factor;
+    double factor;
+    bool has_offset;
+    double offset;
+    bool has_frequency;
+    double frequency;
+} openxc_DiagnosticRequest;
+
+typedef struct {
+    size_t size;
+    uint8_t bytes[8];
+} openxc_DiagnosticResponse_payload_t;
+
+typedef struct _openxc_DiagnosticResponse {
     bool has_bus;
     int32_t bus;
     bool has_message_id;
@@ -45,10 +77,10 @@ typedef struct _openxc_DiagnosticMessage {
     bool has_negative_response_code;
     uint32_t negative_response_code;
     bool has_payload;
-    openxc_DiagnosticMessage_payload_t payload;
+    openxc_DiagnosticResponse_payload_t payload;
     bool has_value;
     double value;
-} openxc_DiagnosticMessage;
+} openxc_DiagnosticResponse;
 
 typedef struct {
     size_t size;
@@ -83,6 +115,13 @@ typedef struct _openxc_TranslatedMessage {
     bool boolean_event;
 } openxc_TranslatedMessage;
 
+typedef struct _openxc_ControlCommand {
+    bool has_type;
+    openxc_ControlCommand_Type type;
+    bool has_diagnostic_request;
+    openxc_DiagnosticRequest diagnostic_request;
+} openxc_ControlCommand;
+
 typedef struct _openxc_VehicleMessage {
     bool has_type;
     openxc_VehicleMessage_Type type;
@@ -90,21 +129,30 @@ typedef struct _openxc_VehicleMessage {
     openxc_RawMessage raw_message;
     bool has_translated_message;
     openxc_TranslatedMessage translated_message;
-    bool has_diagnostic_message;
-    openxc_DiagnosticMessage diagnostic_message;
+    bool has_diagnostic_response;
+    openxc_DiagnosticResponse diagnostic_response;
 } 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_DiagnosticMessage_value_tag       8
+#define openxc_DiagnosticRequest_bus_tag         1
+#define openxc_DiagnosticRequest_message_id_tag  2
+#define openxc_DiagnosticRequest_mode_tag        3
+#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_DiagnosticResponse_bus_tag        1
+#define openxc_DiagnosticResponse_message_id_tag 2
+#define openxc_DiagnosticResponse_mode_tag       3
+#define openxc_DiagnosticResponse_pid_tag        4
+#define openxc_DiagnosticResponse_success_tag    5
+#define openxc_DiagnosticResponse_negative_response_code_tag 6
+#define openxc_DiagnosticResponse_payload_tag    7
+#define openxc_DiagnosticResponse_value_tag      8
 #define openxc_RawMessage_bus_tag                1
 #define openxc_RawMessage_message_id_tag         2
 #define openxc_RawMessage_data_tag               3
@@ -116,21 +164,27 @@ typedef struct _openxc_VehicleMessage {
 #define openxc_TranslatedMessage_string_event_tag 6
 #define openxc_TranslatedMessage_numeric_event_tag 7
 #define openxc_TranslatedMessage_boolean_event_tag 8
+#define openxc_ControlCommand_type_tag           1
+#define openxc_ControlCommand_diagnostic_request_tag 2
 #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
+#define openxc_VehicleMessage_diagnostic_response_tag 4
 
 /* Struct field encoding specification for nanopb */
 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[9];
+extern const pb_field_t openxc_ControlCommand_fields[3];
+extern const pb_field_t openxc_DiagnosticRequest_fields[10];
+extern const pb_field_t openxc_DiagnosticResponse_fields[9];
 extern const pb_field_t openxc_TranslatedMessage_fields[9];
 
 /* Maximum encoded size of messages (where known) */
 #define openxc_VehicleMessage_size               430
 #define openxc_RawMessage_size                   27
-#define openxc_DiagnosticMessage_size            56
+#define openxc_ControlCommand_size               76
+#define openxc_DiagnosticRequest_size            68
+#define openxc_DiagnosticResponse_size           56
 #define openxc_TranslatedMessage_size            334
 
 #ifdef __cplusplus