Merge branch 'master' of github.com:collin80/SavvyCAN

2021-03-18 19:44:20 -04:00
parent 16776ab4af 249045a06d
commit abb4bea9cd
5 changed files with 29 additions and 9 deletions
@@ -1585,7 +1585,7 @@ bool FrameFileIO::loadCanalyzerASC(QString filename, QVector<CANFrame>* frames)
                else
                {
                    thisFrame.setFrameId(tokens[2].toUInt(nullptr, 16));
-                    thisFrame.setExtendedFrameFormat(false);
+                    thisFrame.setExtendedFrameFormat(thisFrame.frameId() > 0x7FF);  //some .asc files have extended IDs without 'x'
                }

                int payloadLen = tokens[5].toInt();