From f0582697a63f779b52de57eb451e90bd44bd3eb7 Mon Sep 17 00:00:00 2001 From: Paul Hollinsky Date: Fri, 1 Nov 2019 14:48:14 -0400 Subject: [PATCH] Clarify FlexRay Slot ID --- communication/packet/flexraypacket.cpp | 2 +- include/icsneo/communication/message/flexray/flexraymessage.h | 2 +- include/icsneo/communication/packet/flexraypacket.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/communication/packet/flexraypacket.cpp b/communication/packet/flexraypacket.cpp index 5a2b776..6c6146d 100644 --- a/communication/packet/flexraypacket.cpp +++ b/communication/packet/flexraypacket.cpp @@ -46,7 +46,7 @@ std::shared_ptr HardwareFlexRayPacket::DecodeToMessage(const std msg->nullFrame = data->null_frame; msg->sync = data->sync; msg->startup = data->startup; - msg->id = data->id; + msg->slotid = data->slotid; if(int64_t(numBytes) != int64_t(data->Length) - 4) { } else { diff --git a/include/icsneo/communication/message/flexray/flexraymessage.h b/include/icsneo/communication/message/flexray/flexraymessage.h index 804385d..d43bc27 100644 --- a/include/icsneo/communication/message/flexray/flexraymessage.h +++ b/include/icsneo/communication/message/flexray/flexraymessage.h @@ -9,7 +9,7 @@ namespace icsneo { class FlexRayMessage : public Message { public: - uint16_t id = 0; + uint16_t slotid = 0; double tsslen = 0; double framelen = 0; FlexRay::Symbol symbol = FlexRay::Symbol::None; diff --git a/include/icsneo/communication/packet/flexraypacket.h b/include/icsneo/communication/packet/flexraypacket.h index 71636c8..efae32e 100644 --- a/include/icsneo/communication/packet/flexraypacket.h +++ b/include/icsneo/communication/packet/flexraypacket.h @@ -13,7 +13,7 @@ struct HardwareFlexRayPacket { static bool EncodeFromMessage(const FlexRayMessage& message, std::vector& bytestream, const device_eventhandler_t& report); //Word 0 - uint16_t id : 11; + uint16_t slotid : 11; uint16_t startup : 1; uint16_t sync : 1; uint16_t null_frame : 1;