Fix PCAN file loading to more correctly categorize extended vs standard frames

collin80 · collin80 · commit d710753d9f2b · 2024-10-29T18:30:50.000-04:00
diff --git a/framefileio.cpp b/framefileio.cpp
@@ -1454,7 +1454,7 @@ bool FrameFileIO::loadPCANFile(QString filename, QVector<CANFrame>* frames)
                         QByteArray bytes(numBytes, 0);
                         thisFrame.isReceived = true;
                         thisFrame.bus = 0;
-                        if (thisFrame.frameId() > 0x10000000)
+                        if (thisFrame.frameId() > 0x7FF)
                         {
                             thisFrame.setExtendedFrameFormat(true);
                         }
@@ -1506,7 +1506,7 @@ bool FrameFileIO::loadPCANFile(QString filename, QVector<CANFrame>* frames)
                         //qDebug() << thisFrame.payload().length();
                         thisFrame.isReceived = true;
                         thisFrame.bus = tokens[2].toInt();
-                        if (thisFrame.frameId() > 0x10000000)
+                        if (thisFrame.frameId() > 0x7FF)
                         {
                             thisFrame.setExtendedFrameFormat(true);
                         }
@@ -1548,7 +1548,7 @@ bool FrameFileIO::loadPCANFile(QString filename, QVector<CANFrame>* frames)
                         //qDebug() << thisFrame.payload().length();
                         thisFrame.isReceived = true;
                         thisFrame.bus = 0;
-                        if (thisFrame.frameId() > 0x10000000)
+                        if (thisFrame.frameId() > 0x7FF)
                         {
                             thisFrame.setExtendedFrameFormat(true);
                         }
@@ -1600,7 +1600,7 @@ bool FrameFileIO::loadPCANFile(QString filename, QVector<CANFrame>* frames)
                         //qDebug() << thisFrame.payload().length();
                         thisFrame.isReceived = true;
                         thisFrame.bus = tokens[3].toInt();
-                        if (thisFrame.frameId() > 0x10000000)
+                        if (thisFrame.frameId() > 0x7FF)
                         {
                             thisFrame.setExtendedFrameFormat(true);
                         }

Original file line number	Diff line number	Diff line change
`@@ -1454,7 +1454,7 @@ bool FrameFileIO::loadPCANFile(QString filename, QVector<CANFrame>* frames)`
`1454`	`1454`	`QByteArray bytes(numBytes, 0);`
`1455`	`1455`	`thisFrame.isReceived = true;`
`1456`	`1456`	`thisFrame.bus = 0;`
`1457`		`- if (thisFrame.frameId() > 0x10000000)`
	`1457`	`+ if (thisFrame.frameId() > 0x7FF)`
`1458`	`1458`	`{`
`1459`	`1459`	`thisFrame.setExtendedFrameFormat(true);`
`1460`	`1460`	`}`
`@@ -1506,7 +1506,7 @@ bool FrameFileIO::loadPCANFile(QString filename, QVector<CANFrame>* frames)`
`1506`	`1506`	`//qDebug() << thisFrame.payload().length();`
`1507`	`1507`	`thisFrame.isReceived = true;`
`1508`	`1508`	`thisFrame.bus = tokens[2].toInt();`
`1509`		`- if (thisFrame.frameId() > 0x10000000)`
	`1509`	`+ if (thisFrame.frameId() > 0x7FF)`
`1510`	`1510`	`{`
`1511`	`1511`	`thisFrame.setExtendedFrameFormat(true);`
`1512`	`1512`	`}`
`@@ -1548,7 +1548,7 @@ bool FrameFileIO::loadPCANFile(QString filename, QVector<CANFrame>* frames)`
`1548`	`1548`	`//qDebug() << thisFrame.payload().length();`
`1549`	`1549`	`thisFrame.isReceived = true;`
`1550`	`1550`	`thisFrame.bus = 0;`
`1551`		`- if (thisFrame.frameId() > 0x10000000)`
	`1551`	`+ if (thisFrame.frameId() > 0x7FF)`
`1552`	`1552`	`{`
`1553`	`1553`	`thisFrame.setExtendedFrameFormat(true);`
`1554`	`1554`	`}`
`@@ -1600,7 +1600,7 @@ bool FrameFileIO::loadPCANFile(QString filename, QVector<CANFrame>* frames)`
`1600`	`1600`	`//qDebug() << thisFrame.payload().length();`
`1601`	`1601`	`thisFrame.isReceived = true;`
`1602`	`1602`	`thisFrame.bus = tokens[3].toInt();`
`1603`		`- if (thisFrame.frameId() > 0x10000000)`
	`1603`	`+ if (thisFrame.frameId() > 0x7FF)`
`1604`	`1604`	`{`
`1605`	`1605`	`thisFrame.setExtendedFrameFormat(true);`
`1606`	`1606`	`}`