Back off change to CAN message ID for backwards compatibility.

I don't think this change is worth breaking compatibility with exiting
trace files. The meaning of an ID is much more clean when inside a CAN
message object, so that's why I think it make sense to be different than
the "id" inside a diagnostic request.

3 files changed, 11 insertions, 11 deletions

diff --git a/gen/cpp/openxc.pb b/gen/cpp/openxc.pb
index a4716cee..3fc2f805 100644
--- a/gen/cpp/openxc.pb
+++ b/gen/cpp/openxc.pb
@@ -1,5 +1,5 @@
 
-÷
+ï
 openxc.protoopenxc"ˆ
 VehicleMessage)
 type
 
(2.openxc.VehicleMessage.Type'
@@ -15,12 +15,12 @@
 
 DIAGNOSTIC
 CONTROL_COMMAND
-COMMAND_RESPONSE"œ

+COMMAND_RESPONSE"”

 
 CanMessage
-bus
 
(
+bus
 
(
 
-message_id 
(

+id 
(

 data 
(4
 frame_format 
(2.openxc.CanMessage.FrameFormat")
 FrameFormat
diff --git a/gen/cpp/openxc.pb.c b/gen/cpp/openxc.pb.c
index 6017fec4..6fc70703 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 Tue Oct 14 14:03:21 2014. */
+/* Generated by nanopb-0.3.1 at Fri Nov  7 08:56:52 2014. */
 
 #include "openxc.pb.h"
 
@@ -21,8 +21,8 @@ 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, STATIC  , OTHER, openxc_CanMessage, data, message_id, 0),
+    PB_FIELD(  2, UINT32  , OPTIONAL, STATIC  , OTHER, openxc_CanMessage, id, bus, 0),
+    PB_FIELD(  3, BYTES   , OPTIONAL, STATIC  , OTHER, openxc_CanMessage, data, id, 0),
     PB_FIELD(  4, ENUM    , OPTIONAL, STATIC  , OTHER, openxc_CanMessage, frame_format, data, 0),
     PB_LAST_FIELD
 };
diff --git a/gen/cpp/openxc.pb.h b/gen/cpp/openxc.pb.h
index 2e17a3de..a99a91fc 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 Tue Oct 14 14:03:21 2014. */
+/* Generated by nanopb-0.3.1 at Fri Nov  7 08:56:52 2014. */
 
 #ifndef PB_OPENXC_PB_H_INCLUDED
 #define PB_OPENXC_PB_H_INCLUDED
@@ -71,8 +71,8 @@ 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;
+    bool has_id;
+    uint32_t id;
     bool has_data;
     openxc_CanMessage_data_t data;
     bool has_frame_format;
@@ -240,7 +240,7 @@ typedef struct _openxc_VehicleMessage {
 #define openxc_AcceptanceFilterBypassCommand_bus_tag 1
 #define openxc_AcceptanceFilterBypassCommand_bypass_tag 2
 #define openxc_CanMessage_bus_tag                1
-#define openxc_CanMessage_message_id_tag         2
+#define openxc_CanMessage_id_tag                 2
 #define openxc_CanMessage_data_tag               3
 #define openxc_CanMessage_frame_format_tag       4
 #define openxc_CommandResponse_type_tag          1