Merge remote-tracking branch 'origin/latest-nanopb' into passthrough-command

Conflicts:
	gen/cpp/openxc.pb.c
	gen/cpp/openxc.pb.h

diff --cc gen/cpp/openxc.pb.c
index 8f9fc19,744c8bd..2ca5768
--- 1/gen/cpp/openxc.pb.c
--- 2/gen/cpp/openxc.pb.c
+++ b/gen/cpp/openxc.pb.c
@@@ -1,5 -1,5 +1,5 @@@
  /* Automatically generated nanopb constant definitions */
- /* Generated by nanopb-0.2.5 at Sat Sep 20 21:48:43 2014. */
 -/* Generated by nanopb-0.3.1 at Tue Sep 16 23:03:27 2014. */
++/* Generated by nanopb-0.3.1 at Sat Sep 20 21:59:09 2014. */
  
  #include "openxc.pb.h"
  
@@@ -23,21 -27,9 +27,21 @@@ const pb_field_t openxc_RawMessage_fiel
  };
  
  const pb_field_t openxc_ControlCommand_fields[4] = {
-     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_DiagnosticControlCommand_fields),
-     PB_FIELD2(  3, MESSAGE , OPTIONAL, STATIC  , OTHER, openxc_ControlCommand, passthrough_mode_request, diagnostic_request, &openxc_PassthroughModeControlCommand_fields),
+     PB_FIELD(  1, ENUM    , OPTIONAL, STATIC  , FIRST, openxc_ControlCommand, type, type, 0),
 -    PB_FIELD(  2, MESSAGE , OPTIONAL, STATIC  , OTHER, openxc_ControlCommand, diagnostic_request, type, &openxc_DiagnosticRequest_fields),
 -    PB_FIELD(  3, ENUM    , OPTIONAL, STATIC  , OTHER, openxc_ControlCommand, action, diagnostic_request, 0),
++    PB_FIELD(  2, MESSAGE , OPTIONAL, STATIC  , OTHER, openxc_ControlCommand, diagnostic_request, type, &openxc_DiagnosticControlCommand_fields),
++    PB_FIELD(  3, MESSAGE , OPTIONAL, STATIC  , OTHER, openxc_ControlCommand, passthrough_mode_request, diagnostic_request, &openxc_PassthroughModeControlCommand_fields),
 +    PB_LAST_FIELD
 +};
 +
 +const pb_field_t openxc_DiagnosticControlCommand_fields[3] = {
-     PB_FIELD2(  1, MESSAGE , OPTIONAL, STATIC  , FIRST, openxc_DiagnosticControlCommand, request, request, &openxc_DiagnosticRequest_fields),
-     PB_FIELD2(  2, ENUM    , OPTIONAL, STATIC  , OTHER, openxc_DiagnosticControlCommand, action, request, 0),
++    PB_FIELD(  1, MESSAGE , OPTIONAL, STATIC  , FIRST, openxc_DiagnosticControlCommand, request, request, &openxc_DiagnosticRequest_fields),
++    PB_FIELD(  2, ENUM    , OPTIONAL, STATIC  , OTHER, openxc_DiagnosticControlCommand, action, request, 0),
 +    PB_LAST_FIELD
 +};
 +
 +const pb_field_t openxc_PassthroughModeControlCommand_fields[3] = {
-     PB_FIELD2(  1, INT32   , OPTIONAL, STATIC  , FIRST, openxc_PassthroughModeControlCommand, bus, bus, 0),
-     PB_FIELD2(  2, ENUM    , OPTIONAL, STATIC  , OTHER, openxc_PassthroughModeControlCommand, mode, bus, 0),
++    PB_FIELD(  1, INT32   , OPTIONAL, STATIC  , FIRST, openxc_PassthroughModeControlCommand, bus, bus, 0),
++    PB_FIELD(  2, ENUM    , OPTIONAL, STATIC  , OTHER, openxc_PassthroughModeControlCommand, mode, bus, 0),
      PB_LAST_FIELD
  };
  
