Merge pull request collin80#292 from CSS-Electronics/bug_clx000

CLX000: Allow for shorter IDs, flip direction
zero-motorcycle-community · Feb 23, 2021 · f4a5acb · f4a5acb
2 parents ac69bb6 + 0fef5c1
commit f4a5acb
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/framefileio.cpp b/framefileio.cpp
@@ -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);
             }