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

Merge branch 'master' of github.com:collin80/SavvyCAN into WIP

Browse Source
This commit is contained in:
Collin Kidder
2018-01-11 19:38:52 -05:00
parent 0833b56b4f 7bcd62b681
commit 82b92e55b7
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framefileio.cpp
+5 -1
View File
@@ -1598,6 +1598,11 @@ bool FrameFileIO::loadCanDumpFile(QString filename, QVector<CANFrame>* frames)
/* ID */ /* ID */
qDebug() << IdValExp.cap(1); qDebug() << IdValExp.cap(1);
thisFrame.ID = IdValExp.cap(1).toInt(&ret, 16); thisFrame.ID = IdValExp.cap(1).toInt(&ret, 16);
if (IdValExp.cap(1).length() > 3) {
thisFrame.extended = true;
} else {
thisFrame.extended = false;
}
if(!ret) continue; if(!ret) continue;
QString val= IdValExp.cap(2); QString val= IdValExp.cap(2);
@@ -1616,7 +1621,6 @@ bool FrameFileIO::loadCanDumpFile(QString filename, QVector<CANFrame>* frames)
} }
/*NB: should we make sure len <= 8? */ /*NB: should we make sure len <= 8? */
thisFrame.extended = false;
thisFrame.isReceived = true; thisFrame.isReceived = true;
thisFrame.bus = 0; thisFrame.bus = 0;
} }