CMake and OS versions support update

lebarsfa · lebarsfa · commit ec974bd56822 · 2025-06-17T19:06:56.000+02:00
diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
@@ -8,7 +8,7 @@ jobs:
  deploy:
     runs-on: ubuntu-latest
     steps: 
-    - uses: softprops/action-gh-release@v1
+    - uses: softprops/action-gh-release@v2
       id: create_release
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -26,27 +26,27 @@ jobs:
         fail-fast: false
         matrix:
             cfg:
-            - { os: ubuntu-22.04, shell: bash, arch: x64, py_arch: x64, py_v_maj: 3, py_v_min: 10, cmake_out: './hardwarex.so', deploy-file: './hardwarex_compat.so', desc: 'Ubuntu 22.04' }
-            - { os: macos-12, shell: bash, arch: arm64, py_arch: x64, py_v_maj: 3, py_v_min: 10, cmake_out: './hardwarex.dylib', deploy-file: './hardwarex_compat_arm64.dylib', cmake_params_1: '-D CMAKE_SYSTEM_NAME=Darwin -D CMAKE_OSX_ARCHITECTURES=arm64', desc: 'macOS Monterey arm64' }
-            - { os: macos-12, shell: bash, arch: x86_64, py_arch: x64, py_v_maj: 3, py_v_min: 10, cmake_out: './hardwarex.dylib', deploy-file: './hardwarex_compat.dylib', desc: 'macOS Monterey x86_64' }
-            - { os: windows-2019, shell: bash, arch: x64, py_arch: x64, py_v_maj: 3, py_v_min: 10, cmake_out: './Release/hardwarex.dll', deploy-file: './Release/hardwarex_x64_compat.dll', cmake_params_1: '-G "Visual Studio 16" -A x64 -D ENABLE_STATIC=ON', cmake_params_2: '--config Release --target hardwarex', desc: 'Windows Visual Studio 2019 x64 static' }
-            - { os: windows-2019, shell: bash, arch: x86, py_arch: x86, py_v_maj: 3, py_v_min: 10, cmake_out: './Release/hardwarex.dll', deploy-file: './Release/hardwarex_x86_compat.dll', cmake_params_1: '-G "Visual Studio 16" -A Win32 -D ENABLE_STATIC=ON', cmake_params_2: '--config Release --target hardwarex', desc: 'Windows Visual Studio 2019 x86 static' }
-            - { os: ubuntu-22.04, shell: bash, arch: x64, py_arch: x64, py_v_maj: 3, py_v_min: 10, cmake_out: './hardwarex.so', deploy-file: './hardwarex.so', cmake_params_1: '-D ENABLE_MAVLINK_SUPPORT=ON -D ENABLE_SBG_SDK_SUPPORT=ON -D ENABLE_RPLIDAR_SDK_SUPPORT=ON', desc: 'Ubuntu 22.04 with 3rd support' }
-            #- { os: macos-12, shell: bash, arch: arm64, py_arch: x64, py_v_maj: 3, py_v_min: 10, cmake_out: './hardwarex.dylib', deploy-file: './hardwarex_arm64.dylib', cmake_params_1: '-D CMAKE_SYSTEM_NAME=Darwin -D CMAKE_OSX_ARCHITECTURES=arm64 -D ENABLE_MAVLINK_SUPPORT=ON -D ENABLE_SBG_SDK_SUPPORT=ON -D ENABLE_RPLIDAR_SDK_SUPPORT=ON', desc: 'macOS Monterey arm64 with 3rd support' }
-            - { os: macos-12, shell: bash, arch: x86_64, py_arch: x64, py_v_maj: 3, py_v_min: 10, cmake_out: './hardwarex.dylib', deploy-file: './hardwarex.dylib', cmake_params_1: '-D ENABLE_MAVLINK_SUPPORT=ON -D ENABLE_SBG_SDK_SUPPORT=ON -D ENABLE_RPLIDAR_SDK_SUPPORT=ON', desc: 'macOS Monterey x86_64 with 3rd support' }
-            - { os: windows-2019, shell: bash, arch: x64, py_arch: x64, py_v_maj: 3, py_v_min: 10, cmake_out: './Release/hardwarex.dll', deploy-file: './Release/hardwarex_x64.dll', cmake_params_1: '-G "Visual Studio 16" -A x64 -D ENABLE_STATIC=ON -D ENABLE_MAVLINK_SUPPORT=ON -D ENABLE_SBG_SDK_SUPPORT=ON -D ENABLE_RPLIDAR_SDK_SUPPORT=ON', cmake_params_2: '--config Release --target hardwarex', desc: 'Windows Visual Studio 2019 x64 static with 3rd support' }
-            - { os: windows-2019, shell: bash, arch: x86, py_arch: x86, py_v_maj: 3, py_v_min: 10, cmake_out: './Release/hardwarex.dll', deploy-file: './Release/hardwarex_x86.dll', cmake_params_1: '-G "Visual Studio 16" -A Win32 -D ENABLE_STATIC=ON -D ENABLE_MAVLINK_SUPPORT=ON -D ENABLE_SBG_SDK_SUPPORT=ON -D ENABLE_RPLIDAR_SDK_SUPPORT=ON', cmake_params_2: '--config Release --target hardwarex', desc: 'Windows Visual Studio 2019 x86 static with 3rd support' }
+            - { os: ubuntu-24.04, shell: bash, arch: x64, py_arch: x64, py_v_maj: 3, py_v_min: 12, cmake_out: './hardwarex.so', deploy-file: './hardwarex_compat.so', desc: 'Ubuntu 24.04' }
+            - { os: macos-13, shell: bash, arch: arm64, py_arch: x64, py_v_maj: 3, py_v_min: 12, cmake_out: './hardwarex.dylib', deploy-file: './hardwarex_compat_arm64.dylib', cmake_params_1: '-D CMAKE_SYSTEM_NAME=Darwin -D CMAKE_OSX_ARCHITECTURES=arm64', desc: 'macOS Ventura arm64' }
+            - { os: macos-13, shell: bash, arch: x86_64, py_arch: x64, py_v_maj: 3, py_v_min: 12, cmake_out: './hardwarex.dylib', deploy-file: './hardwarex_compat.dylib', desc: 'macOS Ventura x86_64' }
+            - { os: windows-2022, shell: bash, arch: x64, py_arch: x64, py_v_maj: 3, py_v_min: 12, cmake_out: './Release/hardwarex.dll', deploy-file: './Release/hardwarex_x64_compat.dll', cmake_params_1: '-G "Visual Studio 17" -A x64 -D ENABLE_STATIC=ON', cmake_params_2: '--config Release --target hardwarex', desc: 'Windows Visual Studio 2022 x64 static' }
+            - { os: windows-2022, shell: bash, arch: x86, py_arch: x86, py_v_maj: 3, py_v_min: 12, cmake_out: './Release/hardwarex.dll', deploy-file: './Release/hardwarex_x86_compat.dll', cmake_params_1: '-G "Visual Studio 17" -A Win32 -D ENABLE_STATIC=ON', cmake_params_2: '--config Release --target hardwarex', desc: 'Windows Visual Studio 2022 x86 static' }
+            - { os: ubuntu-24.04, shell: bash, arch: x64, py_arch: x64, py_v_maj: 3, py_v_min: 12, cmake_out: './hardwarex.so', deploy-file: './hardwarex.so', cmake_params_1: '-D ENABLE_MAVLINK_SUPPORT=ON -D ENABLE_SBG_SDK_SUPPORT=ON -D ENABLE_RPLIDAR_SDK_SUPPORT=ON', desc: 'Ubuntu 24.04 with 3rd support' }
+            #- { os: macos-13, shell: bash, arch: arm64, py_arch: x64, py_v_maj: 3, py_v_min: 12, cmake_out: './hardwarex.dylib', deploy-file: './hardwarex_arm64.dylib', cmake_params_1: '-D CMAKE_SYSTEM_NAME=Darwin -D CMAKE_OSX_ARCHITECTURES=arm64 -D ENABLE_MAVLINK_SUPPORT=ON -D ENABLE_SBG_SDK_SUPPORT=ON -D ENABLE_RPLIDAR_SDK_SUPPORT=ON', desc: 'macOS Ventura arm64 with 3rd support' }
+            - { os: macos-13, shell: bash, arch: x86_64, py_arch: x64, py_v_maj: 3, py_v_min: 12, cmake_out: './hardwarex.dylib', deploy-file: './hardwarex.dylib', cmake_params_1: '-D ENABLE_MAVLINK_SUPPORT=ON -D ENABLE_SBG_SDK_SUPPORT=ON -D ENABLE_RPLIDAR_SDK_SUPPORT=ON', desc: 'macOS Ventura x86_64 with 3rd support' }
+            - { os: windows-2022, shell: bash, arch: x64, py_arch: x64, py_v_maj: 3, py_v_min: 12, cmake_out: './Release/hardwarex.dll', deploy-file: './Release/hardwarex_x64.dll', cmake_params_1: '-G "Visual Studio 17" -A x64 -D ENABLE_STATIC=ON -D ENABLE_MAVLINK_SUPPORT=ON -D ENABLE_SBG_SDK_SUPPORT=ON -D ENABLE_RPLIDAR_SDK_SUPPORT=ON', cmake_params_2: '--config Release --target hardwarex', desc: 'Windows Visual Studio 2022 x64 static with 3rd support' }
+            - { os: windows-2022, shell: bash, arch: x86, py_arch: x86, py_v_maj: 3, py_v_min: 12, cmake_out: './Release/hardwarex.dll', deploy-file: './Release/hardwarex_x86.dll', cmake_params_1: '-G "Visual Studio 17" -A Win32 -D ENABLE_STATIC=ON -D ENABLE_MAVLINK_SUPPORT=ON -D ENABLE_SBG_SDK_SUPPORT=ON -D ENABLE_RPLIDAR_SDK_SUPPORT=ON', cmake_params_2: '--config Release --target hardwarex', desc: 'Windows Visual Studio 2022 x86 static with 3rd support' }
     name: ${{ matrix.cfg.desc }}
     steps: 
 
     # Prerequisites
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - run: |
         (New-Object System.Net.WebClient).DownloadFile("http://www.ensta-bretagne.fr/lebars/Share/windows_extra_tools.zip", "C:\Windows\Temp\windows_extra_tools.zip") 
         7z x C:\Windows\Temp\windows_extra_tools.zip -o"C:\Windows" -y
       shell: pwsh
       if: runner.os == 'Windows'
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.cfg.py_v_maj }}.${{ matrix.cfg.py_v_min }}
         architecture: ${{ matrix.cfg.py_arch }}
