Merge pull request #4 from aslansq/windows

windows os support

Author: aslansq

.github/workflows/cmake-single-platform.yml

@@ -17,13 +17,13 @@ jobs:
     # The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
     # You can convert this to a matrix build if you need cross-platform coverage.
     # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
     - uses: actions/checkout@v4
 
     - name: Env
-      run: sudo apt install qt5-qmake qtbase5-dev libqt5xmlpatterns5-dev libpopt-dev -y
+      run: sudo apt update && sudo apt install libpopt-dev qt6-xmlpatterns-dev qml-qt6 qt6-base-dev -y
 
     - name : Peak CAN drivers
       run: cd ${{github.workspace}}/drivers/peak-linux-driver-8.20.0 && make clean all &&  sudo make install

.gitignore

@@ -4,3 +4,4 @@ build/
 uds_py/output/
 output/
 .vscode/
+uds_tracer.pro.user

README.md

@@ -1,5 +1,3 @@
-![all_builds](https://github.com/aslansq/uds_tracer/actions/workflows/cmake-single-platform.yml/badge.svg)
-
 This tool is designed for listening to CAN traffic and identifying UDS (Unified Diagnostic Services) packages. It provides a graphical interface to help users analyze and validate the data efficiently. It supports CAN Standard (CAN Std), CAN Flexible Data-rate (CAN FD), and replaying recorded data for detailed analysis.  
 
 ### Supported Devices
@@ -16,18 +14,21 @@ For detailed usage instructions and advanced features, refer to the [Wiki page](
 
 To use this tool, ensure the following dependencies are installed:
 
-- **Qt Framework**: Required for the graphical user interface. Install the Qt5 version for your platform.
+- **Qt Framework**: Required for the graphical user interface. Install the Qt6 version for your platform.
 - **PEAK-System Drivers**: Necessary for communication with PEAK-System USB CAN interfaces. Download and install the drivers from the [PEAK-System website](https://www.peak-system.com/).
-- **Python 3**: Required for generating UDS (Unified Diagnostic Services) messages. Ensure Python 3 is installed and accessible in your system's PATH.
 
 ### Compilation
 
-To compile the tool, navigate to the main directory and run the `build.sh` script:
-
+#### Linux
 ```bash
 ./build.sh
 ```
 
+#### Windows
+```bash
+build.bat
+```
+
 ### Source Code Documentation
 
 1. To properly view the system's architecture and documentation, use Doxygen to generate the documentation. Follow these steps:
@@ -37,4 +38,9 @@ doxygen doxyfile
 ```
 2. Open the generated `index.html` file located in the `doc/output/html` directory in your web browser to explore the documentation.
 
+### ChangeLog
+
+#### v0.2.0 - 2025.06.23
+- Migration to Qt6
+- Support for Windows OS
 

build.bat

@@ -0,0 +1,48 @@
+@echo off
+setlocal enabledelayedexpansion
+
+set THIS_DIR=%~dp0
+cd !THIS_DIR!
+
+goto output
+
+if exist build (
+	rmdir /s /q build
+)
+
+mkdir build
+cd build
+qmake ../*.pro
+if !errorlevel! equ 0 (
+	echo Success qmake
+) else (
+	echo Failure qmake
+	goto ungracefulExit
+)
+
+mingw32-make
+if !errorlevel! equ 0 (
+	echo Success mingw32-make
+) else (
+	echo Failure mingw32-make
+	goto ungracefulExit
+)
+
+:output
+cd !THIS_DIR!
+if exist output (
+	rmdir /s /q output
+)
+mkdir output
+copy build\release\uds_tracer.exe output\
+cd output
+windeployqt uds_tracer.exe
+
+cd !THIS_DIR!
+echo Build completed successfully.
+exit /b 0
+
+
+:ungracefulExit
+set /P ans="Press enter key to continue."
+exit /b 1

build.sh

@@ -17,7 +17,7 @@ cd "$thisDirPath" || ungracefulExit "Failed to change directory to $thisDirPath"
 rm -rf build
 mkdir -p build
 cd build || ungracefulExit "Failed to change gui build directory"
-qmake ../*.pro || ungracefulExit "Failed to run qmake for gui"
+qmake6 ../*.pro || ungracefulExit "Failed to run qmake for gui"
 make || ungracefulExit "Failed to build gui"
 
 ################################################################################

cantabform/canfdform.cpp

@@ -23,6 +23,10 @@ CanFdForm::CanFdForm(QWidget *parent) :
 	ui->arbitSjwLineEdit->setPlaceholderText(this->config.getArbitSjw());
 	ui->dataSjwLineEdit->setPlaceholderText(this->config.getDataSjw());
 
+#ifdef Q_OS_WIN32
+	ui->devLineEdit->setValidator(this->validatorPtr);
+	ui->devPushButton->setVisible(false);
+#endif
 	ui->clkFreqLineEdit->setValidator(this->validatorPtr);
 	ui->arbitBaudLineEdit->setValidator(this->validatorPtr);
 	ui->dataBaudLineEdit->setValidator(this->validatorPtr);

cantabform/canstdform.cpp

@@ -28,12 +28,18 @@ CanStdForm::CanStdForm(QWidget *parent) :
 	for(const Baud &baudRef : this->availableBaudrates) {
 		ui->baudComboBox->addItem(baudRef.name);
 	}
+	this->validatorPtr = new QIntValidator(this);
+#ifdef Q_OS_WIN32
+	ui->devLineEdit->setValidator(this->validatorPtr);
+	ui->devPushButton->setVisible(false);
+#endif
 	ui->baudComboBox->setCurrentIndex(getIndexOfAvailableBaud(this->config.getBaud().toInt()));
 }
 
 CanStdForm::~CanStdForm()
 {
 	delete ui;
+	delete this->validatorPtr;
 }
 
 const ConfigStd &CanStdForm::getConfig(void)

cantabform/canstdform.h

@@ -2,6 +2,7 @@
 #define CANSTDFORM_H
 
 #include <QWidget>
+#include <QIntValidator>
 #include "config.h"
 
 namespace Ui {
@@ -42,6 +43,7 @@ private slots:
 	};
 
 	Ui::CanStdForm *ui;
+	QIntValidator *validatorPtr;
 	ConfigStd config;
 	QVector<Baud> availableBaudrates;
 	int getIndexOfAvailableBaud(uint64_t baudrate);