t.mettler/giesCANne
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #372 from jogo-/ISOTP-CF

Browse Source 
Fix bug ISOTP CF 0x20
This commit is contained in:
Collin Kidder
2021-06-24 21:50:37 -04:00
committed by GitHub
parent 44a48b3515 c4459d36c7
commit 037c6d4cba
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bus_protocols/isotp_handler.cpp
+3 -3
View File
@@ -53,7 +53,7 @@ void ISOTP_HANDLER::sendISOTPFrame(int bus, int ID, QByteArray data)
CANFrame frame; CANFrame frame;
frame.setFrameType(QCanBusFrame::DataFrame); frame.setFrameType(QCanBusFrame::DataFrame);
int currByte = 0; int currByte = 0;
int index = 0; int sequence = 1; //Initial Sequence number is 1
if (bus < 0) return; if (bus < 0) return;
if (bus >= CANConManager::getInstance()->getNumBuses()) return; if (bus >= CANConManager::getInstance()->getNumBuses()) return;
@@ -90,8 +90,8 @@ void ISOTP_HANDLER::sendISOTPFrame(int bus, int ID, QByteArray data)
while (currByte < data.length()) while (currByte < data.length())
{ {
for (int b = 0; b < 8; b++) bytes[b] = 0x00; for (int b = 0; b < 8; b++) bytes[b] = 0x00;
bytes[0] = 0x20 + index; bytes[0] = 0x20 + sequence; //Consecutive Frame starts from 0x20 + 1 (2: Frame type, 1: Sequence number)
index = (index + 1) & 0xF; sequence = (sequence + 1) & 0xF;
int bytesToGo = data.length() - currByte; int bytesToGo = data.length() - currByte;
if (bytesToGo > 7) bytesToGo = 7; if (bytesToGo > 7) bytesToGo = 7;
for (int i = 0; i < bytesToGo; i++) bytes[1 + i] = data[currByte++]; for (int i = 0; i < bytesToGo; i++) bytes[1 + i] = data[currByte++];