Update protobuf options to use new field names.

3 files changed, 19 insertions, 12 deletions

diff --git a/gen/cpp/openxc.pb.c b/gen/cpp/openxc.pb.c
index ccde431..6017fec 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.3.1 at Mon Oct  6 23:25:12 2014. */
+/* Generated by nanopb-0.3.1 at Tue Oct 14 14:03:21 2014. */
 
 #include "openxc.pb.h"
 
@@ -22,7 +22,7 @@ const pb_field_t openxc_VehicleMessage_fields[7] = {
 const pb_field_t openxc_CanMessage_fields[5] = {
     PB_FIELD(  1, INT32   , OPTIONAL, STATIC  , FIRST, openxc_CanMessage, bus, bus, 0),
     PB_FIELD(  2, UINT32  , OPTIONAL, STATIC  , OTHER, openxc_CanMessage, message_id, bus, 0),
-    PB_FIELD(  3, BYTES   , OPTIONAL, CALLBACK, OTHER, openxc_CanMessage, data, message_id, 0),
+    PB_FIELD(  3, BYTES   , OPTIONAL, STATIC  , OTHER, openxc_CanMessage, data, message_id, 0),
     PB_FIELD(  4, ENUM    , OPTIONAL, STATIC  , OTHER, openxc_CanMessage, frame_format, data, 0),
     PB_LAST_FIELD
 };
@@ -106,7 +106,7 @@ const pb_field_t openxc_DynamicField_fields[5] = {
 };
 
 const pb_field_t openxc_SimpleMessage_fields[4] = {
-    PB_FIELD(  1, STRING  , OPTIONAL, CALLBACK, FIRST, openxc_SimpleMessage, name, name, 0),
+    PB_FIELD(  1, STRING  , OPTIONAL, STATIC  , FIRST, openxc_SimpleMessage, name, name, 0),
     PB_FIELD(  2, MESSAGE , OPTIONAL, STATIC  , OTHER, openxc_SimpleMessage, value, name, &openxc_DynamicField_fields),
     PB_FIELD(  3, MESSAGE , OPTIONAL, STATIC  , OTHER, openxc_SimpleMessage, event, value, &openxc_DynamicField_fields),
     PB_LAST_FIELD
diff --git a/gen/cpp/openxc.pb.h b/gen/cpp/openxc.pb.h
index 5b36bd4..2e17a3d 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.3.1 at Mon Oct  6 23:25:12 2014. */
+/* Generated by nanopb-0.3.1 at Tue Oct 14 14:03:21 2014. */
 
 #ifndef PB_OPENXC_PB_H_INCLUDED
 #define PB_OPENXC_PB_H_INCLUDED
@@ -66,12 +66,15 @@ typedef struct _openxc_AcceptanceFilterBypassCommand {
     bool bypass;
 } openxc_AcceptanceFilterBypassCommand;
 
+typedef PB_BYTES_ARRAY_T(8) openxc_CanMessage_data_t;
+
 typedef struct _openxc_CanMessage {
     bool has_bus;
     int32_t bus;
     bool has_message_id;
     uint32_t message_id;
-    pb_callback_t data;
+    bool has_data;
+    openxc_CanMessage_data_t data;
     bool has_frame_format;
     openxc_CanMessage_FrameFormat frame_format;
 } openxc_CanMessage;
@@ -165,7 +168,8 @@ typedef struct _openxc_DiagnosticControlCommand {
 } openxc_DiagnosticControlCommand;
 
 typedef struct _openxc_SimpleMessage {
-    pb_callback_t name;
+    bool has_name;
+    char name[100];
     bool has_value;
     openxc_DynamicField value;
     bool has_event;
@@ -206,7 +210,7 @@ typedef struct _openxc_VehicleMessage {
 
 /* Initializer values for message structs */
 #define openxc_VehicleMessage_init_default       {false, (openxc_VehicleMessage_Type)0, false, openxc_CanMessage_init_default, false, openxc_SimpleMessage_init_default, false, openxc_DiagnosticResponse_init_default, false, openxc_ControlCommand_init_default, false, openxc_CommandResponse_init_default}
-#define openxc_CanMessage_init_default           {false, 0, false, 0, {{NULL}, NULL}, false, (openxc_CanMessage_FrameFormat)0}
+#define openxc_CanMessage_init_default           {false, 0, false, 0, false, {0, {0}}, false, (openxc_CanMessage_FrameFormat)0}
 #define openxc_ControlCommand_init_default       {false, (openxc_ControlCommand_Type)0, false, openxc_DiagnosticControlCommand_init_default, false, openxc_PassthroughModeControlCommand_init_default, false, openxc_AcceptanceFilterBypassCommand_init_default, false, openxc_PayloadFormatCommand_init_default, false, openxc_PredefinedObd2RequestsCommand_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, 0}
@@ -217,9 +221,9 @@ typedef struct _openxc_VehicleMessage {
 #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_SimpleMessage_init_default        {{{NULL}, NULL}, false, openxc_DynamicField_init_default, false, openxc_DynamicField_init_default}
+#define openxc_SimpleMessage_init_default        {false, "", false, openxc_DynamicField_init_default, false, openxc_DynamicField_init_default}
 #define openxc_VehicleMessage_init_zero          {false, (openxc_VehicleMessage_Type)0, false, openxc_CanMessage_init_zero, false, openxc_SimpleMessage_init_zero, false, openxc_DiagnosticResponse_init_zero, false, openxc_ControlCommand_init_zero, false, openxc_CommandResponse_init_zero}
-#define openxc_CanMessage_init_zero              {false, 0, false, 0, {{NULL}, NULL}, false, (openxc_CanMessage_FrameFormat)0}
+#define openxc_CanMessage_init_zero              {false, 0, false, 0, false, {0, {0}}, false, (openxc_CanMessage_FrameFormat)0}
 #define openxc_ControlCommand_init_zero          {false, (openxc_ControlCommand_Type)0, false, openxc_DiagnosticControlCommand_init_zero, false, openxc_PassthroughModeControlCommand_init_zero, false, openxc_AcceptanceFilterBypassCommand_init_zero, false, openxc_PayloadFormatCommand_init_zero, false, openxc_PredefinedObd2RequestsCommand_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, 0}
@@ -230,7 +234,7 @@ typedef struct _openxc_VehicleMessage {
 #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_SimpleMessage_init_zero           {{{NULL}, NULL}, false, openxc_DynamicField_init_zero, false, openxc_DynamicField_init_zero}
+#define openxc_SimpleMessage_init_zero           {false, "", false, openxc_DynamicField_init_zero, false, openxc_DynamicField_init_zero}
 
 /* Field tags (for use in manual encoding/decoding) */
 #define openxc_AcceptanceFilterBypassCommand_bus_tag 1
@@ -301,6 +305,8 @@ extern const pb_field_t openxc_DynamicField_fields[5];
 extern const pb_field_t openxc_SimpleMessage_fields[4];
 
 /* Maximum encoded size of messages (where known) */
+#define openxc_VehicleMessage_size               716
+#define openxc_CanMessage_size                   33
 #define openxc_ControlCommand_size               126
 #define openxc_DiagnosticControlCommand_size     76
 #define openxc_PassthroughModeControlCommand_size 13
@@ -311,6 +317,7 @@ extern const pb_field_t openxc_SimpleMessage_fields[4];
 #define openxc_DiagnosticRequest_size            68
 #define openxc_DiagnosticResponse_size           56
 #define openxc_DynamicField_size                 119
+#define openxc_SimpleMessage_size                344
 
 #ifdef __cplusplus
 } /* extern "C" */
diff --git a/openxc.options b/openxc.options
index 80d0f9b..5a01879 100644
--- a/openxc.options
+++ b/openxc.options
@@ -1,7 +1,7 @@
-openxc.TranslatedMessage.name max_size:100
+openxc.SimpleMessage.name max_size:100
 openxc.DynamicField.string_value max_size:100
 openxc.CommandResponse.message max_size:128
 openxc.DiagnosticResponse.payload max_size:8
 openxc.DiagnosticRequest.name max_size:10
 openxc.DiagnosticRequest.payload max_size:8
-openxc.RawMessage.data max_size:8
+openxc.CanMessage.data max_size:8