From 63da5660e7b36d3f65bb3537a48a26fb5d666ba4 Mon Sep 17 00:00:00 2001 From: Jaeyoung Lim Date: Tue, 25 Jun 2024 09:05:47 +0200 Subject: [PATCH 1/4] Include custom mavlink Use spacecraft enum Update spacecraft --- .gitmodules | 2 +- libs/mavlink/include/mavlink/v2.0 | 2 +- src/AutoPilotPlugins/PX4/PX4TuningComponent.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index acfcf3886462..908534868608 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,7 +3,7 @@ url = https://github.com/PX4/GpsDrivers.git [submodule "libs/mavlink/include/mavlink/v2.0"] path = libs/mavlink/include/mavlink/v2.0 - url = https://github.com/mavlink/c_library_v2.git + url = https://github.com/DISCOWER/mavlink.git [submodule "libs/OpenSSL/android_openssl"] path = libs/OpenSSL/android_openssl url = https://github.com/KDAB/android_openssl diff --git a/libs/mavlink/include/mavlink/v2.0 b/libs/mavlink/include/mavlink/v2.0 index 908a3910ed40..4042b2284a8a 160000 --- a/libs/mavlink/include/mavlink/v2.0 +++ b/libs/mavlink/include/mavlink/v2.0 @@ -1 +1 @@ -Subproject commit 908a3910ed4070b9d08e01cbf3e467f413829f1f +Subproject commit 4042b2284a8a25b60f9555fca73a2ad3e8dcff17 diff --git a/src/AutoPilotPlugins/PX4/PX4TuningComponent.cc b/src/AutoPilotPlugins/PX4/PX4TuningComponent.cc index c4ca56ead872..ba9aa08c0cd8 100644 --- a/src/AutoPilotPlugins/PX4/PX4TuningComponent.cc +++ b/src/AutoPilotPlugins/PX4/PX4TuningComponent.cc @@ -75,7 +75,7 @@ QUrl PX4TuningComponent::setupSource(void) const case MAV_TYPE_VTOL_RESERVED5: qmlFile = "qrc:/qml/PX4TuningComponentVTOL.qml"; break; - case 99: + case MAV_TYPE_SPACECRAFT: // Spacecraft Type qmlFile = "qrc:/qml/PX4TuningComponentSpacecraft.qml"; default: From 30181f40602b001cdf2982d5d12b0742d66512ed Mon Sep 17 00:00:00 2001 From: JaeyoungLim Date: Wed, 26 Jun 2024 19:01:17 +0200 Subject: [PATCH 2/4] Switch to c_library_v2 --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 908534868608..cc5a404c1c39 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,7 +3,7 @@ url = https://github.com/PX4/GpsDrivers.git [submodule "libs/mavlink/include/mavlink/v2.0"] path = libs/mavlink/include/mavlink/v2.0 - url = https://github.com/DISCOWER/mavlink.git + url = https://github.com/DISCOWER/c_library_v2.git [submodule "libs/OpenSSL/android_openssl"] path = libs/OpenSSL/android_openssl url = https://github.com/KDAB/android_openssl From 0d71028134aa248eb092b62830aeed34a683b2f4 Mon Sep 17 00:00:00 2001 From: Pedro Roque Date: Mon, 29 Jul 2024 16:51:39 +0200 Subject: [PATCH 3/4] add: linux action trigger --- .github/workflows/linux.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index c21553794c0a..991b83187242 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -1,6 +1,7 @@ name: Linux on: + workflow_dispatch: push: branches: - master From 197a17fbd4af848f70ac85ab017a78046d2029d9 Mon Sep 17 00:00:00 2001 From: Pedro Roque Date: Mon, 29 Jul 2024 16:58:19 +0200 Subject: [PATCH 4/4] update: linux action --- .github/workflows/linux.yml | 47 +++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 991b83187242..1795b16fbed3 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -1,7 +1,6 @@ name: Linux on: - workflow_dispatch: push: branches: - master @@ -44,38 +43,47 @@ jobs: with: submodules: recursive fetch-tags: true + fetch-depth: 0 # Temporary solution - name: Remove unused dependencies run: | rm -rf libs/Frameworks - rm -rf libs/sdl2 + rm -rf libs/libevents + rm -rf libs/mavlink rm -rf libs/OpenSSL + rm -rf libs/sdl2 - name: Install Dependencies run: | chmod a+x ./tools/setup/install-dependencies-debian.sh sudo ./tools/setup/install-dependencies-debian.sh - sudo apt clean + python3 -m pip install --user ninja cmake - - name: Install Build Tools + - name: Install Vulkan + run: | + wget -qO - http://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo apt-key add - + sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-1.3.283-focal.list https://packages.lunarg.com/vulkan/1.3.283/lunarg-vulkan-1.3.283-focal.list + sudo apt update + sudo apt install vulkan-sdk + + - name: Install Compiler run: | - wget --quiet https://github.com/ccache/ccache/releases/download/v4.9.1/ccache-4.9.1-linux-x86_64.tar.xz - tar -xvf ccache-*-linux-x86_64.tar.xz - cd ccache-*-linux-x86_64 - sudo make install sudo add-apt-repository ppa:ubuntu-toolchain-r/test sudo apt install gcc-13 g++-13 sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 100 --slave /usr/bin/g++ g++ /usr/bin/g++-13 --slave /usr/bin/gcov gcov /usr/bin/gcov-13 sudo update-alternatives --set gcc /usr/bin/gcc-13 - python3 -m pip install --user ninja meson - - name: Install Vulkan + - name: Install CCache run: | - wget -qO - http://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo apt-key add - - sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-focal.list http://packages.lunarg.com/vulkan/lunarg-vulkan-focal.list - sudo apt update - sudo apt install vulkan-sdk + wget --quiet https://github.com/ccache/ccache/releases/download/v4.9.1/ccache-4.9.1-linux-x86_64.tar.xz + tar -xvf ccache-*-linux-x86_64.tar.xz + cd ccache-*-linux-x86_64 + sudo make install + + - name: Install Unit-Test Dependencies + if: matrix.BuildType == 'Debug' + run: sudo apt install xvfb x11-xserver-utils - name: Set Up Cache uses: hendrikmuhs/ccache-action@v1.2 @@ -88,24 +96,23 @@ jobs: save: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }} - name: Install Qt - uses: jurplel/install-qt-action@v3 + uses: jurplel/install-qt-action@v4 with: version: ${{ env.QT_VERSION }} aqtversion: ==3.1.* host: linux target: desktop dir: ${{ runner.temp }} - modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d + modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors setup-python: true cache: ${{ github.ref == 'refs/heads/master' && github.event_name != 'pull_request' }} - tools: 'tools_cmake' + + - name: Installation Cleanup + run: sudo apt clean # - name: Build GStreamer # uses: ./.github/actions/gstreamer - - name: Cleanup - run: sudo apt clean - - name: Create build directory run: mkdir ${{ runner.temp }}/shadow_build_dir