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

Bug fixes for extended IDs in DBC files, fix one off error in a few

Browse Source 
places (Corrects fuzzing window ID range), re-enabled overwrite mode
showing all signals in a message
This commit is contained in:
Collin Kidder
2021-04-28 21:41:33 -04:00
parent 5d97486624
commit e64e84d6fa
8 changed files with 66 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
canframemodel.cpp
+14 -6
View File
@@ -135,6 +135,7 @@ void CANFrameModel::normalizeTiming()
mutex.lock(); mutex.lock();
if (frames.count() == 0) return; if (frames.count() == 0) return;
timeOffset = frames[0].timeStamp().microSeconds(); timeOffset = frames[0].timeStamp().microSeconds();
qint64 prevStamp = 0;
//find the absolute lowest timestamp in the whole time. Needed because maybe timestamp was reset in the middle. //find the absolute lowest timestamp in the whole time. Needed because maybe timestamp was reset in the middle.
for (int j = 0; j < frames.count(); j++) for (int j = 0; j < frames.count(); j++)
@@ -144,7 +145,12 @@ void CANFrameModel::normalizeTiming()
for (int i = 0; i < frames.count(); i++) for (int i = 0; i < frames.count(); i++)
{ {
frames[i].setTimeStamp(QCanBusFrame::TimeStamp(0, frames[i].timeStamp().microSeconds() - timeOffset)); qint64 thisStamp = frames[i].timeStamp().microSeconds() - timeOffset;
if (thisStamp <= prevStamp)
{
timeOffset -= prevStamp;
}
frames[i].setTimeStamp(QCanBusFrame::TimeStamp(0, thisStamp));
} }
this->beginResetModel(); this->beginResetModel();
@@ -522,11 +528,13 @@ QVariant CANFrameModel::data(const QModelIndex &index, int role) const
tempString.append(sig->processSignalTree(thisFrame)); tempString.append(sig->processSignalTree(thisFrame));
} }
} }
//else if (sig->isMultiplexed && overwriteDups) //wasn't in this exact frame but is in the message. Use cached value else if (sig->isMultiplexed && overwriteDups) //wasn't in this exact frame but is in the message. Use cached value
//{ {
// tempString.append(sig->makePrettyOutput(sig->cachedValue.toDouble(), sig->cachedValue.toLongLong())); bool isInteger = false;
// tempString.append("\n"); if (sig->valType == UNSIGNED_INT || sig->valType == SIGNED_INT) isInteger = true;
//} tempString.append(sig->makePrettyOutput(sig->cachedValue.toDouble(), sig->cachedValue.toLongLong(), true, isInteger));
tempString.append("\n");
}
} }
} }
} }
dbc/dbc_classes.cpp
+7 -3
View File
@@ -65,7 +65,11 @@ QString DBC_SIGNAL::processSignalTree(const CANFrame &frame)
{ {
QString build; QString build;
int val; int val;
if (!this->processAsInt(frame, val)) return build; if (!this->processAsInt(frame, val))
{
qDebug() << "Could not process multiplexor as an integer.";
return build;
}
qDebug() << val; qDebug() << val;
foreach (DBC_SIGNAL *sig, multiplexedChildren) foreach (DBC_SIGNAL *sig, multiplexedChildren)
@@ -222,11 +226,11 @@ bool DBC_SIGNAL::processAsInt(const CANFrame &frame, int32_t &outValue)
//if (!isSignalInMessage(frame)) return false; //if (!isSignalInMessage(frame)) return false;
if (valType == SIGNED_INT) isSigned = true; if (valType == SIGNED_INT) isSigned = true;
if ( static_cast<int>(frame.payload().length() * 8) < (startBit + signalSize) ) /*if ( static_cast<int>(frame.payload().length() * 8) <= (startBit + signalSize) )
{ {
result = 0; result = 0;
return false; return false;
} }*/
result = static_cast<int32_t>(Utility::processIntegerSignal(frame.payload(), startBit, signalSize, intelByteOrder, isSigned)); result = static_cast<int32_t>(Utility::processIntegerSignal(frame.payload(), startBit, signalSize, intelByteOrder, isSigned));
dbc/dbc_classes.h
+1
View File
@@ -137,6 +137,7 @@ public:
DBC_MESSAGE(); DBC_MESSAGE();
uint32_t ID; uint32_t ID;
bool extendedID;
QString name; QString name;
QString comment; QString comment;
unsigned int len; unsigned int len;
dbc/dbchandler.cpp
+37 -13
View File
@@ -431,7 +431,9 @@ DBC_MESSAGE* DBCFile::parseMessageLine(QString line)
if (match.hasMatch()) if (match.hasMatch())
{ {
DBC_MESSAGE msg; DBC_MESSAGE msg;
msg.ID = match.captured(1).toULong() & 0x7FFFFFFFul; //the ID is always stored in decimal format uint32_t ID = match.captured(1).toULong(); //the ID is always stored in decimal format
msg.ID = ID & 0x1FFFFFFFul;
msg.extendedID = (ID & 80000000ul) ? true : false;
msg.name = match.captured(2); msg.name = match.captured(2);
msg.len = match.captured(3).toUInt(); msg.len = match.captured(3).toUInt();
msg.sender = findNodeByName(match.captured(4)); msg.sender = findNodeByName(match.captured(4));
@@ -598,7 +600,7 @@ bool DBCFile::parseSignalMultiplexValueLine(QString line)
//captured 5 is the upper bound //captured 5 is the upper bound
if (match.hasMatch()) if (match.hasMatch())
{ {
DBC_MESSAGE *msg = messageHandler->findMsgByID(match.captured(1).toUInt()); DBC_MESSAGE *msg = messageHandler->findMsgByID(match.captured(1).toULong() & 0x1FFFFFFFUL);
if (msg != nullptr) if (msg != nullptr)
{ {
DBC_SIGNAL *thisSignal = msg->sigHandler->findSignalByName(match.captured(2)); DBC_SIGNAL *thisSignal = msg->sigHandler->findSignalByName(match.captured(2));
@@ -632,7 +634,7 @@ bool DBCFile::parseValueLine(QString line)
if (match.hasMatch()) if (match.hasMatch())
{ {
//qDebug() << "Data was: " << match.captured(3); //qDebug() << "Data was: " << match.captured(3);
DBC_MESSAGE *msg = messageHandler->findMsgByID(match.captured(1).toUInt()); DBC_MESSAGE *msg = messageHandler->findMsgByID(match.captured(1).toULong() & 0x1FFFFFFFul);
if (msg != nullptr) if (msg != nullptr)
{ {
DBC_SIGNAL *sig = msg->sigHandler->findSignalByName(match.captured(2)); DBC_SIGNAL *sig = msg->sigHandler->findSignalByName(match.captured(2));
@@ -646,7 +648,7 @@ bool DBCFile::parseValueLine(QString line)
match = regex.match(tokenString); match = regex.match(tokenString);
if (match.hasMatch()) if (match.hasMatch())
{ {
val.value = match.captured(1).toInt(); val.value = match.captured(1).toULong() & 0x1FFFFFFFul;
val.descript = match.captured(2); val.descript = match.captured(2);
//qDebug() << "sig val " << val.value << " desc " <<val.descript; //qDebug() << "sig val " << val.value << " desc " <<val.descript;
sig->valList.append(val); sig->valList.append(val);
@@ -681,7 +683,7 @@ bool DBCFile::parseAttributeLine(QString line)
if (foundAttr) if (foundAttr)
{ {
qDebug() << "That attribute does exist"; qDebug() << "That attribute does exist";
DBC_MESSAGE *foundMsg = messageHandler->findMsgByID(match.captured(2).toUInt()); DBC_MESSAGE *foundMsg = messageHandler->findMsgByID(match.captured(2).toUInt() & 0x1FFFFFFFul);
if (foundMsg) if (foundMsg)
{ {
qDebug() << "It references a valid, registered message"; qDebug() << "It references a valid, registered message";
@@ -713,7 +715,7 @@ bool DBCFile::parseAttributeLine(QString line)
if (foundAttr) if (foundAttr)
{ {
qDebug() << "That attribute does exist"; qDebug() << "That attribute does exist";
DBC_MESSAGE *foundMsg = messageHandler->findMsgByID(match.captured(2).toUInt()); DBC_MESSAGE *foundMsg = messageHandler->findMsgByID(match.captured(2).toUInt() & 0x1FFFFFFFUL);
if (foundMsg) if (foundMsg)
{ {
qDebug() << "It references a valid, registered message"; qDebug() << "It references a valid, registered message";
@@ -1343,20 +1345,20 @@ bool DBCFile::saveFile(QString fileName)
} }
uint32_t ID = msg->ID; uint32_t ID = msg->ID;
if (msg->ID > 0x7FF) msg->ID += 0x80000000ul; //set bit 31 if this ID is extended. if (msg->ID > 0x7FF || msg->extendedID) msg->ID += 0x80000000ul; //set bit 31 if this ID is extended.
msgOutput.append("BO_ " + QString::number(ID) + " " + msg->name + ": " + QString::number(msg->len) + msgOutput.append("BO_ " + QString::number(ID) + " " + msg->name + ": " + QString::number(msg->len) +
" " + msg->sender->name + "\n"); " " + msg->sender->name + "\n");
if (msg->comment.length() > 0) if (msg->comment.length() > 0)
{ {
commentsOutput.append("CM_ BO_ " + QString::number(msg->ID) + " \"" + msg->comment + "\";\n"); commentsOutput.append("CM_ BO_ " + QString::number(ID) + " \"" + msg->comment + "\";\n");
} }
//If this message has attributes then compile them into attributes list to output later on. //If this message has attributes then compile them into attributes list to output later on.
if (msg->attributes.count() > 0) if (msg->attributes.count() > 0)
{ {
foreach (DBC_ATTRIBUTE_VALUE val, msg->attributes) { foreach (DBC_ATTRIBUTE_VALUE val, msg->attributes) {
attrValOutput.append("BA_ \"" + val.attrName + "\" BO_ " + QString::number(msg->ID) + " "); attrValOutput.append("BA_ \"" + val.attrName + "\" BO_ " + QString::number(ID) + " ");
switch (val.value.type()) switch (val.value.type())
{ {
case QMetaType::QString: case QMetaType::QString:
@@ -1426,14 +1428,14 @@ bool DBCFile::saveFile(QString fileName)
+ "\" " + sig->receiver->name + "\n"); + "\" " + sig->receiver->name + "\n");
if (sig->comment.length() > 0) if (sig->comment.length() > 0)
{ {
commentsOutput.append("CM_ SG_ " + QString::number(msg->ID) + " " + sig->name + " \"" + sig->comment + "\";\n"); commentsOutput.append("CM_ SG_ " + QString::number(ID) + " " + sig->name + " \"" + sig->comment + "\";\n");
} }
//if this signal has attributes then compile them in a special list of attributes //if this signal has attributes then compile them in a special list of attributes
if (sig->attributes.count() > 0) if (sig->attributes.count() > 0)
{ {
foreach (DBC_ATTRIBUTE_VALUE val, sig->attributes) { foreach (DBC_ATTRIBUTE_VALUE val, sig->attributes) {
attrValOutput.append("BA_ \"" + val.attrName + "\" SG_ " + QString::number(msg->ID) + " " + sig->name + " "); attrValOutput.append("BA_ \"" + val.attrName + "\" SG_ " + QString::number(ID) + " " + sig->name + " ");
switch (val.value.type()) switch (val.value.type())
{ {
case QMetaType::QString: case QMetaType::QString:
@@ -1448,7 +1450,7 @@ bool DBCFile::saveFile(QString fileName)
if (sig->valList.count() > 0) if (sig->valList.count() > 0)
{ {
valuesOutput.append("VAL_ " + QString::number(msg->ID) + " " + sig->name); valuesOutput.append("VAL_ " + QString::number(ID) + " " + sig->name);
for (int v = 0; v < sig->valList.count(); v++) for (int v = 0; v < sig->valList.count(); v++)
{ {
DBC_VAL_ENUM_ENTRY val = sig->valList[v]; DBC_VAL_ENUM_ENTRY val = sig->valList[v];
@@ -1538,13 +1540,16 @@ bool DBCFile::saveFile(QString fileName)
{ {
DBC_MESSAGE *msg = messageHandler->findMsgByIdx(x); DBC_MESSAGE *msg = messageHandler->findMsgByIdx(x);
uint32_t ID = msg->ID;
if (msg->ID > 0x7FF || msg->extendedID) msg->ID += 0x80000000ul; //set bit 31 if this ID is extended.
for (int s = 0; s < msg->sigHandler->getCount(); s++) for (int s = 0; s < msg->sigHandler->getCount(); s++)
{ {
DBC_SIGNAL *sig = msg->sigHandler->findSignalByIdx(s); DBC_SIGNAL *sig = msg->sigHandler->findSignalByIdx(s);
if (sig->isMultiplexed) if (sig->isMultiplexed)
{ {
msgOutput.append("SG_MUL_VAL_ " + QString::number(msg->ID) + " "); msgOutput.append("SG_MUL_VAL_ " + QString::number(ID) + " ");
msgOutput.append(sig->name + " " + sig->parentMessage->name + " "); msgOutput.append(sig->name + " " + sig->parentMessage->name + " ");
msgOutput.append(QString::number(sig->multiplexLowValue) + "-" + QString::number(sig->multiplexHighValue) + ";"); msgOutput.append(QString::number(sig->multiplexLowValue) + "-" + QString::number(sig->multiplexHighValue) + ";");
msgOutput.append("\n"); msgOutput.append("\n");
@@ -1859,6 +1864,25 @@ DBCFile* DBCHandler::loadJSONFile(QString filename)
} }
} }
} }
for (int x = 0; x < thisFile->messageHandler->getCount(); x++)
{
DBC_MESSAGE *msg = thisFile->messageHandler->findMsgByIdx(x);
for (int y = 0; y < msg->sigHandler->getCount(); y++)
{
DBC_SIGNAL *sig = msg->sigHandler->findSignalByIdx(y);
//if this doesn't have a multiplex parent set but is multiplexed then it must have used
//simple multiplexing instead of any extended specification. So, fill in the multiplexor signal here
//and also write the extended entry for it too.
if (sig->isMultiplexed && (sig->multiplexParent == nullptr) )
{
sig->multiplexParent = msg->multiplexorSignal;
msg->multiplexorSignal->multiplexedChildren.append(sig);
}
}
}
thisFile->setDirtyFlag(); thisFile->setDirtyFlag();
return thisFile; return thisFile;
} }
dbc/dbcmessageeditor.cpp
+2 -2
View File
@@ -34,7 +34,7 @@ DBCMessageEditor::DBCMessageEditor(QWidget *parent) :
{ {
if (dbcMessage == nullptr) return; if (dbcMessage == nullptr) return;
if (suppressEditCallbacks) return; if (suppressEditCallbacks) return;
if (dbcMessage->ID != Utility::ParseStringToNum(ui->lineFrameID->text())) dbcFile->setDirtyFlag(); if ((dbcMessage->ID & 0x1FFFFFFFul) != Utility::ParseStringToNum(ui->lineFrameID->text())) dbcFile->setDirtyFlag();
dbcMessage->ID = Utility::ParseStringToNum(ui->lineFrameID->text()); dbcMessage->ID = Utility::ParseStringToNum(ui->lineFrameID->text());
emit updatedTreeInfo(dbcMessage); emit updatedTreeInfo(dbcMessage);
}); });
@@ -220,7 +220,7 @@ void DBCMessageEditor::refreshView()
suppressEditCallbacks = true; suppressEditCallbacks = true;
ui->lineComment->setText(dbcMessage->comment); ui->lineComment->setText(dbcMessage->comment);
ui->lineFrameID->setText(Utility::formatCANID(dbcMessage->ID)); ui->lineFrameID->setText(Utility::formatCANID(dbcMessage->ID & 0x1FFFFFFFul));
ui->lineMsgName->setText(dbcMessage->name); ui->lineMsgName->setText(dbcMessage->name);
ui->lineFrameLen->setText(QString::number(dbcMessage->len)); ui->lineFrameLen->setText(QString::number(dbcMessage->len));
for (int i = 0; i < ui->comboSender->count(); i++) for (int i = 0; i < ui->comboSender->count(); i++)
framefileio.cpp
+2 -2
View File
@@ -1867,7 +1867,7 @@ bool FrameFileIO::loadNativeCSVFile(QString filename, QVector<CANFrame>* frames)
if (lng < 0) lng = 0; if (lng < 0) lng = 0;
if (lng + 5 > tokens.length()) lng = tokens.length() - 5; if (lng + 5 > tokens.length()) lng = tokens.length() - 5;
QByteArray bytes(lng, 0); QByteArray bytes(lng, 0);
for (int c = 0; c < 8; c++) bytes[c] = 0; for (int c = 0; c < lng; c++) bytes[c] = 0;
for (int d = 0; d < lng; d++) for (int d = 0; d < lng; d++)
bytes[d] = static_cast<char>(tokens[5 + d].toInt(nullptr, 16)); bytes[d] = static_cast<char>(tokens[5 + d].toInt(nullptr, 16));
thisFrame.setPayload(bytes); thisFrame.setPayload(bytes);
@@ -1882,7 +1882,7 @@ bool FrameFileIO::loadNativeCSVFile(QString filename, QVector<CANFrame>* frames)
if (lng < 0) lng = 0; if (lng < 0) lng = 0;
if (lng + 6 > tokens.length()) lng = tokens.length() - 6; if (lng + 6 > tokens.length()) lng = tokens.length() - 6;
QByteArray bytes(lng, 0); QByteArray bytes(lng, 0);
for (int c = 0; c < 8; c++) bytes[c] = 0; for (int c = 0; c < lng; c++) bytes[c] = 0;
for (int d = 0; d < lng; d++) for (int d = 0; d < lng; d++)
bytes[d] = static_cast<char>(tokens[6 + d].toInt(nullptr, 16)); bytes[d] = static_cast<char>(tokens[6 + d].toInt(nullptr, 16));
thisFrame.setPayload(bytes); thisFrame.setPayload(bytes);
mainsettingsdialog.cpp
+1
View File
@@ -2,6 +2,7 @@
#include "ui_mainsettingsdialog.h" #include "ui_mainsettingsdialog.h"
#include "helpwindow.h" #include "helpwindow.h"
#include <qevent.h> #include <qevent.h>
#include <QDebug>
#include "simplecrypt.h" #include "simplecrypt.h"
//using this simple encryption library to obfuscate stored password a bit. It's not super secure but better than //using this simple encryption library to obfuscate stored password a bit. It's not super secure but better than
re/fuzzingwindow.cpp
+2 -2
View File
@@ -250,8 +250,8 @@ void FuzzingWindow::calcNextID()
{ {
if (rangeIDSelect) if (rangeIDSelect)
{ {
int range = endID - startID; int range = endID - startID + 1;
if (range != 0) currentID = startID + QRandomGenerator::global()->bounded(range); if (range != 1) currentID = startID + QRandomGenerator::global()->bounded(range);
else currentID = startID; else currentID = startID;
} }
else //IDs by filter so pick a random selected ID from the filter list else //IDs by filter so pick a random selected ID from the filter list