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

Vast change to CAN data grid to show signal names. Many graphical

Browse Source 
tweaks, some bug fixes.
This commit is contained in:
Collin Kidder
2021-08-24 22:28:32 -04:00
parent 20f7217ad3
commit bba4fccac6
6 changed files with 262 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dbc/dbchandler.cpp
+170 -1
View File
@@ -1717,6 +1717,176 @@ DBCFile* DBCHandler::loadDBCFile(int idx)
return nullptr;
}
DBCFile* DBCHandler::loadSecretCSVFile(QString filename)
{
DBCFile *thisFile;
DBC_MESSAGE *pMsg;
DBC_SIGNAL *pSig;
QByteArray line;
int lineCounter = 0;
createBlankFile();
thisFile = &loadedFiles.last();
QFile *inFile = new QFile(filename);
if (!inFile->open(QIODevice::ReadOnly | QIODevice::Text))
{
delete inFile;
return nullptr;
}
//burn first two lines. contains header
line = inFile->readLine().simplified().toUpper();
line = inFile->readLine().simplified().toUpper();
while (!inFile->atEnd())
{
lineCounter++;
if (lineCounter > 100)
{
qApp->processEvents();
lineCounter = 0;
}
line = inFile->readLine().simplified().toUpper();
qDebug() << line;
QList<QByteArray> tokens = line.split(',');
if (tokens.length() == 10)
{
//Message,CAN ID,Signal,Short Name,Start Byte,Start Bit,Len,Data,Range,Conversion
//Whl_Rotational_Stat_CheckVal_CE,$0C0,Wheel Rotational Status Check Data,WhlRotatStatChkData, 0, 7, 40,PKT,N/A,N/A
// 0 1 2 3 4 5 6 7 8 9
if (tokens[0].length() > 2) //start of a signal def that starts a new message
{
DBC_MESSAGE msg;
msg.name = tokens[0];
msg.ID = tokens[1].mid(1).toLong(nullptr, 16);
msg.comment = "";
msg.len = 8;
msg.sender = thisFile->findNodeByIdx(0);
msg.bgColor = QColor(thisFile->findAttributeByName("GenMsgBackgroundColor")->defaultValue.toString());
msg.fgColor = QColor(thisFile->findAttributeByName("GenMsgForegroundColor")->defaultValue.toString());
thisFile->messageHandler->addMessage(msg);
pMsg = thisFile->messageHandler->findMsgByID(msg.ID);
DBC_SIGNAL sig;
sig.parentMessage = pMsg;
sig.name = tokens[3];
sig.comment = tokens[2];
int startBit = (tokens[4].toInt() * 8) + tokens[5].toInt();
sig.startBit = startBit;
sig.signalSize = tokens[6].toInt();
sig.intelByteOrder = false; //always for global-a?
sig.receiver = thisFile->findNodeByIdx(0);
QList<QByteArray> rangeToks = tokens[8].split('-');
if (rangeToks.length() == 2)
{
sig.min = rangeToks[0].simplified().toDouble();
sig.max = rangeToks[1].simplified().toDouble();
}
if (tokens[9].startsWith("E = N")) //not a value table, instead do scaling and bias
{
QList<QByteArray> scalingToks = tokens[9].simplified().split(' ');
sig.factor = scalingToks[4].toDouble();
if (scalingToks.count() > 5)
{
if (scalingToks[5] == "+")
{
sig.bias = scalingToks[6].toDouble();
}
if (scalingToks[5] == "-")
{
sig.bias = scalingToks[6].toDouble() * 1.0;
}
}
else
{
sig.factor = 1;
sig.bias = 0;
}
}
else if (tokens[9].startsWith("$")) //one or more values table entries
{
//$0=Inactive
QList<QByteArray> valToks = tokens[9].simplified().mid(1).split('=');
DBC_VAL_ENUM_ENTRY entry;
entry.value = valToks[0].toInt();
entry.descript = valToks[1];
sig.valList.append(entry);
}
pMsg->sigHandler->addSignal(sig);
pSig = pMsg->sigHandler->findSignalByIdx(pMsg->sigHandler->getCount()-1);
}
// 0 1 2 3 4 5 6 7 8 9
//Message,CAN ID,Signal,Short Name,Start Byte,Start Bit,Len,Data,Range,Conversion
//,,Wheel Rotational Status Check Data : Left Driven Sequence Number,WRSCD_LftDrvnSqNm, 0, 7, 2,UNM,0 - 3 ,E = N * 1
// 2 3 4 5 6 7 8 9
else if (tokens[2].length() > 2) //signal definition continuation of previous message
{
DBC_SIGNAL sig;
sig.parentMessage = pMsg;
sig.name = tokens[3];
sig.comment = tokens[2];
int startBit = (tokens[4].toInt() * 8) + tokens[5].toInt();
sig.startBit = startBit;
sig.signalSize = tokens[6].toInt();
sig.intelByteOrder = false; //always for global-a?
sig.receiver = thisFile->findNodeByIdx(0);
QList<QByteArray> rangeToks = tokens[8].split('-');
if (rangeToks.length() == 2)
{
sig.min = rangeToks[0].simplified().toDouble();
sig.max = rangeToks[1].simplified().toDouble();
}
if (tokens[9].startsWith("E = N")) //not a value table, instead do scaling and bias
{
QList<QByteArray> scalingToks = tokens[9].simplified().split(' ');
sig.factor = scalingToks[4].toDouble();
if (scalingToks.count() > 5)
{
if (scalingToks[5] == "+")
{
sig.bias = scalingToks[6].toDouble();
}
if (scalingToks[5] == "-")
{
sig.bias = scalingToks[6].toDouble() * 1.0;
}
}
else
{
sig.bias = 0;
sig.factor = 1;
}
}
else if (tokens[9].startsWith("$")) //one or more values table entries
{
//$0=Inactive
QList<QByteArray> valToks = tokens[9].simplified().mid(1).split('=');
DBC_VAL_ENUM_ENTRY entry;
entry.value = valToks[0].toInt();
entry.descript = valToks[1];
sig.valList.append(entry);
}
pMsg->sigHandler->addSignal(sig);
pSig = pMsg->sigHandler->findSignalByIdx(pMsg->sigHandler->getCount()-1);
}
else if (tokens[9].length() > 2) //additional values
{
//$0=Inactive
QList<QByteArray> valToks = tokens[9].simplified().mid(1).split('=');
DBC_VAL_ENUM_ENTRY entry;
entry.value = valToks[0].toInt();
entry.descript = valToks[1];
pSig->valList.append(entry);
}
}
}
thisFile->setDirtyFlag();
return thisFile;
}
DBCFile* DBCHandler::loadJSONFile(QString filename)
{
QSettings settings;
@@ -1886,7 +2056,6 @@ DBCFile* DBCHandler::loadJSONFile(QString filename)
}
}
thisFile->setDirtyFlag();
return thisFile;
}
dbc/dbchandler.h
+1
View File
@@ -125,6 +125,7 @@ public:
DBCFile* getFileByName(QString name);
int createBlankFile();
DBCFile* loadJSONFile(QString);
DBCFile* loadSecretCSVFile(QString);
static DBCHandler *getReference();
private:
dbc/dbcloadsavewindow.cpp
+6
View File
@@ -161,6 +161,7 @@ void DBCLoadSaveWindow::loadFile()
QStringList filters;
filters.append(QString(tr("DBC File (*.dbc)")));
filters.append(QString(tr("Tesla JSON File (*.json)")));
filters.append(QString(tr("Secret CSV Signal Defs (*.csv)")));
dialog.setDirectory(settings.value("DBC/LoadSaveDirectory", dialog.directory().path()).toString());
dialog.setFileMode(QFileDialog::ExistingFile);
@@ -183,6 +184,11 @@ void DBCLoadSaveWindow::loadFile()
if (!filename.contains('.')) filename += ".json";
file = dbcHandler->loadJSONFile(filename);
}
if (dialog.selectedNameFilter() == filters[2])
{
if (!filename.contains('.')) filename += ".csv";
file = dbcHandler->loadSecretCSVFile(filename);
}
}
if(file) {
dbc/dbcmaineditor.cpp
+2 -2
View File
@@ -663,7 +663,7 @@ void DBCMainEditor::deleteCurrentTreeItem()
}
else
{
qDebug() << "WTF, could not find the node in the map. That should not happen.";
qDebug() << "Could not find the node in the map. That should not happen.";
}
}
@@ -685,7 +685,7 @@ void DBCMainEditor::deleteCurrentTreeItem()
}
else
{
qDebug() << "WTF, could not find the message in the map. That should not happen.";
qDebug() << "Could not find the message in the map. That should not happen.";
}
}
break;
dbc/dbcsignaleditor.cpp
+15 -2
View File
@@ -376,7 +376,12 @@ void DBCSignalEditor::showEvent(QShowEvent* event)
for (int x = 0; x < dbcMessage->sigHandler->getCount(); x++)
{
DBC_SIGNAL *sig = dbcMessage->sigHandler->findSignalByIdx(x);
ui->bitfield->setSignalNames(x, sig->name);
//only set a signal name for signals which match multiplexparent with our currentsignal
if (!sig->multiplexParent || ((sig->multiplexParent == currentSignal->multiplexParent) && (sig->multiplexHighValue == currentSignal->multiplexHighValue)) )
{
ui->bitfield->setSignalNames(x, sig->name);
qDebug() << sig->name << sig->multiplexParent;
}
}
}
@@ -640,8 +645,16 @@ void DBCSignalEditor::generateUsedBits()
for (int x = 0; x < dbcMessage->sigHandler->getCount(); x++)
{
DBC_SIGNAL *sig = dbcMessage->sigHandler->findSignalByIdx(x);
DBC_SIGNAL *sig = dbcMessage->sigHandler->findSignalByIdx(x);
//only pay attention to this signal if it's multiplexParent matches currentSignal or is null
if (sig->multiplexParent)
{
if (sig->multiplexParent != currentSignal->multiplexParent) continue; //go thee away!
if (sig->multiplexHighValue != currentSignal->multiplexHighValue) continue; //buzz off
if (sig->multiplexLowValue != currentSignal->multiplexLowValue) continue;
}
startBit = sig->startBit;
if (sig->intelByteOrder)