Tools: build ArduPilot against all.xml not ardupilotmega.xml

This commit is contained in:
Peter Barker 2022-01-30 16:16:26 +11:00 committed by Andrew Tridgell
parent a6713f8368
commit a81a1fb19f
2 changed files with 2 additions and 2 deletions

View File

@ -29,7 +29,7 @@ extern const AP_HAL::HAL &hal;
#include "include/mavlink/v2.0/protocol.h"
#include "include/mavlink/v2.0/mavlink_types.h"
#include "include/mavlink/v2.0/ardupilotmega/mavlink.h"
#include "include/mavlink/v2.0/all/mavlink.h"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wmissing-declarations"
#include "include/mavlink/v2.0/mavlink_helpers.h"

View File

@ -6375,7 +6375,7 @@ Also, ignores heartbeats not from our target system'''
source_system=250,
source_component=250,
autoreconnect=True,
dialect="ardupilotmega", # if we don't pass this in we end up with the wrong mavlink version...
dialect="all", # if we don't pass this in we end up with the wrong mavlink version...
)
except Exception as msg:
self.progress("Failed to start mavlink connection on %s: %s" %