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

CANPacket: Remove unused byte from datastream

v0.3.0-dev
Paul Hollinsky 2021-11-16 19:48:55 -05:00
parent 574530978c
commit 2d6004bed1
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
communication/packet/canpacket.cpp
View File

@ -164,7 +164,7 @@ bool HardwareCANPacket::EncodeFromMessage(const CANMessage& message, std::vector
const uint8_t paddingBytes = paddedLength - dataSize; const uint8_t paddingBytes = paddedLength - dataSize;
// Pre-allocate as much memory as we will possibly need for speed // Pre-allocate as much memory as we will possibly need for speed
result.reserve(17 + dataSize + paddingBytes); result.reserve(16 + dataSize + paddingBytes);
result.push_back(0 /* byte count here later */ << 4 | (uint8_t(message.network.getNetID()) & 0xF)); result.push_back(0 /* byte count here later */ << 4 | (uint8_t(message.network.getNetID()) & 0xF));
@ -213,7 +213,6 @@ bool HardwareCANPacket::EncodeFromMessage(const CANMessage& message, std::vector
// Now finally the payload // Now finally the payload
result.insert(result.end(), message.data.begin(), message.data.end()); result.insert(result.end(), message.data.begin(), message.data.end());
result.resize(result.size() + paddingBytes); result.resize(result.size() + paddingBytes);
result.push_back(0);
// Fill in the length byte from earlier // Fill in the length byte from earlier
result[0] |= result.size() << 4; result[0] |= result.size() << 4;