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

Merge pull request #524 from bigoulours/patch-2

Browse Source 
Priorizing exact match over J1939 and GMLAN
This commit is contained in:
Collin Kidder
2022-09-29 21:27:55 -05:00
committed by GitHub
parent 7af4748468 b8039f9b16
commit 61389864a0
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dbc/dbchandler.cpp
+11 -11
View File
@@ -100,8 +100,15 @@ void DBCSignalHandler::sort()
DBC_MESSAGE* DBCMessageHandler::findMsgByID(uint32_t id) DBC_MESSAGE* DBCMessageHandler::findMsgByID(uint32_t id)
{ {
if (messages.count() == 0) return nullptr; if (messages.count() == 0) return nullptr;
DBC_MESSAGE *bestMatch = nullptr;
for (int i = 0; i < messages.count(); i++) for (int i = 0; i < messages.count(); i++)
{ {
if ( messages[i].ID == id )
{
return &messages[i];
}
if (matchingCriteria == J1939) if (matchingCriteria == J1939)
{ {
// include data page and extended data page in the pgn // include data page and extended data page in the pgn
@@ -112,7 +119,7 @@ DBC_MESSAGE* DBCMessageHandler::findMsgByID(uint32_t id)
pgn &= 0x3FF00; pgn &= 0x3FF00;
if ((messages[i].ID & 0x3FF0000) == (pgn << 8)) if ((messages[i].ID & 0x3FF0000) == (pgn << 8))
{ {
return &messages[i]; bestMatch = &messages[i];
} }
} }
else else
@@ -120,7 +127,7 @@ DBC_MESSAGE* DBCMessageHandler::findMsgByID(uint32_t id)
// PDU2 format // PDU2 format
if ((messages[i].ID & 0x3FFFF00) == (pgn << 8)) if ((messages[i].ID & 0x3FFFF00) == (pgn << 8))
{ {
return &messages[i]; bestMatch = &messages[i];
} }
} }
} }
@@ -129,17 +136,10 @@ DBC_MESSAGE* DBCMessageHandler::findMsgByID(uint32_t id)
// Match the bits 14-26 (Arbitration Id) of GMLAN 29bit header // Match the bits 14-26 (Arbitration Id) of GMLAN 29bit header
uint32_t arbId = id &0x3FFE000; uint32_t arbId = id &0x3FFE000;
if ( (arbId != 0) && (messages[i].ID & 0x3FFE000) == arbId ) if ( (arbId != 0) && (messages[i].ID & 0x3FFE000) == arbId )
return &messages[i]; bestMatch = &messages[i];
}
else
{
if ( messages[i].ID == id )
{
return &messages[i];
}
} }
} }
return nullptr; return bestMatch;
} }
DBC_MESSAGE* DBCMessageHandler::findMsgByIdx(int idx) DBC_MESSAGE* DBCMessageHandler::findMsgByIdx(int idx)