From 6a7cce5c224e86c83ec384b3176d85b99ece11e4 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Sat, 14 Sep 2019 14:38:30 +1000 Subject: [PATCH] Plane: remove get_advanced_failsafe override; singleton to be used --- ArduPlane/GCS_Mavlink.cpp | 9 --------- ArduPlane/GCS_Mavlink.h | 2 -- 2 files changed, 11 deletions(-) diff --git a/ArduPlane/GCS_Mavlink.cpp b/ArduPlane/GCS_Mavlink.cpp index 5fb18e1858..e73991f636 100644 --- a/ArduPlane/GCS_Mavlink.cpp +++ b/ArduPlane/GCS_Mavlink.cpp @@ -1386,15 +1386,6 @@ void GCS_MAVLINK_Plane::handle_mission_set_current(AP_Mission &mission, const ma } } -AP_AdvancedFailsafe *GCS_MAVLINK_Plane::get_advanced_failsafe() const -{ -#if ADVANCED_FAILSAFE == ENABLED - return &plane.afs; -#else - return nullptr; -#endif -} - /* set_mode() wrapper for MAVLink SET_MODE */ diff --git a/ArduPlane/GCS_Mavlink.h b/ArduPlane/GCS_Mavlink.h index c31d95ab7b..b96d585eb4 100644 --- a/ArduPlane/GCS_Mavlink.h +++ b/ArduPlane/GCS_Mavlink.h @@ -16,8 +16,6 @@ protected: void handle_mission_set_current(AP_Mission &mission, const mavlink_message_t &msg) override; - AP_AdvancedFailsafe *get_advanced_failsafe() const override; - uint8_t sysid_my_gcs() const override; bool sysid_enforce() const override;