Added QtSerial again

grodansparadis · Oct 7, 2024 · dc0c044 · dc0c044
1 parent 8833362
commit dc0c044
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 build-vscp-works-qt-Desktop_Qt_5_14_2_GCC_64bit-Debug
 build
+.venv
 src/CMakeCache.txt
 src/CMakeFiles/
 src/cmake_install.cmake

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -80,7 +80,9 @@
       "format": "cpp",
       "codecvt": "cpp",
       "charconv": "cpp",
-      "semaphore": "cpp"
+      "semaphore": "cpp",
+      "qserialport": "cpp",
+      "qcanbus": "cpp"
     },
     "python.pythonPath": "/usr/bin/python3",
         "files.exclude": {

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -81,7 +81,7 @@ elseif(UNIX)
 endif()
 
 if (MSVC)
-# use precompiled headers
+  # use precompiled headers
   set (CMAKE_AUTOMOC_MOC_OPTIONS "-bpch.h ")
 endif()
 

diff --git a/src/bootloaderwizard.cpp b/src/bootloaderwizard.cpp
@@ -614,6 +614,7 @@ CWizardPageLoadMdf::validatePage(void)
                              QMessageBox::Ok);
         return false;
       }
+
       QApplication::restoreOverrideCursor();
 
       setField("boot.firmware.guid", stdregs.getGUIDStr().c_str());

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -43,11 +43,11 @@
 #include <QMessageBox>
 #include <QtWidgets>
 
-// #include <QtSerialPort/QSerialPort>
-// #include <QCanBus>
-//  #include <QCanBusDevice>
-//  #include <QCanBusFactory>
-//  #include <QCanBusFrame>
+#include <QtSerialPort/QSerialPort>
+#include <QtSerialBus/QCanBus>
+#include <QtSerialBus/QCanBusDevice>
+#include <QtSerialBus/QCanBusFactory>
+#include <QtSerialBus/QCanBusFrame>
 
 #include "filedownloader.h"
 #include "vscpworks.h"