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

Merge pull request #851 from superwofy/master

Browse Source 
Fix dbc handling of comments and attributes
This commit is contained in:
Collin Kidder
2024-10-28 20:32:14 -04:00
committed by GitHub
parent 5c7c439841 6fb5299c6c
commit 6be193ad90
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dbc/dbchandler.cpp
+4 -4
View File
@@ -775,7 +775,7 @@ bool DBCFile::parseAttributeLine(QString line)
if (foundAttr) if (foundAttr)
{ {
qDebug() << "That message attribute does exist"; qDebug() << "That message attribute does exist";
DBC_MESSAGE *foundMsg = messageHandler->findMsgByID(match.captured(2).toUInt() & 0x1FFFFFFFul); DBC_MESSAGE *foundMsg = messageHandler->findMsgByID(match.captured(2).toULong() & 0x1FFFFFFFul);
if (foundMsg) if (foundMsg)
{ {
qDebug() << "It references a valid, registered message"; qDebug() << "It references a valid, registered message";
@@ -807,7 +807,7 @@ bool DBCFile::parseAttributeLine(QString line)
if (foundAttr) if (foundAttr)
{ {
qDebug() << "That signal attribute does exist"; qDebug() << "That signal attribute does exist";
DBC_MESSAGE *foundMsg = messageHandler->findMsgByID(match.captured(2).toUInt() & 0x1FFFFFFFUL); DBC_MESSAGE *foundMsg = messageHandler->findMsgByID(match.captured(2).toULong() & 0x1FFFFFFFUL);
if (foundMsg) if (foundMsg)
{ {
qDebug() << "It references a valid, registered message"; qDebug() << "It references a valid, registered message";
@@ -1019,7 +1019,7 @@ bool DBCFile::loadFile(QString fileName)
if (match.hasMatch()) if (match.hasMatch())
{ {
//qDebug() << "Comment was: " << match.captured(3); //qDebug() << "Comment 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));
@@ -1040,7 +1040,7 @@ bool DBCFile::loadFile(QString fileName)
if (match.hasMatch()) if (match.hasMatch())
{ {
//qDebug() << "Comment was: " << match.captured(2); //qDebug() << "Comment was: " << match.captured(2);
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)
{ {
msg->comment = match.captured(2); msg->comment = match.captured(2);