Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Copter: Remove unneeded GCS rally override

This commit is contained in:
Michael du Breuil 2018-12-28 21:49:19 -07:00 committed by Andrew Tridgell
parent 85296ac3f3
commit 6bb84bfcc5
2 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ArduCopter/GCS_Mavlink.cpp
View File

@ -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

1
ArduCopter/GCS_Mavlink.h
View File

@ -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;