Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update mavlink #12276

Merged
merged 2 commits into from
Jan 4, 2025
Merged

Update mavlink #12276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc89ff1
update mavlink submodule
dakejahl Jan 3, 2025
21c8d25
update mavlink tag in cmake, fix build
dakejahl Jan 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmake/CustomOptions.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ option(QGC_ENABLE_GST_VIDEOSTREAMING "Enable GStreamer Video Backend" ON)
option(QGC_ENABLE_QT_VIDEOSTREAMING "Enable QtMultimedia Video Backend" OFF) # Qt6Multimedia_FOUND

set(QGC_MAVLINK_GIT_REPO "https://github.com/mavlink/c_library_v2.git" CACHE STRING "URL to MAVLink Git Repo")
set(QGC_MAVLINK_GIT_TAG "4db2f67156d996eae90ef437a73353468d850407" CACHE STRING "Tag of MAVLink Git Repo")
set(QGC_MAVLINK_GIT_TAG "b71f061a53941637cbcfc5bcf860f96bc82e0892" CACHE STRING "Tag of MAVLink Git Repo")

set(QGC_QT_ANDROID_MIN_SDK_VERSION "26" CACHE STRING "Android Min SDK Version")
set(QGC_QT_ANDROID_TARGET_SDK_VERSION "35" CACHE STRING "Android Target SDK Version")
Expand Down
2 changes: 1 addition & 1 deletion libs/mavlink/include/mavlink/v2.0
Open in desktop
Submodule v2.0 updated 79 files
+4 −4 ASLUAV/ASLUAV.h
+1 −1 ASLUAV/mavlink.h
+1 −1 ASLUAV/version.h
+4 −4 AVSSUAS/AVSSUAS.h
+1 −1 AVSSUAS/mavlink.h
+1 −1 AVSSUAS/version.h
+4 −4 all/all.h
+1 −1 all/mavlink.h
+1 −1 all/version.h
+40 −9 ardupilotmega/ardupilotmega.h
+1 −1 ardupilotmega/mavlink.h
+405 −0 ardupilotmega/mavlink_msg_esc_telemetry_13_to_16.h
+405 −0 ardupilotmega/mavlink_msg_esc_telemetry_17_to_20.h
+405 −0 ardupilotmega/mavlink_msg_esc_telemetry_21_to_24.h
+405 −0 ardupilotmega/mavlink_msg_esc_telemetry_25_to_28.h
+405 −0 ardupilotmega/mavlink_msg_esc_telemetry_29_to_32.h
+418 −0 ardupilotmega/mavlink_msg_secure_command.h
+362 −0 ardupilotmega/mavlink_msg_secure_command_reply.h
+458 −0 ardupilotmega/testsuite.h
+1 −1 ardupilotmega/version.h
+22 −10 common/common.h
+1 −1 common/mavlink.h
+6 −6 common/mavlink_msg_camera_image_captured.h
+0 −0 common/mavlink_msg_fuel_status.h
+6 −6 common/mavlink_msg_gps2_raw.h
+6 −6 common/mavlink_msg_gps_raw_int.h
+67 −0 common/testsuite.h
+1 −1 common/version.h
+1 −1 csAirLink/csAirLink.h
+1 −1 csAirLink/mavlink.h
+1 −1 csAirLink/version.h
+4 −4 cubepilot/cubepilot.h
+1 −1 cubepilot/mavlink.h
+1 −1 cubepilot/version.h
+24 −91 development/development.h
+1 −1 development/mavlink.h
+0 −390 development/mavlink_msg_param_ack_transaction.h
+0 −362 development/mavlink_msg_wifi_network_info.h
+0 −196 development/testsuite.h
+1 −1 development/version.h
+1 −1 icarous/icarous.h
+1 −1 icarous/mavlink.h
+1 −1 icarous/version.h
+66 −0 loweheiser/loweheiser.h
+34 −0 loweheiser/mavlink.h
+876 −0 loweheiser/mavlink_msg_loweheiser_gov_efi.h
+117 −0 loweheiser/testsuite.h
+14 −0 loweheiser/version.h
+4 −4 matrixpilot/matrixpilot.h
+1 −1 matrixpilot/mavlink.h
+1 −1 matrixpilot/version.h
+114 −4 message_definitions/ardupilotmega.xml
+46 −18 message_definitions/common.xml
+12 −136 message_definitions/development.xml
+55 −0 message_definitions/loweheiser.xml
+1 −1 minimal/mavlink.h
+1 −1 minimal/minimal.h
+1 −1 minimal/version.h
+1 −1 paparazzi/mavlink.h
+4 −4 paparazzi/paparazzi.h
+1 −1 paparazzi/version.h
+1 −1 python_array_test/mavlink.h
+4 −4 python_array_test/python_array_test.h
+1 −1 python_array_test/version.h
+1 −1 standard/mavlink.h
+1 −1 standard/standard.h
+1 −1 standard/version.h
+1 −1 storm32/mavlink.h
+7 −5 storm32/storm32.h
+1 −1 storm32/version.h
+1 −1 test/mavlink.h
+1 −1 test/test.h
+1 −1 test/version.h
+1 −1 uAvionix/mavlink.h
+4 −4 uAvionix/uAvionix.h
+1 −1 uAvionix/version.h
+1 −1 ualberta/mavlink.h
+4 −4 ualberta/ualberta.h
+1 −1 ualberta/version.h
3 changes: 0 additions & 3 deletions src/Vehicle/StandardModes.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,6 @@ void StandardModes::gotMessage(MAV_RESULT result, const mavlink_message_t &messa
case MAV_STANDARD_MODE_ALTITUDE_HOLD:
name = "Altitude";
break;
case MAV_STANDARD_MODE_RETURN_HOME:
name = "Return";
break;
case MAV_STANDARD_MODE_SAFE_RECOVERY:
name = "Safe Recovery";
break;
Expand Down
Loading