From f4a51cd73c2084d54c5522cdea0cbffbfefd9015 Mon Sep 17 00:00:00 2001 From: mvgalen Date: Fri, 29 Nov 2024 17:55:47 +0100 Subject: [PATCH] Support for > 8 bytes per message --- framefileio.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/framefileio.cpp b/framefileio.cpp index 79b5527..38ed8c3 100644 --- a/framefileio.cpp +++ b/framefileio.cpp @@ -3784,12 +3784,17 @@ bool FrameFileIO::loadCanDumpFile(QString filename, QVector* frames) 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 [08] F4 DC D1 83 0E 02 00 00 // 0 1 2 3 4 5 6 7 8 9 10 11 thisFrame.setFrameId(tokens[2].toLong(nullptr, 16)); if (thisFrame.frameId() > 0x7FF) thisFrame.setExtendedFrameFormat(true); else thisFrame.setExtendedFrameFormat(false); 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); for (int c = 0; c < numBytes; c++) {