Skip to content

Remove MAVLink development.xml dialect from default targets, add specific ones #25834

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

Merged
merged 6 commits into from
Nov 21, 2025
Merged

Remove MAVLink development.xml dialect from default targets, add specific ones #25834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e137283
mavlink: update submodule
julianoes Nov 18, 2025
3e50170
boards: remove MAVLink development dialect
julianoes Oct 30, 2025
7ea080b
boards: add MAVLink development targets
julianoes Oct 30, 2025
bcb9de2
Gazebo-classic: add define for development.xml
julianoes Nov 10, 2025
5d446e3
mavsdk_tests: figure eight is in common now
julianoes Nov 18, 2025
c38ee7f
mavsdk_tests: bump version to 3.11.1
julianoes Nov 21, 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 Tools/simulation/gazebo-classic/sitl_gazebo-classic
Open in desktop
Submodule sitl_gazebo-classic updated 14 files
+0 −59 .github/workflows/build_test_macos.yml
+6 −0 CMakeLists.txt
+4 −0 include/force_visual/force_visual.h
+2 −1 include/gazebo_camera_manager_plugin.h
+2 −1 include/gazebo_gimbal_controller_plugin.hh
+4 −2 include/gazebo_mavlink_interface.h
+7 −0 include/mavlink_include.h
+2 −2 include/mavlink_interface.h
+1 −1 include/msgbuffer.h
+24 −12 models/plane/plane.sdf.jinja
+41 −8 src/force_visual/force_visual.cpp
+0 −2 src/gazebo_camera_manager_plugin.cpp
+9 −18 src/gazebo_mavlink_interface.cpp
+1 −1 src/liftdrag_plugin/liftdrag_plugin.cpp
1 change: 0 additions & 1 deletion boards/accton-godwit/ga1/default.px4board
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ CONFIG_MODULES_LOGGER=y
CONFIG_MODULES_MAG_BIAS_ESTIMATOR=y
CONFIG_MODULES_MANUAL_CONTROL=y
CONFIG_MODULES_MAVLINK=y
CONFIG_MAVLINK_DIALECT="development"
CONFIG_MODULES_MC_ATT_CONTROL=y
CONFIG_MODULES_MC_AUTOTUNE_ATTITUDE_CONTROL=y
CONFIG_MODULES_MC_HOVER_THRUST_ESTIMATOR=y
Expand Down
1 change: 0 additions & 1 deletion boards/ark/fmu-v6x/default.px4board
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ CONFIG_MODULES_LOGGER=y
CONFIG_MODULES_MAG_BIAS_ESTIMATOR=y
CONFIG_MODULES_MANUAL_CONTROL=y
CONFIG_MODULES_MAVLINK=y
CONFIG_MAVLINK_DIALECT="development"
CONFIG_MODULES_MC_ATT_CONTROL=y
CONFIG_MODULES_MC_AUTOTUNE_ATTITUDE_CONTROL=y
CONFIG_MODULES_MC_HOVER_THRUST_ESTIMATOR=y
Expand Down
1 change: 0 additions & 1 deletion boards/ark/fpv/default.px4board
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ CONFIG_MODULES_LOGGER=y
CONFIG_MODULES_MAG_BIAS_ESTIMATOR=y
CONFIG_MODULES_MANUAL_CONTROL=y
CONFIG_MODULES_MAVLINK=y
CONFIG_MAVLINK_DIALECT="development"
CONFIG_MODULES_MC_ATT_CONTROL=y
CONFIG_MODULES_MC_AUTOTUNE_ATTITUDE_CONTROL=y
CONFIG_MODULES_MC_HOVER_THRUST_ESTIMATOR=y
Expand Down
1 change: 0 additions & 1 deletion boards/ark/pi6x/default.px4board
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ CONFIG_MODULES_LOGGER=y
CONFIG_MODULES_MAG_BIAS_ESTIMATOR=y
CONFIG_MODULES_MANUAL_CONTROL=y
CONFIG_MODULES_MAVLINK=y
CONFIG_MAVLINK_DIALECT="development"
CONFIG_MODULES_MC_ATT_CONTROL=y
CONFIG_MODULES_MC_AUTOTUNE_ATTITUDE_CONTROL=y
CONFIG_MODULES_MC_HOVER_THRUST_ESTIMATOR=y
Expand Down
1 change: 0 additions & 1 deletion boards/auterion/fmu-v6s/default.px4board
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ CONFIG_LOGGER_STACK_SIZE=4100
CONFIG_MODULES_MAG_BIAS_ESTIMATOR=y
CONFIG_MODULES_MANUAL_CONTROL=y
CONFIG_MODULES_MAVLINK=y
CONFIG_MAVLINK_DIALECT="development"
CONFIG_MODULES_MC_ATT_CONTROL=y
CONFIG_MODULES_MC_AUTOTUNE_ATTITUDE_CONTROL=y
CONFIG_MODULES_MC_HOVER_THRUST_ESTIMATOR=y
Expand Down
1 change: 0 additions & 1 deletion boards/cuav/fmu-v6x/default.px4board
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ CONFIG_MODULES_LOGGER=y
CONFIG_MODULES_MAG_BIAS_ESTIMATOR=y
CONFIG_MODULES_MANUAL_CONTROL=y
CONFIG_MODULES_MAVLINK=y
CONFIG_MAVLINK_DIALECT="development"
CONFIG_MODULES_MC_ATT_CONTROL=y
CONFIG_MODULES_MC_AUTOTUNE_ATTITUDE_CONTROL=y
CONFIG_MODULES_MC_HOVER_THRUST_ESTIMATOR=y
Expand Down
1 change: 0 additions & 1 deletion boards/px4/fmu-v5x/default.px4board
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ CONFIG_MODULES_LOGGER=y
CONFIG_MODULES_MAG_BIAS_ESTIMATOR=y
CONFIG_MODULES_MANUAL_CONTROL=y
CONFIG_MODULES_MAVLINK=y
CONFIG_MAVLINK_DIALECT="development"
CONFIG_MODULES_MC_ATT_CONTROL=y
CONFIG_MODULES_MC_AUTOTUNE_ATTITUDE_CONTROL=y
CONFIG_MODULES_MC_HOVER_THRUST_ESTIMATOR=y
Expand Down
1 change: 0 additions & 1 deletion boards/px4/fmu-v6x/default.px4board
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ CONFIG_MODULES_LOGGER=y
CONFIG_MODULES_MAG_BIAS_ESTIMATOR=y
CONFIG_MODULES_MANUAL_CONTROL=y
CONFIG_MODULES_MAVLINK=y
CONFIG_MAVLINK_DIALECT="development"
CONFIG_MODULES_MC_ATT_CONTROL=y
CONFIG_MODULES_MC_AUTOTUNE_ATTITUDE_CONTROL=y
CONFIG_MODULES_MC_HOVER_THRUST_ESTIMATOR=y
Expand Down
1 change: 1 addition & 0 deletions boards/px4/fmu-v6x/mavlink-dev.px4board
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CONFIG_MAVLINK_DIALECT="development"
1 change: 0 additions & 1 deletion boards/px4/sitl/default.px4board
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ CONFIG_MODULES_LOGGER=y
CONFIG_MODULES_MAG_BIAS_ESTIMATOR=y
CONFIG_MODULES_MANUAL_CONTROL=y
CONFIG_MODULES_MAVLINK=y
CONFIG_MAVLINK_DIALECT="development"
CONFIG_MODULES_MC_ATT_CONTROL=y
CONFIG_MODULES_MC_AUTOTUNE_ATTITUDE_CONTROL=y
CONFIG_MODULES_MC_HOVER_THRUST_ESTIMATOR=y
Expand Down
1 change: 1 addition & 0 deletions boards/px4/sitl/mavlink-dev.px4board
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CONFIG_MAVLINK_DIALECT="development"
1 change: 0 additions & 1 deletion boards/px4/sitl/neural.px4board
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ CONFIG_MODULES_LOGGER=y
CONFIG_MODULES_MAG_BIAS_ESTIMATOR=y
CONFIG_MODULES_MANUAL_CONTROL=y
CONFIG_MODULES_MAVLINK=y
CONFIG_MAVLINK_DIALECT="development"
CONFIG_MODULES_MC_ATT_CONTROL=y
CONFIG_MODULES_MC_AUTOTUNE_ATTITUDE_CONTROL=y
CONFIG_MODULES_MC_HOVER_THRUST_ESTIMATOR=y
Expand Down
1 change: 0 additions & 1 deletion boards/svehicle/e2/default.px4board
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ CONFIG_MODULES_LOGGER=y
CONFIG_MODULES_MAG_BIAS_ESTIMATOR=y
CONFIG_MODULES_MANUAL_CONTROL=y
CONFIG_MODULES_MAVLINK=y
CONFIG_MAVLINK_DIALECT="development"
CONFIG_MODULES_MC_ATT_CONTROL=y
CONFIG_MODULES_MC_AUTOTUNE_ATTITUDE_CONTROL=y
CONFIG_MODULES_MC_HOVER_THRUST_ESTIMATOR=y
Expand Down
1 change: 0 additions & 1 deletion boards/zeroone/x6/default.px4board
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ CONFIG_MODULES_LOGGER=y
CONFIG_MODULES_MAG_BIAS_ESTIMATOR=y
CONFIG_MODULES_MANUAL_CONTROL=y
CONFIG_MODULES_MAVLINK=y
CONFIG_MAVLINK_DIALECT="development"
CONFIG_MODULES_MC_ATT_CONTROL=y
CONFIG_MODULES_MC_AUTOTUNE_ATTITUDE_CONTROL=y
CONFIG_MODULES_MC_HOVER_THRUST_ESTIMATOR=y
Expand Down
2 changes: 1 addition & 1 deletion src/modules/mavlink/mavlink
Open in desktop
Submodule mavlink updated 5 files
+2 −2 mavgenerate.py
+62 −3 message_definitions/v1.0/common.xml
+10 −54 message_definitions/v1.0/development.xml
+0 −10 message_definitions/v1.0/minimal.xml
+1 −1 pymavlink
8 changes: 8 additions & 0 deletions src/modules/simulation/simulator_mavlink/sitl_targets_gazebo-classic.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,20 @@ if(gazebo_FOUND)
# project to build sitl_gazebo if necessary
px4_add_git_submodule(TARGET git_sitl_gazebo-classic PATH "${PX4_SOURCE_DIR}/Tools/simulation/gazebo-classic/sitl_gazebo-classic")
include(ExternalProject)

