rusefi
/
can-log-tools
mirror of https://github.com/rusefi/can-log-tools.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2 from esaulenka/fix_DCB_parser 

Fix parsing complicated DBCs
This commit is contained in:
rusefillc 2025-03-25 06:51:06 -04:00 committed by GitHub
parent 34f12a2977 1a797bfd99
commit 853addb1eb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
reader/src/main/java/com/rusefi/can/reader/dbc/DbcFile.java
View File

@ -41,7 +41,7 @@ public class DbcFile {
while ((line = reader.readLine()) != null) { while ((line = reader.readLine()) != null) {
lineIndex++; lineIndex++;
line = line.trim(); line = line.trim();
if (line.startsWith("BO_")) { if (line.startsWith("BO_ ")) {
purgePacket(currentPacket); purgePacket(currentPacket);
line = line.replaceAll(":", ""); line = line.replaceAll(":", "");
String[] tokens = line.split(" "); String[] tokens = line.split(" ");
@ -56,7 +56,7 @@ public class DbcFile {
} }
String packetName = tokens[2]; String packetName = tokens[2];
currentPacket = new DbcPacket((int) decId, packetName); currentPacket = new DbcPacket((int) decId, packetName);
} else if (line.startsWith("CM_")) { } else if (line.startsWith("CM_ ")) {
purgePacket(currentPacket); purgePacket(currentPacket);
line = replaceSpecialWithSpaces(line); line = replaceSpecialWithSpaces(line);
String[] tokens = line.split(" "); String[] tokens = line.split(" ");
@ -64,6 +64,10 @@ public class DbcFile {
// skipping header line // skipping header line
continue; continue;
} }
if (!tokens[1].equals("SG_")) {
// will parse only signal descriptions
continue;
}
if (tokens.length < 4) if (tokens.length < 4)
throw new IllegalStateException("Failing to parse comment: " + line + " at " + lineIndex); throw new IllegalStateException("Failing to parse comment: " + line + " at " + lineIndex);
int id = Integer.parseInt(tokens[2]); int id = Integer.parseInt(tokens[2]);
@ -74,7 +78,7 @@ public class DbcFile {
packet.replaceName(originalName, niceName); packet.replaceName(originalName, niceName);
} else if (line.startsWith("SG_")) { } else if (line.startsWith("SG_ ")) {
DbcField field; DbcField field;
try { try {
field = DbcField.parseField(currentPacket, line); field = DbcField.parseField(currentPacket, line);