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

Fixes to isotp handler

Browse Source
This commit is contained in:
Collin Kidder
2020-02-19 21:01:45 -05:00
parent 367c072b45
commit a364444f76
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bus_protocols/isotp_handler.cpp
+6 -3
View File
@@ -268,18 +268,21 @@ void ISOTP_HANDLER::processFrame(const CANFrame &frame)
} }
if (!pMsg) return; if (!pMsg) return;
if (!pMsg->isMultiframe) return; //if we didn't get a frame type 1 (start of multiframe) first then ignore this frame. if (!pMsg->isMultiframe) return; //if we didn't get a frame type 1 (start of multiframe) first then ignore this frame.
ln = pMsg->payload().length() - pMsg->payload().count(); dataBytes.clear();
dataBytes.append(pMsg->payload());
ln = pMsg->reportedLength - pMsg->payload().count();
//offset = pMsg->data.count(); //offset = pMsg->data.count();
if (useExtendedAddressing) if (useExtendedAddressing)
{ {
if (ln > 6) ln = 6; if (ln > 6) ln = 6;
for (int j = 0; j < ln; j++) pMsg->payload().append(frame.payload()[j+2]); for (int j = 0; j < ln; j++) dataBytes.append(frame.payload()[j+2]);
} }
else else
{ {
if (ln > 7) ln = 7; if (ln > 7) ln = 7;
for (int j = 0; j < ln; j++) pMsg->payload().append(frame.payload()[j+1]); for (int j = 0; j < ln; j++) dataBytes.append(frame.payload()[j+1]);
} }
pMsg->setPayload(dataBytes);
if (pMsg->reportedLength <= pMsg->payload().count()) if (pMsg->reportedLength <= pMsg->payload().count())
{ {
qDebug() << "Emitting multiframe ISOTP message"; qDebug() << "Emitting multiframe ISOTP message";