# Set MAVLINK_DEVELOPMENT if using development dialect
set(GAZEBO_MAVLINK_ARGS)
if(CONFIG_MAVLINK_DIALECT STREQUAL "development")
list(APPEND GAZEBO_MAVLINK_ARGS -DMAVLINK_DEVELOPMENT=1)
endif()

ExternalProject_Add(sitl_gazebo-classic
SOURCE_DIR ${PX4_SOURCE_DIR}/Tools/simulation/gazebo-classic/sitl_gazebo-classic
CMAKE_ARGS
-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
-DSEND_ODOMETRY_DATA=ON
-DGENERATE_ROS_MODELS=ON
${GAZEBO_MAVLINK_ARGS}
BINARY_DIR ${PX4_BINARY_DIR}/build_gazebo-classic
INSTALL_COMMAND ""
DEPENDS git_sitl_gazebo-classic
Expand Down
2 changes: 1 addition & 1 deletion test/mavsdk_tests/MAVSDK_VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.7.0
3.11.1
5 changes: 1 addition & 4 deletions test/mavsdk_tests/autopilot_tester_figure_eight.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

/****************************************************************************
*
* Copyright (c) 2023 PX4 Development Team. All rights reserved.
* Copyright (c) 2023-2025 PX4 Development Team. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Expand Down Expand Up @@ -42,9 +42,6 @@

#include <mavsdk/plugins/mavlink_passthrough/mavlink_passthrough.h>

// Fix build until this is moved to common.xml
#define MAVLINK_WIP
#include <mavlink/development/mavlink_msg_figure_eight_execution_status.h>

using namespace mavsdk::geometry;

Expand Down
Loading