@@ -61,24 +61,24 @@ jobs:
     - run: |
         git clone https://github.com/ENSTABretagneRobotics/Hardware-Python && cp -Rf Hardware-Python/*.py ./
         rm -Rf linux_x64 mac x86 x64
-        wget https://github.com/ENSTABretagneRobotics/UxVCtrl/releases/download/JD2022/UxVCtrl_JD2022.zip --no-check-certificate -nv
-        unzip -q -o UxVCtrl_JD2022.zip
-        perl -i -p0e 's/% bCommandPrompt\r\n1/% bCommandPrompt\r\n0/' UxVCtrl_JD2022/BUGGY_SIMULATOR_WORKSPACE/UxVCtrl.txt
+        wget https://github.com/ENSTABretagneRobotics/UxVCtrl/releases/download/Fall2024r2/UxVCtrl_Fall2024r2.zip --no-check-certificate -nv
+        unzip -q -o UxVCtrl_Fall2024r2.zip
+        perl -i -p0e 's/% bCommandPrompt\r\n1/% bCommandPrompt\r\n0/' UxVCtrl_Fall2024r2/BUGGY_SIMULATOR_WORKSPACE/UxVCtrl.txt
     - run: |
         sed -i 's/COM6/127.0.0.1:5004/' SSC320.txt
         sed -i 's/COM5/127.0.0.1:5007/' RazorAHRS0.txt
         sed -i 's/COM14/127.0.0.1:5001/' ublox0.txt
