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

Fixed some DBC file format errors

Browse Source 
frame ID for extended IDs was not having its upper bit set
BA_DEF_DEF_ "filterlabeling" is INT type but was getting bool written
(e.g. 'false' instead of 0)
This commit is contained in:
Andy Huska
2023-05-11 16:45:41 -05:00
parent 1343bb363e
commit a66e63ced9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dbc/dbchandler.cpp
+2 -2
View File
@@ -1391,7 +1391,7 @@ bool DBCFile::saveFile(QString fileName)
uint32_t ID = msg->ID; uint32_t ID = msg->ID;
if (msg->ID > 0x7FF || msg->extendedID) if (msg->ID > 0x7FF || msg->extendedID)
{ {
msg->ID += 0x80000000ul; //set bit 31 if this ID is extended. 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) +
@@ -2256,7 +2256,7 @@ DBCHandler::DBCHandler()
file->dbc_attributes.append(attr); file->dbc_attributes.append(attr);
file->messageHandler->setMatchingCriteria(matchingCriteria); file->messageHandler->setMatchingCriteria(matchingCriteria);
bool filterLabeling = settings.value("DBC/FilterLabeling_" + QString(i),0).toBool(); int filterLabeling = settings.value("DBC/FilterLabeling_" + QString(i),0).toInt();
attr.attrType = ATTR_TYPE_MESSAGE; attr.attrType = ATTR_TYPE_MESSAGE;
attr.defaultValue = filterLabeling; attr.defaultValue = filterLabeling;
attr.enumVals.clear(); attr.enumVals.clear();