@@@ -91,14 -83,29 +95,29 @@@ const pb_field_t openxc_TranslatedMessa
  
  
  /* 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_VehicleMessage, control_command) < 256 && pb_membersize(openxc_VehicleMessage, command_response) < 256 && pb_membersize(openxc_ControlCommand, diagnostic_request) < 256 && pb_membersize(openxc_ControlCommand, passthrough_mode_request) < 256 && pb_membersize(openxc_DiagnosticControlCommand, request) < 256 && pb_membersize(openxc_TranslatedMessage, value) < 256 && pb_membersize(openxc_TranslatedMessage, event) < 256), YOU_MUST_DEFINE_PB_FIELD_16BIT_FOR_MESSAGES_openxc_VehicleMessage_openxc_RawMessage_openxc_ControlCommand_openxc_DiagnosticControlCommand_openxc_PassthroughModeControlCommand_openxc_CommandResponse_openxc_DiagnosticRequest_openxc_DiagnosticResponse_openxc_DynamicField_openxc_TranslatedMessage)
+ #if !defined(PB_FIELD_32BIT)
+ /* If you get an error here, it means that you need to define PB_FIELD_32BIT
+  * compile-time option. You can do that in pb.h or on compiler command line.
+  * 
+  * The reason you need to do this is that some of your messages contain tag
+  * numbers or field sizes that are larger than what can fit in 8 or 16 bit
+  * field descriptors.
+  */
 -PB_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_VehicleMessage, command_response) < 65536 && pb_membersize(openxc_ControlCommand, diagnostic_request) < 65536 && pb_membersize(openxc_TranslatedMessage, value) < 65536 && pb_membersize(openxc_TranslatedMessage, event) < 65536), YOU_MUST_DEFINE_PB_FIELD_32BIT_FOR_MESSAGES_openxc_VehicleMessage_openxc_RawMessage_openxc_ControlCommand_openxc_CommandResponse_openxc_DiagnosticRequest_openxc_DiagnosticResponse_openxc_DynamicField_openxc_TranslatedMessage)
++PB_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_VehicleMessage, command_response) < 65536 && pb_membersize(openxc_ControlCommand, diagnostic_request) < 65536 && pb_membersize(openxc_ControlCommand, passthrough_mode_request) < 65536 && pb_membersize(openxc_DiagnosticControlCommand, request) < 65536 && pb_membersize(openxc_TranslatedMessage, value) < 65536 && pb_membersize(openxc_TranslatedMessage, event) < 65536), YOU_MUST_DEFINE_PB_FIELD_32BIT_FOR_MESSAGES_openxc_VehicleMessage_openxc_RawMessage_openxc_ControlCommand_openxc_DiagnosticControlCommand_openxc_PassthroughModeControlCommand_openxc_CommandResponse_openxc_DiagnosticRequest_openxc_DiagnosticResponse_openxc_DynamicField_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_VehicleMessage, control_command) < 65536 && pb_membersize(openxc_VehicleMessage, command_response) < 65536 && pb_membersize(openxc_ControlCommand, diagnostic_request) < 65536 && pb_membersize(openxc_ControlCommand, passthrough_mode_request) < 65536 && pb_membersize(openxc_DiagnosticControlCommand, request) < 65536 && pb_membersize(openxc_TranslatedMessage, value) < 65536 && pb_membersize(openxc_TranslatedMessage, event) < 65536), YOU_MUST_DEFINE_PB_FIELD_32BIT_FOR_MESSAGES_openxc_VehicleMessage_openxc_RawMessage_openxc_ControlCommand_openxc_DiagnosticControlCommand_openxc_PassthroughModeControlCommand_openxc_CommandResponse_openxc_DiagnosticRequest_openxc_DiagnosticResponse_openxc_DynamicField_openxc_TranslatedMessage)
+ #if !defined(PB_FIELD_16BIT) && !defined(PB_FIELD_32BIT)
+ /* If you get an error here, it means that you need to define PB_FIELD_16BIT
+  * compile-time option. You can do that in pb.h or on compiler command line.
+  * 
+  * The reason you need to do this is that some of your messages contain tag
+  * numbers or field sizes that are larger than what can fit in the default
+  * 8 bit descriptors.
+  */
 -PB_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_VehicleMessage, command_response) < 256 && pb_membersize(openxc_ControlCommand, diagnostic_request) < 256 && pb_membersize(openxc_TranslatedMessage, value) < 256 && pb_membersize(openxc_TranslatedMessage, event) < 256), YOU_MUST_DEFINE_PB_FIELD_16BIT_FOR_MESSAGES_openxc_VehicleMessage_openxc_RawMessage_openxc_ControlCommand_openxc_CommandResponse_openxc_DiagnosticRequest_openxc_DiagnosticResponse_openxc_DynamicField_openxc_TranslatedMessage)
