From a6713f836889e112a1fa9979d5c5b3d04f975fbf Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Sun, 30 Jan 2022 16:16:26 +1100 Subject: [PATCH] GCS_MAVLink: build ArduPilot against all.xml not ardupilotmega.xml --- libraries/GCS_MAVLink/GCS_MAVLink.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/GCS_MAVLink/GCS_MAVLink.h b/libraries/GCS_MAVLink/GCS_MAVLink.h index 0eba9e2121..45ddf37809 100644 --- a/libraries/GCS_MAVLink/GCS_MAVLink.h +++ b/libraries/GCS_MAVLink/GCS_MAVLink.h @@ -34,7 +34,7 @@ #pragma GCC diagnostic ignored "-Waddress-of-packed-member" #endif -#include "include/mavlink/v2.0/ardupilotmega/version.h" +#include "include/mavlink/v2.0/all/version.h" #define MAVLINK_MAX_PAYLOAD_LEN 255 @@ -67,7 +67,7 @@ void comm_send_buffer(mavlink_channel_t chan, const uint8_t *buf, uint8_t len); uint16_t comm_get_txspace(mavlink_channel_t chan); #define MAVLINK_USE_CONVENIENCE_FUNCTIONS -#include "include/mavlink/v2.0/ardupilotmega/mavlink.h" +#include "include/mavlink/v2.0/all/mavlink.h" // lock and unlock a channel, for multi-threaded mavlink send void comm_send_lock(mavlink_channel_t chan);