From 428fa3776b689ee29423db6fa9adb65672612cae Mon Sep 17 00:00:00 2001 From: Bertrand Date: Wed, 24 Feb 2021 08:15:21 +0100 Subject: [PATCH 1/5] recognizing extended frame IDs in Vector asc even if not preceded by 'x' I stumbled upon a few log files with extended IDs but no x (SAE J1939) --- framefileio.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framefileio.cpp b/framefileio.cpp index 87645b7..ea50a33 100644 --- a/framefileio.cpp +++ b/framefileio.cpp @@ -1584,7 +1584,7 @@ bool FrameFileIO::loadCanalyzerASC(QString filename, QVector* 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(); From 39a1d2e17d033270d26d87a56e1f897434d0cf30 Mon Sep 17 00:00:00 2001 From: Bertrand Date: Wed, 24 Feb 2021 08:18:46 +0100 Subject: [PATCH 2/5] resetting counter when line disabled you can now send a message 3 times, deactivate and activate to send a message 3 times again. --- framesenderwindow.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/framesenderwindow.cpp b/framesenderwindow.cpp index 49ce0d0..d887d33 100644 --- a/framesenderwindow.cpp +++ b/framesenderwindow.cpp @@ -430,7 +430,17 @@ void FrameSenderWindow::handleTick() for (int i = 0; i < sendingData.count(); i++) { sendData = &sendingData[i]; - if (!sendData->enabled) continue; //abort any processing on this if it is not enabled. + if (!sendData->enabled) + { + if (sendData->triggers.count() > 0) + { + for (int j = 0; j < sendData->triggers.count(); j++) //resetting currCount when line is disabled + { + sendData->triggers[j].currCount = 0; + } + } + continue; //abort any processing on this if it is not enabled. + } if (sendData->triggers.count() == 0) return; for (int j = 0; j < sendData->triggers.count(); j++) { From 8a1ce9f23866008ff648123c8499e5c730d453e3 Mon Sep 17 00:00:00 2001 From: Bertrand Date: Wed, 24 Feb 2021 08:19:43 +0100 Subject: [PATCH 3/5] checking if JS script is loaded before compiling avoids crash --- scriptingwindow.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scriptingwindow.cpp b/scriptingwindow.cpp index 101bf6b..fb27b73 100644 --- a/scriptingwindow.cpp +++ b/scriptingwindow.cpp @@ -345,8 +345,11 @@ void ScriptingWindow::revertScript() void ScriptingWindow::recompileScript() { - currentScript->scriptText = editor->toPlainText(); - currentScript->compileScript(); + if (currentScript) + { + currentScript->scriptText = editor->toPlainText(); + currentScript->compileScript(); + } } void ScriptingWindow::clickedLogClear() From 6b5d7335335424b29807d5d68278f4ba5bc2df02 Mon Sep 17 00:00:00 2001 From: Bertrand Date: Wed, 24 Feb 2021 08:21:24 +0100 Subject: [PATCH 4/5] looking for message in all DBCs in graphdialog this is not perfect, since two different DBCs can still have messages with the same name. still an improvement though --- re/newgraphdialog.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/re/newgraphdialog.cpp b/re/newgraphdialog.cpp index 87cd41d..f6c97c4 100644 --- a/re/newgraphdialog.cpp +++ b/re/newgraphdialog.cpp @@ -357,7 +357,15 @@ void NewGraphDialog::handleDataLenUpdate() void NewGraphDialog::copySignalToParamsUI() { - DBC_MESSAGE *msg = dbcHandler->getFileByIdx(0)->messageHandler->findMsgByName(ui->cbMessages->currentText()); + assocSignal = nullptr; + DBC_MESSAGE *msg = nullptr; + + for(int i = 0; i < dbcHandler->getFileCount(); i++) + { + msg = dbcHandler->getFileByIdx(i)->messageHandler->findMsgByName(ui->cbMessages->currentText()); + if (msg) break; + } + if (!msg) return; DBC_SIGNAL *sig = msg->sigHandler->findSignalByName(ui->cbSignals->currentText()); if (!sig) return; From 249045a06dda9d12dbe73dc64eae8fb0312452a1 Mon Sep 17 00:00:00 2001 From: Collin Kidder Date: Thu, 18 Mar 2021 19:38:12 -0400 Subject: [PATCH 5/5] Update README.md --- README.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 2bd059c..0286f11 100644 --- a/README.md +++ b/README.md @@ -48,15 +48,14 @@ http://www.qcustomplot.com/ However, this source code is integrated into the source for SavvyCAN and one isn't required to download it separately. -This project requires 5.10.0 or higher because of a dependency on QtSerialBus. However, you will get -even more SerialBus goodness if you use QT 5.11 or higher. +This project requires 5.13.0 or higher because of a dependency on QtSerialBus and other new additions to QT. NOTE: QT6 currently lacks support for QtSerialBus and many other QT sub-features. At this time you cannot use QT6 to compile SavvyCAN. Support for QT6 should be possible around QT6.2. ## Instructions for compiling: -[Download the newest stable version of Qt directly from qt.io](https://www.qt.io/download/) (You need 5.10.x or newer) +[Download the newest stable version of Qt directly from qt.io](https://www.qt.io/download/) (You need 5.13.x or newer) ```sh cd ~ @@ -65,7 +64,7 @@ git clone https://github.com/collin80/SavvyCAN.git cd SavvyCAN -~/Qt/5.10/gcc_64/bin/qmake +~/Qt/5.13/gcc_64/bin/qmake make ```