-        cp -Rf "UxVCtrl_JD2022/Compatibility mode/Ubuntu/UxVCtrl_compat_ubuntu_jammy" UxVCtrl_JD2022/BUGGY_SIMULATOR_WORKSPACE/
-        cp -Rf "UxVCtrl_JD2022/Compatibility mode/Ubuntu/"*.so* UxVCtrl_JD2022/BUGGY_SIMULATOR_WORKSPACE/
-        sh -c "cd UxVCtrl_JD2022/BUGGY_SIMULATOR_WORKSPACE; chmod +x ./UxVCtrl_compat_ubuntu_jammy; ./UxVCtrl_compat_ubuntu_jammy &"
+        cp -Rf "UxVCtrl_Fall2024r2/Compatibility mode/Ubuntu/UxVCtrl_compat_ubuntu_noble" UxVCtrl_Fall2024r2/BUGGY_SIMULATOR_WORKSPACE/
+        cp -Rf "UxVCtrl_Fall2024r2/Compatibility mode/Ubuntu/"*.so* UxVCtrl_Fall2024r2/BUGGY_SIMULATOR_WORKSPACE/
+        sh -c "cd UxVCtrl_Fall2024r2/BUGGY_SIMULATOR_WORKSPACE; chmod +x ./UxVCtrl_compat_ubuntu_noble; ./UxVCtrl_compat_ubuntu_noble &"
         mkdir -p lib && mv -f ${{ matrix.cfg.cmake_out }} lib/hardwarex.so # Problem when the library is also in the current folder...?
       if: runner.os == 'Linux'
     - run: |
         sed -i "" 's/COM6/127.0.0.1:5004/' SSC320.txt
         sed -i "" 's/COM5/127.0.0.1:5007/' RazorAHRS0.txt
         sed -i "" 's/COM14/127.0.0.1:5001/' ublox0.txt
