From 5a28aa9c1b80fa11fdcd982e09d954eeab69a145 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Mon, 4 Nov 2019 11:52:06 +1100 Subject: [PATCH] Sub: move dummy methods into system.cpp --- ArduSub/GCS_Mavlink.cpp | 4 ---- ArduSub/system.cpp | 6 ++++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ArduSub/GCS_Mavlink.cpp b/ArduSub/GCS_Mavlink.cpp index f396621505..bee47458aa 100644 --- a/ArduSub/GCS_Mavlink.cpp +++ b/ArduSub/GCS_Mavlink.cpp @@ -836,7 +836,3 @@ int32_t GCS_MAVLINK_Sub::global_position_int_relative_alt() const { } return GCS_MAVLINK::global_position_int_relative_alt(); } - -// dummy method to avoid linking AFS -bool AP_AdvancedFailsafe::gcs_terminate(bool should_terminate, const char *reason) { return false; } -AP_AdvancedFailsafe *AP::advancedfailsafe() { return nullptr; } diff --git a/ArduSub/system.cpp b/ArduSub/system.cpp index 36b14a01a6..8f9278f209 100644 --- a/ArduSub/system.cpp +++ b/ArduSub/system.cpp @@ -302,3 +302,9 @@ bool Sub::should_log(uint32_t mask) return false; #endif } + +#include + +// dummy method to avoid linking AFS +bool AP_AdvancedFailsafe::gcs_terminate(bool should_terminate, const char *reason) { return false; } +AP_AdvancedFailsafe *AP::advancedfailsafe() { return nullptr; }