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

Merge pull request #292 from CSS-Electronics/bug_clx000

Browse Source 
CLX000: Allow for shorter IDs, flip direction
This commit is contained in:
Collin Kidder
2021-02-23 18:57:14 -05:00
committed by GitHub
parent d7c70efc78 51d49e8050
commit 0f5afe4c04
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framefileio.cpp
+2 -2
View File
@@ -4375,7 +4375,7 @@ bool FrameFileIO::loadCLX000File(QString filename, QVector<CANFrame>* frames) {
pattern += valueSeparator;
}
if(presentFields.contains("ID")) {
pattern += "(?<id>[a-fA-F\\d]{3,8})";
pattern += "(?<id>[a-fA-F\\d]{1,8})";
pattern += valueSeparator;
}
if(presentFields.contains("Length")) {
@@ -4418,7 +4418,7 @@ bool FrameFileIO::loadCLX000File(QString filename, QVector<CANFrame>* frames) {
if(res.captured("type").length() != 0) {
auto frameType = res.captured("type").toUInt();
currentFrame.isReceived = (frameType & 0x08);
currentFrame.isReceived = !(frameType & 0x08);
currentFrame.setExtendedFrameFormat(frameType & 0x01);
}