Move ControlCommand inside VehicleMessage so it can be on same stream.

3 files changed, 19 insertions, 12 deletions

diff --git a/gen/cpp/openxc.pb b/gen/cpp/openxc.pb
index d4bd0a80..50591abc 100644
--- a/gen/cpp/openxc.pb
+++ b/gen/cpp/openxc.pb
@@ -1,17 +1,19 @@
 
-«	
-openxc.protoopenxc"…
+ñ	
+openxc.protoopenxc"Ë
 VehicleMessage)
 type
 
(2.openxc.VehicleMessage.Type'
 raw_message 
(2.openxc.RawMessage5
 translated_message 
(2.openxc.TranslatedMessage7
-diagnostic_response 
(2.openxc.DiagnosticResponse"/
+diagnostic_response 
(2.openxc.DiagnosticResponse/
+control_command 
(2.openxc.ControlCommand"D
 Type
 RAW

 
 TRANSLATED
 
-DIAGNOSTIC";
+DIAGNOSTIC
+CONTROL_COMMAND";
 
 RawMessage
 bus
 
(
diff --git a/gen/cpp/openxc.pb.c b/gen/cpp/openxc.pb.c
index 8c663ef1..4f1fa5a3 100644
--- a/gen/cpp/openxc.pb.c
+++ b/gen/cpp/openxc.pb.c
@@ -1,15 +1,16 @@
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.2.5 at Mon Mar  3 15:48:39 2014. */
+/* Generated by nanopb-0.2.5 at Tue Mar  4 12:52:45 2014. */
 
 #include "openxc.pb.h"
 
 
 
-const pb_field_t openxc_VehicleMessage_fields[5] = {
+const pb_field_t openxc_VehicleMessage_fields[6] = {
     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_response, translated_message, &openxc_DiagnosticResponse_fields),
+    PB_FIELD2(  5, MESSAGE , OPTIONAL, STATIC  , OTHER, openxc_VehicleMessage, control_command, diagnostic_response, &openxc_ControlCommand_fields),
     PB_LAST_FIELD
 };
 
@@ -66,11 +67,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_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)
+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_VehicleMessage, control_command) < 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_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)
+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_VehicleMessage, control_command) < 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 cfb0ef74..3363d474 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 Mon Mar  3 15:48:39 2014. */
+/* Generated by nanopb-0.2.5 at Tue Mar  4 12:52:45 2014. */
 
 #ifndef _PB_OPENXC_PB_H_
 #define _PB_OPENXC_PB_H_
@@ -13,7 +13,8 @@ extern "C" {
 typedef enum _openxc_VehicleMessage_Type {
     openxc_VehicleMessage_Type_RAW = 1,
     openxc_VehicleMessage_Type_TRANSLATED = 2,
-    openxc_VehicleMessage_Type_DIAGNOSTIC = 3
+    openxc_VehicleMessage_Type_DIAGNOSTIC = 3,
+    openxc_VehicleMessage_Type_CONTROL_COMMAND = 4
 } openxc_VehicleMessage_Type;
 
 typedef enum _openxc_ControlCommand_Type {
@@ -131,6 +132,8 @@ typedef struct _openxc_VehicleMessage {
     openxc_TranslatedMessage translated_message;
     bool has_diagnostic_response;
     openxc_DiagnosticResponse diagnostic_response;
+    bool has_control_command;
+    openxc_ControlCommand control_command;
 } openxc_VehicleMessage;
 
 /* Default values for struct fields */
@@ -170,9 +173,10 @@ typedef struct _openxc_VehicleMessage {
 #define openxc_VehicleMessage_raw_message_tag    2
 #define openxc_VehicleMessage_translated_message_tag 3
 #define openxc_VehicleMessage_diagnostic_response_tag 4
+#define openxc_VehicleMessage_control_command_tag 5
 
 /* Struct field encoding specification for nanopb */
-extern const pb_field_t openxc_VehicleMessage_fields[5];
+extern const pb_field_t openxc_VehicleMessage_fields[6];
 extern const pb_field_t openxc_RawMessage_fields[4];
 extern const pb_field_t openxc_ControlCommand_fields[3];
 extern const pb_field_t openxc_DiagnosticRequest_fields[10];
@@ -180,7 +184,7 @@ 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_VehicleMessage_size               508
 #define openxc_RawMessage_size                   27
 #define openxc_ControlCommand_size               76
 #define openxc_DiagnosticRequest_size            68