Communication: Remove CoreMiniExtendedMsgHdr from HardwareLINPacket struct
parent
deabc2cff4
commit
5cdaeb1edc
|
|
@ -9,7 +9,7 @@ std::shared_ptr<Message> HardwareLINPacket::DecodeToMessage(const std::vector<ui
|
||||||
size_t numDataBytes = packet->CoreMiniBitsLIN.len;
|
size_t numDataBytes = packet->CoreMiniBitsLIN.len;
|
||||||
size_t numHeaderBytes = sizeof(HardwareLINPacket::CoreMiniBitsLIN);
|
size_t numHeaderBytes = sizeof(HardwareLINPacket::CoreMiniBitsLIN);
|
||||||
|
|
||||||
if( (sizeof(HardwareLINPacket) != bytestream.size()) ||
|
if( (sizeof(HardwareLINPacket) > bytestream.size()) ||
|
||||||
((numDataBytes + numHeaderBytes) > bytestream.size()) )
|
((numDataBytes + numHeaderBytes) > bytestream.size()) )
|
||||||
return nullptr;
|
return nullptr;
|
||||||
|
|
||||||
|
|
@ -17,7 +17,6 @@ std::shared_ptr<Message> HardwareLINPacket::DecodeToMessage(const std::vector<ui
|
||||||
--numDataBytes; //If data is present, there will be a checksum included
|
--numDataBytes; //If data is present, there will be a checksum included
|
||||||
|
|
||||||
auto msg = std::make_shared<LINMessage>(static_cast<uint8_t>(packet->CoreMiniBitsLIN.ID));
|
auto msg = std::make_shared<LINMessage>(static_cast<uint8_t>(packet->CoreMiniBitsLIN.ID));
|
||||||
msg->network = Network::GetNetIDFromCoreMiniNetwork(static_cast<Network::CoreMini>(packet->networkID));
|
|
||||||
msg->isEnhancedChecksum = static_cast<bool>(packet->CoreMiniBitsLIN.TxChkSumEnhanced);
|
msg->isEnhancedChecksum = static_cast<bool>(packet->CoreMiniBitsLIN.TxChkSumEnhanced);
|
||||||
|
|
||||||
/* Minimum one responder byte and one checksum byte. */
|
/* Minimum one responder byte and one checksum byte. */
|
||||||
|
|
|
||||||
|
|
@ -54,9 +54,6 @@ struct HardwareLINPacket {
|
||||||
|
|
||||||
uint16_t stats; //CxTRB0STAT
|
uint16_t stats; //CxTRB0STAT
|
||||||
uint64_t timestamp; //Large timestamp
|
uint64_t timestamp; //Large timestamp
|
||||||
//CoreMiniMsgExtendedHdr
|
|
||||||
uint16_t networkID;
|
|
||||||
uint16_t length;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#pragma pack(pop)
|
#pragma pack(pop)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue