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

Merge pull request #221 from lyft/fix_decoding_ascii_file

Browse Source 
Fix Decoding of Canalzyer ASC files
This commit is contained in:
Collin Kidder
2019-11-14 21:21:49 -05:00
committed by GitHub
parent eb85089b39 0eef77d901
commit a5752063d7
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framefileio.cpp
+20 -4
View File
@@ -1287,14 +1287,24 @@ bool FrameFileIO::loadCanalyzerASC(QString filename, QVector<CANFrame>* frames)
if (tokens.length() > 5) if (tokens.length() > 5)
{ {
thisFrame.timestamp = static_cast<uint64_t>(tokens[0].toDouble() * 1000000.0); thisFrame.timestamp = static_cast<uint64_t>(tokens[0].toDouble() * 1000000.0);
if (tokens[2].endsWith('x'))
{
QByteArray copied_id = tokens[2];
copied_id.chop(1);
thisFrame.ID = copied_id.toUInt(nullptr, 16);
thisFrame.extended = true;
}
else
{
thisFrame.ID = tokens[2].toUInt(nullptr, 16); thisFrame.ID = tokens[2].toUInt(nullptr, 16);
thisFrame.extended = false;
}
thisFrame.len = tokens[5].toInt(); thisFrame.len = tokens[5].toInt();
if (thisFrame.len > 8) return false; if (thisFrame.len > 8) return false;
if (thisFrame.len < 0) return false; if (thisFrame.len < 0) return false;
thisFrame.isReceived = tokens[3].toUpper().contains("RX"); thisFrame.isReceived = tokens[3].toUpper().contains("RX");
thisFrame.bus = tokens[1].toInt(); thisFrame.bus = tokens[1].toInt();
thisFrame.extended = (thisFrame.ID > 0x7FF); thisFrame.remote = tokens[4] == "r";
thisFrame.remote = false;
for (int d = 6; d < (6 + static_cast<int>(thisFrame.len)); d++) for (int d = 6; d < (6 + static_cast<int>(thisFrame.len)); d++)
{ {
if (tokens.count() > d) if (tokens.count() > d)
@@ -1365,7 +1375,10 @@ bool FrameFileIO::saveCanalyzerASC(QString filename, const QVector<CANFrame>* fr
outFile->write(QString::number(frames->at(c).bus + 1).toUtf8()); outFile->write(QString::number(frames->at(c).bus + 1).toUtf8());
outFile->write(" "); outFile->write(" ");
if (frames->at(c).extended) if (frames->at(c).extended)
{
outFile->write(QString::number(frames->at(c).ID, 16).toUpper().rightJustified(8, '0').toUtf8()); outFile->write(QString::number(frames->at(c).ID, 16).toUpper().rightJustified(8, '0').toUtf8());
outFile->write("x");
}
else else
{ {
outFile->write(QString::number(frames->at(c).ID, 16).toUpper().rightJustified(3, '0').toUtf8()); outFile->write(QString::number(frames->at(c).ID, 16).toUpper().rightJustified(3, '0').toUtf8());
@@ -1373,8 +1386,11 @@ bool FrameFileIO::saveCanalyzerASC(QString filename, const QVector<CANFrame>* fr
} }
outFile->write(" "); outFile->write(" ");
if (frames->at(c).isReceived) outFile->write("Rx D "); if (frames->at(c).isReceived) outFile->write("Rx ");
else outFile->write("Tx D "); else outFile->write("Tx ");
if (frames->at(c).remote) outFile->write("r ");
else outFile->write("d ");
outFile->write(QString::number(frames->at(c).len).toUtf8()); outFile->write(QString::number(frames->at(c).len).toUtf8());
outFile->write(" "); outFile->write(" ");