From 6bb84bfcc5e8c34c42746750e18f23b505a586cd Mon Sep 17 00:00:00 2001 From: Michael du Breuil Date: Fri, 28 Dec 2018 21:49:19 -0700 Subject: [PATCH] Copter: Remove unneeded GCS rally override --- 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 ac246b8b9e..f8e16eca94 100644 --- a/ArduCopter/GCS_Mavlink.cpp +++ b/ArduCopter/GCS_Mavlink.cpp @@ -1498,15 +1498,6 @@ MAV_RESULT GCS_MAVLINK_Copter::handle_flight_termination(const mavlink_command_l return result; } -AP_Rally *GCS_MAVLINK_Copter::get_rally() const -{ -#if AC_RALLY == ENABLED - return &copter.rally; -#else - return nullptr; -#endif -} - bool GCS_MAVLINK_Copter::set_mode(const uint8_t mode) { #ifdef DISALLOW_GCS_MODE_CHANGE_DURING_RC_FAILSAFE diff --git a/ArduCopter/GCS_Mavlink.h b/ArduCopter/GCS_Mavlink.h index c7c181598c..27e58de2dc 100644 --- a/ArduCopter/GCS_Mavlink.h +++ b/ArduCopter/GCS_Mavlink.h @@ -14,7 +14,6 @@ protected: uint32_t telem_delay() const 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; AP_VisualOdom *get_visual_odom() const override;