From 60ec8bb5b09caa612461e9897a4e1d16e7556ff9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Inostroza?= Date: Sat, 14 Oct 2017 04:08:00 -0300 Subject: [PATCH 1/3] Fix port widget height in connection window. --- ui/connectionwindow.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/connectionwindow.ui b/ui/connectionwindow.ui index 634ba67..76cc8fe 100644 --- a/ui/connectionwindow.ui +++ b/ui/connectionwindow.ui @@ -139,7 +139,7 @@ 0 - 22 + 0 From 4e645a8674b31b31056fbe85be3572fe9fb64b48 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Sun, 15 Oct 2017 09:17:48 -0700 Subject: [PATCH 2/3] add extended addressing to iso tp window --- re/isotp_interpreterwindow.cpp | 7 +++++++ re/isotp_interpreterwindow.h | 2 ++ ui/isotp_interpreterwindow.ui | 11 +++++++++-- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/re/isotp_interpreterwindow.cpp b/re/isotp_interpreterwindow.cpp index 4d166f8..0907be2 100644 --- a/re/isotp_interpreterwindow.cpp +++ b/re/isotp_interpreterwindow.cpp @@ -28,6 +28,7 @@ ISOTP_InterpreterWindow::ISOTP_InterpreterWindow(const QVector *frames connect(ui->tableIsoFrames, &QTableWidget::itemSelectionChanged, this, &ISOTP_InterpreterWindow::showDetailView); connect(ui->btnClearList, &QPushButton::clicked, this, &ISOTP_InterpreterWindow::clearList); + connect(ui->cbUseExtendedAddressing, SIGNAL(toggled(bool)), this, SLOT(useExtendedAddressing(bool))); QStringList headers; headers << "Timestamp" << "ID" << "Bus" << "Dir" << "Length" << "Data"; @@ -132,6 +133,12 @@ void ISOTP_InterpreterWindow::clearList() //idFilters.clear(); } +void ISOTP_InterpreterWindow::useExtendedAddressing(bool checked) +{ + decoder->setExtendedAddressing(checked); + this->interpretCapturedFrames(); +} + void ISOTP_InterpreterWindow::updatedFrames(int numFrames) { if (numFrames == -1) //all frames deleted. Kill the display diff --git a/re/isotp_interpreterwindow.h b/re/isotp_interpreterwindow.h index 3ec1f4c..76c8ce5 100644 --- a/re/isotp_interpreterwindow.h +++ b/re/isotp_interpreterwindow.h @@ -30,6 +30,7 @@ private slots: void filterAll(); void filterNone(); void interpretCapturedFrames(); + void useExtendedAddressing(bool checked); private: Ui::ISOTP_InterpreterWindow *ui; @@ -43,6 +44,7 @@ private: void closeEvent(QCloseEvent *event); void readSettings(); void writeSettings(); + }; #endif // ISOTP_INTERPRETERWINDOW_H diff --git a/ui/isotp_interpreterwindow.ui b/ui/isotp_interpreterwindow.ui index cb6e353..77e398e 100644 --- a/ui/isotp_interpreterwindow.ui +++ b/ui/isotp_interpreterwindow.ui @@ -6,7 +6,7 @@ 0 0 - 792 + 830 725 @@ -42,13 +42,20 @@ - + Show incomplete and/or corrupted messages + + + + Use extended addressing + + + From 6c5e6b49120a7e14ec7726292736c6eb8fc0c384 Mon Sep 17 00:00:00 2001 From: Adam Voss Date: Sun, 15 Oct 2017 17:54:51 -0500 Subject: [PATCH 3/3] Provide a link pertaining to downloading Qt --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ff91568..f4bf143 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ This project requires 5.8.0 or higher because of a dependency on QSerialBus. ## Instructions for compiling: -Download the newest stable version of Qt directly from qt.io (You need 5.8.x or newer) +[Download the newest stable version of Qt directly from qt.io](https://www.qt.io/download/) (You need 5.8.x or newer) ```sh cd ~