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

Fix error in loading of PCAN V1.3 files.

Browse Source
This commit is contained in:
Collin Kidder
2023-05-07 17:56:00 -04:00
parent e89517086f
commit 971312486e
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framefileio.cpp
+8 -5
View File
@@ -1402,10 +1402,13 @@ bool FrameFileIO::loadPCANFile(QString filename, QVector<CANFrame>* frames)
lineCounter = 0; lineCounter = 0;
} }
line = inFile->readLine(); line = inFile->readLine();
if (line.startsWith(";$FILEVERSION=2.0")) fileVersion = 20; if (line.startsWith(';'))
if (line.startsWith(";$FILEVERSION=1.3")) fileVersion = 13; {
if (line.startsWith(";$FILEVERSION=1.1")) fileVersion = 11; if (line.contains("$FILEVERSION=2.0")) fileVersion = 20;
if (line.startsWith(';')) continue; if (line.contains("$FILEVERSION=1.3")) fileVersion = 13;
if (line.contains("$FILEVERSION=1.1")) fileVersion = 11;
continue;
}
if (line.length() > 41) if (line.length() > 41)
{ {
line = line.simplified(); line = line.simplified();
@@ -1466,7 +1469,7 @@ bool FrameFileIO::loadPCANFile(QString filename, QVector<CANFrame>* frames)
if (tokens.length() > 6) if (tokens.length() > 6)
{ {
thisFrame.setTimeStamp(QCanBusFrame::TimeStamp(0, static_cast<uint64_t>(tokens[1].toDouble() * 1000.0))); thisFrame.setTimeStamp(QCanBusFrame::TimeStamp(0, static_cast<uint64_t>(tokens[1].toDouble() * 1000.0)));
thisFrame.setFrameId(tokens[3].toUInt(nullptr, 16)); thisFrame.setFrameId(tokens[4].toUInt(nullptr, 16));
if (thisFrame.frameId() < 0x1FFFFFFF) if (thisFrame.frameId() < 0x1FFFFFFF)
{ {
int numBytes = tokens[6].toInt(); int numBytes = tokens[6].toInt();