-        cp -Rf "UxVCtrl_JD2022/Compatibility mode/macOS/UxVCtrl_compat_macos_monterey" UxVCtrl_JD2022/BUGGY_SIMULATOR_WORKSPACE/
-        sh -c "cd UxVCtrl_JD2022/BUGGY_SIMULATOR_WORKSPACE; chmod +x ./UxVCtrl_compat_macos_monterey; ./UxVCtrl_compat_macos_monterey &"
+        cp -Rf "UxVCtrl_Fall2024r2/Compatibility mode/macOS/UxVCtrl_compat_macos_ventura" UxVCtrl_Fall2024r2/BUGGY_SIMULATOR_WORKSPACE/
+        sh -c "cd UxVCtrl_Fall2024r2/BUGGY_SIMULATOR_WORKSPACE; chmod +x ./UxVCtrl_compat_macos_ventura; ./UxVCtrl_compat_macos_ventura &"
         mkdir -p lib && mv -f ${{ matrix.cfg.cmake_out }} lib/hardwarex.dylib
       if: runner.os == 'macOS'
     - run: |
@@ -87,9 +87,9 @@ jobs:
         sed -i 's/COM6/127.0.0.1:5004/' SSC320.txt
         sed -i 's/COM5/127.0.0.1:5007/' RazorAHRS0.txt
         sed -i 's/COM14/127.0.0.1:5001/' ublox0.txt