++PB_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_VehicleMessage, command_response) < 256 && pb_membersize(openxc_ControlCommand, diagnostic_request) < 256 && pb_membersize(openxc_ControlCommand, passthrough_mode_request) < 256 && pb_membersize(openxc_DiagnosticControlCommand, request) < 256 && pb_membersize(openxc_TranslatedMessage, value) < 256 && pb_membersize(openxc_TranslatedMessage, event) < 256), YOU_MUST_DEFINE_PB_FIELD_16BIT_FOR_MESSAGES_openxc_VehicleMessage_openxc_RawMessage_openxc_ControlCommand_openxc_DiagnosticControlCommand_openxc_PassthroughModeControlCommand_openxc_CommandResponse_openxc_DiagnosticRequest_openxc_DiagnosticResponse_openxc_DynamicField_openxc_TranslatedMessage)
  #endif
  
+ 
  /* On some platforms (such as AVR), double is really float.
   * These are not directly supported by nanopb, but see example_avr_double.
   * To get rid of this error, remove any double fields from your .proto.

diff --cc gen/cpp/openxc.pb.h
index 48002b1,8729f22..555a672
--- 1/gen/cpp/openxc.pb.h
--- 2/gen/cpp/openxc.pb.h
+++ b/gen/cpp/openxc.pb.h
@@@ -1,10 -1,14 +1,14 @@@
  /* Automatically generated nanopb header */
- /* Generated by nanopb-0.2.5 at Sat Sep 20 21:48:43 2014. */
 -/* Generated by nanopb-0.3.1 at Tue Sep 16 23:03:27 2014. */
++/* Generated by nanopb-0.3.1 at Sat Sep 20 21:59:09 2014. */
  
- #ifndef _PB_OPENXC_PB_H_
- #define _PB_OPENXC_PB_H_
+ #ifndef PB_OPENXC_PB_H_INCLUDED
+ #define PB_OPENXC_PB_H_INCLUDED
  #include <pb.h>
  
+ #if PB_PROTO_HEADER_VERSION != 30
+ #error Regenerate this file with the current version of nanopb generator.
+ #endif
+ 
  #ifdef __cplusplus
  extern "C" {
  #endif
@@@ -127,17 -118,7 +125,14 @@@ typedef struct _openxc_DynamicField 
      bool boolean_value;
  } openxc_DynamicField;
  
- typedef struct {
-     size_t size;
-     uint8_t bytes[8];
- } openxc_RawMessage_data_t;
 +typedef struct _openxc_PassthroughModeControlCommand {
 +    bool has_bus;
 +    int32_t bus;
 +    bool has_mode;
 +    openxc_PassthroughModeControlCommand_PassthroughMode mode;
 +} openxc_PassthroughModeControlCommand;
 +
