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
2021-02-17 21:18:34 -05:00
parent 91610202ce 7e6ead19e0
commit a5cf484e7c
4 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framefileio.cpp
+3 -3
View File
@@ -1283,7 +1283,7 @@ bool FrameFileIO::isPCANFile(QString filename)
{
while (!inFile->atEnd()) {
lineCounter++;
if (lineCounter > 10)
if (lineCounter > 25)
{
break;
}
@@ -1423,7 +1423,7 @@ bool FrameFileIO::loadPCANFile(QString filename, QVector<CANFrame>* frames)
{
int numBytes = line.mid(37,2).trimmed().toInt();
QByteArray bytes(numBytes, 0);
qDebug() << thisFrame.payload().length();
//qDebug() << thisFrame.payload().length();
thisFrame.isReceived = true;
thisFrame.bus = 0;
if (line.at(25) == ' ') {
@@ -1434,7 +1434,7 @@ bool FrameFileIO::loadPCANFile(QString filename, QVector<CANFrame>* frames)
if (line.at(40) == 'R') {
thisFrame.setFrameType(QCanBusFrame::RemoteRequestFrame);
} else {
QList<QByteArray> tokens = line.mid(40, thisFrame.payload().length() * 3).split(' ');
QList<QByteArray> tokens = line.mid(40, numBytes * 3).split(' ');
thisFrame.setFrameType(QCanBusFrame::DataFrame);
for (int d = 0; d < numBytes; d++)
{