From 75bc6db24e48f4b577f68a4e27cace82ff8e442c Mon Sep 17 00:00:00 2001 From: Christopher Peplin Date: Fri, 7 Nov 2014 08:57:03 -0500 Subject: 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. --- gen/cpp/openxc.pb.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gen/cpp/openxc.pb.h') 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 -- cgit 1.2.3-korg