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

Merge pull request #871 from mvgalen/master

Browse Source 
Add support for > 8 bytes per message in candump format
This commit is contained in:
Collin Kidder
2025-05-05 18:27:09 -04:00
committed by GitHub
parent eb9ddd2dbd 1c0886bb58
commit 4a6976500f
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/build.yml
-1
View File
@@ -4,7 +4,6 @@ on:
push: push:
branches: branches:
- "master" - "master"
jobs: jobs:
buildlinux: buildlinux:
name: Linux x64 name: Linux x64
framefileio.cpp
+6 -1
View File
@@ -3784,12 +3784,17 @@ bool FrameFileIO::loadCanDumpFile(QString filename, QVector<CANFrame>* frames)
if (line.contains('[')) //the expanded format (second one from the above list) if (line.contains('[')) //the expanded format (second one from the above list)
{ {
//(1551774790.942758) can1 7A8 [8] F4 DC D1 83 0E 02 00 00 //(1551774790.942758) can1 7A8 [8] F4 DC D1 83 0E 02 00 00
//(1551774790.942758) can1 7A8 [08] F4 DC D1 83 0E 02 00 00
// 0 1 2 3 4 5 6 7 8 9 10 11 // 0 1 2 3 4 5 6 7 8 9 10 11
thisFrame.setFrameId(tokens[2].toLong(nullptr, 16)); thisFrame.setFrameId(tokens[2].toLong(nullptr, 16));
if (thisFrame.frameId() > 0x7FF) thisFrame.setExtendedFrameFormat(true); if (thisFrame.frameId() > 0x7FF) thisFrame.setExtendedFrameFormat(true);
else thisFrame.setExtendedFrameFormat(false); else thisFrame.setExtendedFrameFormat(false);
thisFrame.setFrameType(QCanBusFrame::DataFrame); thisFrame.setFrameType(QCanBusFrame::DataFrame);
int numBytes = tokens[3].at(1) - '0'; int numBytes;
if (tokens[3].at(2) == ']')
numBytes = tokens[3].at(1) - '0';
else
numBytes = (tokens[3].at(1) - '0')*10 + (tokens[3].at(2) - '0');
QByteArray bytes(numBytes, 0); QByteArray bytes(numBytes, 0);
for (int c = 0; c < numBytes; c++) for (int c = 0; c < numBytes; c++)
{ {