-        cp -Rf "UxVCtrl_JD2022/Compatibility mode/Windows/UxVCtrl_compat.exe" UxVCtrl_JD2022/BUGGY_SIMULATOR_WORKSPACE/
-        cp -Rf "UxVCtrl_JD2022/Compatibility mode/Windows/"*.dll UxVCtrl_JD2022/BUGGY_SIMULATOR_WORKSPACE/
-        sh -c "cd UxVCtrl_JD2022/BUGGY_SIMULATOR_WORKSPACE; ./UxVCtrl_compat.exe &"
+        cp -Rf "UxVCtrl_Fall2024r2/Compatibility mode/Windows/UxVCtrl_compat.exe" UxVCtrl_Fall2024r2/BUGGY_SIMULATOR_WORKSPACE/
+        cp -Rf "UxVCtrl_Fall2024r2/Compatibility mode/Windows/"*.dll UxVCtrl_Fall2024r2/BUGGY_SIMULATOR_WORKSPACE/
+        sh -c "cd UxVCtrl_Fall2024r2/BUGGY_SIMULATOR_WORKSPACE; ./UxVCtrl_compat.exe &"
         mkdir -p ${{ matrix.cfg.arch }} && mv -f ${{ matrix.cfg.cmake_out }} ./${{ matrix.cfg.arch }}/hardwarex.dll
       if: runner.os == 'Windows'
     - run: |
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8...3.16)
+cmake_minimum_required(VERSION 3.14...3.25)
 
 if(${CMAKE_VERSION} VERSION_LESS "3.12")
 	message(WARNING "CMake < 3.12 is not fully supported...")
@@ -473,6 +473,8 @@ add_definitions(-D DISABLE_AIS_SUPPORT)
 
 if(WIN32)
 	if(MSVC)
+		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4")
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
 		if(ENABLE_STATIC)
 			if(CMAKE_VERSION VERSION_LESS 3.15.0)
 				set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MTd")
diff --git a/ReadMe.txt b/ReadMe.txt
@@ -9,7 +9,7 @@ Linux, macOS, or other problem:
 
 Change the device path (e.g. `COM9`) and other parameters in the configuration files (`RazorAHRS0.txt`, `RPLIDAR0.txt`, etc.) if necessary. Mind the line endings in the configuration files depending on the OS (use e.g. the command `dos2unix *.txt` to convert line endings for Linux)! Ensure that you closed any other application that might use the devices (reboot if unsure). Note that you need to press the ESC key to exit cleanly the test script, if you interrupt the script by `CTRL+C`, MATLAB might crash or you might not be able to launch successfully again the test script...
 
-Sample: http://www.ensta-bretagne.fr/lebars/Share/buggy_real_gps.zip for the buggy based on an Android smartphone described on http://www.ensta-bretagne.fr/lebars/buggy_android_full.pdf .
+Sample: https://www.ensta-bretagne.fr/lebars/Share/buggy_real_gps.zip for the buggy based on an Android smartphone described on https://www.ensta-bretagne.fr/lebars/buggy_android_full.pdf .
 
 Tested on Windows 10 64 bit using MATLAB R2022b 64 bit and MATLAB R2015b 32 bit.
 
@@ -28,4 +28,4 @@ Hardware support:
 - SSC-32: Lynxmotion SSC-32, SSC-32u servo controllers.
 - ublox: ublox GPS (only with NMEA protocol), Furuno WS200 weather station, or other NMEA-compatible devices with supported NMEA sentences.
 
-See also https://github.com/ENSTABretagneRobotics/Hardware-CPP , https://github.com/ENSTABretagneRobotics/Hardware-Python , https://github.com/ENSTABretagneRobotics/Hardware-Java , https://github.com/ENSTABretagneRobotics/Android .
+See also https://github.com/ENSTABretagneRobotics/Hardware-CPP , https://github.com/ENSTABretagneRobotics/Hardware-CPP-GUI , https://github.com/ENSTABretagneRobotics/Hardware-Python , https://github.com/ENSTABretagneRobotics/Hardware-Java , https://github.com/ENSTABretagneRobotics/Android .
