Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-03-03 12:14:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Sub: Remove unneeded GCS rally override

Browse Source
This commit is contained in:
Michael du Breuil 2018-12-28 21:49:41 -07:00 committed by Andrew Tridgell
parent 64e152fbc0
commit b4c5041aad
2 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ArduSub/GCS_Mavlink.cpp
View File

@ -1163,15 +1163,6 @@ void Sub::mavlink_delay_cb()
DataFlash.EnableWrites(true); DataFlash.EnableWrites(true);
} }
AP_Rally *GCS_MAVLINK_Sub::get_rally() const
{
#if AC_RALLY == ENABLED
return &sub.rally;
#else
return nullptr;
#endif
}
MAV_RESULT GCS_MAVLINK_Sub::handle_flight_termination(const mavlink_command_long_t &packet) { MAV_RESULT GCS_MAVLINK_Sub::handle_flight_termination(const mavlink_command_long_t &packet) {
if (packet.param1 > 0.5f) { if (packet.param1 > 0.5f) {
sub.init_disarm_motors(); sub.init_disarm_motors();

2
ArduSub/GCS_Mavlink.h
View File

@ -12,8 +12,6 @@ protected:
return 0; return 0;
}; };
AP_Rally *get_rally() const override;
MAV_RESULT handle_flight_termination(const mavlink_command_long_t &packet) override; MAV_RESULT handle_flight_termination(const mavlink_command_long_t &packet) override;
uint8_t sysid_my_gcs() const override; uint8_t sysid_my_gcs() const override;