From 63da5660e7b36d3f65bb3537a48a26fb5d666ba4 Mon Sep 17 00:00:00 2001 From: Jaeyoung Lim Date: Tue, 25 Jun 2024 09:05:47 +0200 Subject: [PATCH] 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 acfcf388646..90853486860 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 908a3910ed4..4042b2284a8 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 c4ca56ead87..ba9aa08c0cd 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: