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

Merge pull request #811 from tcfx44/master

Browse Source 
Support for ext CAN IDs in wireshark files
This commit is contained in:
Collin Kidder
2024-07-09 20:01:40 -04:00
committed by GitHub
parent a3b8506ac1 2a25e8b377
commit 3080b79db2
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framefileio.cpp
+6 -2
View File
@@ -5064,9 +5064,13 @@ bool FrameFileIO::loadWiresharkFile(QString filename, QVector<CANFrame>* frames)
thisFrame.isReceived = true; // TODO: check if tx detection is possible thisFrame.isReceived = true; // TODO: check if tx detection is possible
thisFrame.setFrameType(QCanBusFrame::DataFrame); thisFrame.setFrameType(QCanBusFrame::DataFrame);
if ((0x80 & *(packetData+19))) {
thisFrame.setExtendedFrameFormat(true);
thisFrame.setFrameId((0x3f & *(packetData+19))<<24 | (0xff & *(packetData+18)) << 16 | (0xff & *(packetData+17)) << 8 | (0xff & *(packetData+16)));
} else {
thisFrame.setExtendedFrameFormat(false);
thisFrame.setFrameId((0xff & *(packetData+17)) << 8 | (0xff & *(packetData+16))); thisFrame.setFrameId((0xff & *(packetData+17)) << 8 | (0xff & *(packetData+16)));
if (thisFrame.frameId() <= 0x7FF) thisFrame.setExtendedFrameFormat(false); }
else thisFrame.setExtendedFrameFormat(true);
thisFrame.bus = 0; thisFrame.bus = 0;
int numBytes = *(packetData+20); int numBytes = *(packetData+20);
QByteArray bytes(numBytes, 0); QByteArray bytes(numBytes, 0);