From 8ac5ee02ea34875c943350c7ee5eb5a94a255525 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Thu, 13 Dec 2018 12:02:10 +1100 Subject: [PATCH] Copter: GCS_MAVLink now uses Mission singleton --- ArduCopter/GCS_Mavlink.cpp | 9 --------- ArduCopter/GCS_Mavlink.h | 1 - 2 files changed, 10 deletions(-) diff --git a/ArduCopter/GCS_Mavlink.cpp b/ArduCopter/GCS_Mavlink.cpp index b4b5d6ef34..39539ad691 100644 --- a/ArduCopter/GCS_Mavlink.cpp +++ b/ArduCopter/GCS_Mavlink.cpp @@ -1469,15 +1469,6 @@ bool GCS_MAVLINK_Copter::accept_packet(const mavlink_status_t &status, mavlink_m return (msg.sysid == copter.g.sysid_my_gcs); } -AP_Mission *GCS_MAVLINK_Copter::get_mission() -{ -#if MODE_AUTO_ENABLED == ENABLED - return &copter.mode_auto.mission; -#else - return nullptr; -#endif -} - AP_AdvancedFailsafe *GCS_MAVLINK_Copter::get_advanced_failsafe() const { #if ADVANCED_FAILSAFE == ENABLED diff --git a/ArduCopter/GCS_Mavlink.h b/ArduCopter/GCS_Mavlink.h index eeee96f84e..e60701478b 100644 --- a/ArduCopter/GCS_Mavlink.h +++ b/ArduCopter/GCS_Mavlink.h @@ -16,7 +16,6 @@ protected: bool accept_packet(const mavlink_status_t &status, mavlink_message_t &msg) override; - AP_Mission *get_mission() override; AP_Rally *get_rally() const override; MAV_RESULT handle_flight_termination(const mavlink_command_long_t &packet) override; AP_AdvancedFailsafe *get_advanced_failsafe() const override;