sven
/
libicsneo
mirror of https://github.com/intrepidcs/libicsneo.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Clarify FlexRay Slot ID

checksum-failure-logging
Paul Hollinsky 2019-11-01 14:48:14 -04:00
parent b990e03343
commit f0582697a6
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
communication/packet/flexraypacket.cpp
View File

@ -46,7 +46,7 @@ std::shared_ptr<FlexRayMessage> HardwareFlexRayPacket::DecodeToMessage(const std
msg->nullFrame = data->null_frame; msg->nullFrame = data->null_frame;
msg->sync = data->sync; msg->sync = data->sync;
msg->startup = data->startup; msg->startup = data->startup;
msg->id = data->id; msg->slotid = data->slotid;
if(int64_t(numBytes) != int64_t(data->Length) - 4) { if(int64_t(numBytes) != int64_t(data->Length) - 4) {
} else { } else {

2
include/icsneo/communication/message/flexray/flexraymessage.h
View File

@ -9,7 +9,7 @@ namespace icsneo {
class FlexRayMessage : public Message { class FlexRayMessage : public Message {
public: public:
uint16_t id = 0; uint16_t slotid = 0;
double tsslen = 0; double tsslen = 0;
double framelen = 0; double framelen = 0;
FlexRay::Symbol symbol = FlexRay::Symbol::None; FlexRay::Symbol symbol = FlexRay::Symbol::None;

2
include/icsneo/communication/packet/flexraypacket.h
View File

@ -13,7 +13,7 @@ struct HardwareFlexRayPacket {
static bool EncodeFromMessage(const FlexRayMessage& message, std::vector<uint8_t>& bytestream, const device_eventhandler_t& report); static bool EncodeFromMessage(const FlexRayMessage& message, std::vector<uint8_t>& bytestream, const device_eventhandler_t& report);
//Word 0 //Word 0
uint16_t id : 11; uint16_t slotid : 11;
uint16_t startup : 1; uint16_t startup : 1;
uint16_t sync : 1; uint16_t sync : 1;
uint16_t null_frame : 1; uint16_t null_frame : 1;