+ typedef PB_BYTES_ARRAY_T(8) openxc_RawMessage_data_t;
  
  typedef struct _openxc_RawMessage {
      bool has_bus;
@@@ -192,6 -166,24 +187,28 @@@ typedef struct _openxc_VehicleMessage 
  
  /* Default values for struct fields */
  
 -#define openxc_ControlCommand_init_default       {false, (openxc_ControlCommand_Type)0, false, openxc_DiagnosticRequest_init_default, false, (openxc_ControlCommand_Action)0}
+ /* Initializer values for message structs */
+ #define openxc_VehicleMessage_init_default       {false, (openxc_VehicleMessage_Type)0, false, openxc_RawMessage_init_default, false, openxc_TranslatedMessage_init_default, false, openxc_DiagnosticResponse_init_default, false, openxc_ControlCommand_init_default, false, openxc_CommandResponse_init_default}
+ #define openxc_RawMessage_init_default           {false, 0, false, 0, false, {0, {0}}}
 -#define openxc_ControlCommand_init_zero          {false, (openxc_ControlCommand_Type)0, false, openxc_DiagnosticRequest_init_zero, false, (openxc_ControlCommand_Action)0}
++#define openxc_ControlCommand_init_default       {false, (openxc_ControlCommand_Type)0, false, openxc_DiagnosticControlCommand_init_default, false, openxc_PassthroughModeControlCommand_init_default}
++#define openxc_DiagnosticControlCommand_init_default {false, openxc_DiagnosticRequest_init_default, false, (openxc_DiagnosticControlCommand_Action)0}
++#define openxc_PassthroughModeControlCommand_init_default {false, 0, false, (openxc_PassthroughModeControlCommand_PassthroughMode)0}
+ #define openxc_CommandResponse_init_default      {false, (openxc_ControlCommand_Type)0, false, "", false, 0}
+ #define openxc_DiagnosticRequest_init_default    {false, 0, false, 0, false, 0, false, 0, false, {0, {0}}, false, 0, false, 0, false, "", false, (openxc_DiagnosticRequest_DecodedType)0}
+ #define openxc_DiagnosticResponse_init_default   {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, {0, {0}}, false, 0}
+ #define openxc_DynamicField_init_default         {false, (openxc_DynamicField_Type)0, false, "", false, 0, false, 0}
+ #define openxc_TranslatedMessage_init_default    {false, (openxc_TranslatedMessage_Type)0, false, "", false, openxc_DynamicField_init_default, false, openxc_DynamicField_init_default}
+ #define openxc_VehicleMessage_init_zero          {false, (openxc_VehicleMessage_Type)0, false, openxc_RawMessage_init_zero, false, openxc_TranslatedMessage_init_zero, false, openxc_DiagnosticResponse_init_zero, false, openxc_ControlCommand_init_zero, false, openxc_CommandResponse_init_zero}
+ #define openxc_RawMessage_init_zero              {false, 0, false, 0, false, {0, {0}}}
++#define openxc_ControlCommand_init_zero          {false, (openxc_ControlCommand_Type)0, false, openxc_DiagnosticControlCommand_init_zero, false, openxc_PassthroughModeControlCommand_init_zero}
++#define openxc_DiagnosticControlCommand_init_zero {false, openxc_DiagnosticRequest_init_zero, false, (openxc_DiagnosticControlCommand_Action)0}
++#define openxc_PassthroughModeControlCommand_init_zero {false, 0, false, (openxc_PassthroughModeControlCommand_PassthroughMode)0}
+ #define openxc_CommandResponse_init_zero         {false, (openxc_ControlCommand_Type)0, false, "", false, 0}
+ #define openxc_DiagnosticRequest_init_zero       {false, 0, false, 0, false, 0, false, 0, false, {0, {0}}, false, 0, false, 0, false, "", false, (openxc_DiagnosticRequest_DecodedType)0}
+ #define openxc_DiagnosticResponse_init_zero      {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, {0, {0}}, false, 0}
+ #define openxc_DynamicField_init_zero            {false, (openxc_DynamicField_Type)0, false, "", false, 0, false, 0}
+ #define openxc_TranslatedMessage_init_zero       {false, (openxc_TranslatedMessage_Type)0, false, "", false, openxc_DynamicField_init_zero, false, openxc_DynamicField_init_zero}
+ 
  /* Field tags (for use in manual encoding/decoding) */
  #define openxc_CommandResponse_type_tag          1
  #define openxc_CommandResponse_message_tag       2