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

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 ~

re/isotp_interpreterwindow.cpp

@@ -28,6 +28,7 @@ ISOTP_InterpreterWindow::ISOTP_InterpreterWindow(const QVector<CANFrame> *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

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

ui/connectionwindow.ui

@@ -131,7 +131,7 @@
        <property name="minimumSize">
         <size>
          <width>0</width>
-         <height>22</height>
+         <height>0</height>
         </size>
        </property>
        <property name="layoutDirection">

ui/isotp_interpreterwindow.ui

@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>792</width>
+    <width>830</width>
     <height>725</height>
    </rect>
   </property>
@@ -42,13 +42,20 @@
      </item>
     </layout>
    </item>
-   <item alignment="Qt::AlignHCenter">
+   <item alignment="Qt::AlignLeft">
     <widget class="QCheckBox" name="cbShowIncomplete">
      <property name="text">
       <string>Show incomplete and/or corrupted messages</string>
      </property>
     </widget>
    </item>
+   <item alignment="Qt::AlignLeft">
+    <widget class="QCheckBox" name="cbUseExtendedAddressing">
+     <property name="text">
+      <string>Use extended addressing</string>
+     </property>
+    </widget>
+   </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>