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

Fixed bug in extended addressing check

Browse Source 
where ID was being AND'ed with 80000000 decimal instead of hex
This commit is contained in:
Andy Huska
2022-09-20 16:48:11 -05:00
parent da7a721494
commit 6accf2e9e7
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dbc/dbchandler.cpp
+9 -3
View File
@@ -453,7 +453,7 @@ DBC_MESSAGE* DBCFile::parseMessageLine(QString line)
DBC_MESSAGE msg; DBC_MESSAGE msg;
uint32_t ID = match.captured(1).toULong(); //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.ID = ID & 0x1FFFFFFFul;
msg.extendedID = (ID & 80000000ul) ? true : false; msg.extendedID = (ID & 0x80000000ul) ? 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));
@@ -1372,7 +1372,10 @@ bool DBCFile::saveFile(QString fileName)
} }
uint32_t ID = msg->ID; uint32_t ID = msg->ID;
if (msg->ID > 0x7FF || msg->extendedID) 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");
@@ -1571,7 +1574,10 @@ bool DBCFile::saveFile(QString fileName)
DBC_MESSAGE *msg = messageHandler->findMsgByIdx(x); DBC_MESSAGE *msg = messageHandler->findMsgByIdx(x);
uint32_t ID = msg->ID; uint32_t ID = msg->ID;
if (msg->ID > 0x7FF || msg->extendedID) 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.
}
for (int s = 0; s < msg->sigHandler->getCount(); s++) for (int s = 0; s < msg->sigHandler->getCount(); s++)
{ {