retropilot
/
cabana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cabana: safe dbc parsing when msg id in signal comment does not exist

main
Andy Haden 2017-10-25 16:51:53 -07:00
parent 02eb3c4bc6
commit 1aae98153f
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/models/can/dbc.js
View File

@ -358,7 +358,7 @@ export default class DBC {
hasFollowUp = true;
}
if(matches === null) {
warnings.push(`failed to signal comment on line ${i + 1} -- ${line}`);
warnings.push(`failed to parse signal comment on line ${i + 1} -- ${line}`);
continue;
}
@ -366,9 +366,14 @@ export default class DBC {
messageId = parseInt(messageId, 10);
const msg = messages.get(messageId);
if (msg === undefined) {
warnings.push(`failed to parse signal comment on line ${i + 1} -- ${line}:
message id ${messageId} does not exist prior to this line`);
continue;
}
const signal = msg.signals[signalName];
if(signal === undefined) {
warnings.push(`failed to signal comment on line ${i + 1} -- ${line}`);
warnings.push(`failed to parse signal comment on line ${i + 1} -- ${line}`);
continue;
} else {
signal.comment = comment;
@ -457,9 +462,10 @@ export default class DBC {
// Disabled b/c live mode frequently calls this function
// and executes way too many network requests
// if(warnings.length > 0) {
// warnings.forEach((warning) => CloudLog.warn('importDbcString: ' + warning));
// }
if(warnings.length > 0) {
// warnings.forEach((warning) => CloudLog.warn('importDbcString: ' + warning));
// warnings.forEach((warning) => console.log('importDbcString: ' + warning));
}
this.messages = messages;
this.boardUnits = boardUnits;