Store raw CAN payload in bytes instead of uint64_t.

3 files changed, 12 insertions, 7 deletions

diff --git a/gen/cpp/openxc.pb b/gen/cpp/openxc.pb
index 9d6271d1..b4fd2f65 100644
--- a/gen/cpp/openxc.pb
+++ b/gen/cpp/openxc.pb
@@ -17,7 +17,7 @@ RawMessage
 bus
 
(
 
 message_id 
(

-data 
("‘

+data 
("‘

 DiagnosticMessage
 bus
 
(
 
diff --git a/gen/cpp/openxc.pb.c b/gen/cpp/openxc.pb.c
index 3c3958f1..84c87c7c 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 Fri Jan 17 14:40:08 2014. */
+/* Generated by nanopb-0.2.5 at Fri Jan 17 16:33:23 2014. */
 
 #include "openxc.pb.h"
 
@@ -16,7 +16,7 @@ const pb_field_t openxc_VehicleMessage_fields[5] = {
 const pb_field_t openxc_RawMessage_fields[4] = {
     PB_FIELD2(  1, INT32   , OPTIONAL, STATIC  , FIRST, openxc_RawMessage, bus, bus, 0),
     PB_FIELD2(  2, UINT32  , OPTIONAL, STATIC  , OTHER, openxc_RawMessage, message_id, bus, 0),
-    PB_FIELD2(  3, UINT64  , OPTIONAL, STATIC  , OTHER, openxc_RawMessage, data, message_id, 0),
+    PB_FIELD2(  3, BYTES   , OPTIONAL, STATIC  , OTHER, openxc_RawMessage, data, message_id, 0),
     PB_LAST_FIELD
 };
 
diff --git a/gen/cpp/openxc.pb.h b/gen/cpp/openxc.pb.h
index 95276b45..879dbb80 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 Fri Jan 17 14:40:08 2014. */
+/* Generated by nanopb-0.2.5 at Fri Jan 17 16:33:23 2014. */
 
 #ifndef _PB_OPENXC_PB_H_
 #define _PB_OPENXC_PB_H_
@@ -48,13 +48,18 @@ typedef struct _openxc_DiagnosticMessage {
     openxc_DiagnosticMessage_payload_t payload;
 } openxc_DiagnosticMessage;
 
+typedef struct {
+    size_t size;
+    uint8_t bytes[8];
+} openxc_RawMessage_data_t;
+
 typedef struct _openxc_RawMessage {
     bool has_bus;
     int32_t bus;
     bool has_message_id;
     uint32_t message_id;
     bool has_data;
-    uint64_t data;
+    openxc_RawMessage_data_t data;
 } openxc_RawMessage;
 
 typedef struct _openxc_TranslatedMessage {
@@ -120,8 +125,8 @@ extern const pb_field_t openxc_DiagnosticMessage_fields[8];
 extern const pb_field_t openxc_TranslatedMessage_fields[9];
 
 /* Maximum encoded size of messages (where known) */
-#define openxc_VehicleMessage_size               422
-#define openxc_RawMessage_size                   28
+#define openxc_VehicleMessage_size               421
+#define openxc_RawMessage_size                   27
 #define openxc_DiagnosticMessage_size            47
 #define openxc_TranslatedMessage_size            334