aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Copter: remove get_advanced_failsafe override; singleton to be used

Browse Source
This commit is contained in:
Peter Barker 2019-09-14 14:38:23 +10:00 committed by Andrew Tridgell
parent 0d7db0bbfe
commit 1b29cf14a6
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

@ -1277,15 +1277,6 @@ void Copter::mavlink_delay_cb()
logger.EnableWrites(true); logger.EnableWrites(true);
} }
AP_AdvancedFailsafe *GCS_MAVLINK_Copter::get_advanced_failsafe() const
{
#if ADVANCED_FAILSAFE == ENABLED
return &copter.g2.afs;
#else
return nullptr;
#endif
}
MAV_RESULT GCS_MAVLINK_Copter::handle_flight_termination(const mavlink_command_long_t &packet) { MAV_RESULT GCS_MAVLINK_Copter::handle_flight_termination(const mavlink_command_long_t &packet) {
MAV_RESULT result = MAV_RESULT_FAILED; MAV_RESULT result = MAV_RESULT_FAILED;

1
ArduCopter/GCS_Mavlink.h
View File

@ -14,7 +14,6 @@ protected:
uint32_t telem_delay() const override; uint32_t telem_delay() 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;
AP_AdvancedFailsafe *get_advanced_failsafe() const override;
uint8_t sysid_my_gcs() const override; uint8_t sysid_my_gcs() const override;
bool sysid_enforce() const override; bool sysid_enforce() const override;