From d250d9cb2bc1fa675aaed1c141c6f8e1f2586179 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Thu, 6 Jun 2024 09:43:58 +1000 Subject: [PATCH] GCS_MAVLink: remove MOUNT_CONFIGURE/MOUNT_CONTROL handling by default --- libraries/GCS_MAVLink/GCS_config.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libraries/GCS_MAVLink/GCS_config.h b/libraries/GCS_MAVLink/GCS_config.h index d369ef89af..2cef95f117 100644 --- a/libraries/GCS_MAVLink/GCS_config.h +++ b/libraries/GCS_MAVLink/GCS_config.h @@ -65,12 +65,16 @@ #define AP_MAVLINK_MSG_HIL_GPS_ENABLED 0 #endif +// CODE_REMOVAL +// ArduPilot 4.5 sends deprecation warnings for MOUNT_CONTROL/MOUNT_CONFIGURE +// ArduPilot 4.6 stops compiling them in +// ArduPilot 4.7 removes the code entirely #ifndef AP_MAVLINK_MSG_MOUNT_CONFIGURE_ENABLED -#define AP_MAVLINK_MSG_MOUNT_CONFIGURE_ENABLED HAL_GCS_ENABLED +#define AP_MAVLINK_MSG_MOUNT_CONFIGURE_ENABLED 0 #endif #ifndef AP_MAVLINK_MSG_MOUNT_CONTROL_ENABLED -#define AP_MAVLINK_MSG_MOUNT_CONTROL_ENABLED HAL_GCS_ENABLED +#define AP_MAVLINK_MSG_MOUNT_CONTROL_ENABLED 0 #endif // this is for both read and write messages: