Browse Source

Rover: remove get_advanced_failsafe override; singleton to be used

mission-4.1.18
Peter Barker 6 years ago committed by Andrew Tridgell
parent
commit
0d7db0bbfe
  1. 9
      APMrover2/GCS_Mavlink.cpp
  2. 2
      APMrover2/GCS_Mavlink.h

9
APMrover2/GCS_Mavlink.cpp

@ -1093,15 +1093,6 @@ void Rover::mavlink_delay_cb()
logger.EnableWrites(true); logger.EnableWrites(true);
} }
AP_AdvancedFailsafe *GCS_MAVLINK_Rover::get_advanced_failsafe() const
{
#if ADVANCED_FAILSAFE == ENABLED
return &rover.g2.afs;
#else
return nullptr;
#endif
}
bool GCS_MAVLINK_Rover::set_mode(const uint8_t mode) bool GCS_MAVLINK_Rover::set_mode(const uint8_t mode)
{ {
Mode *new_mode = rover.mode_from_mode_num((enum Mode::Number)mode); Mode *new_mode = rover.mode_from_mode_num((enum Mode::Number)mode);

2
APMrover2/GCS_Mavlink.h

@ -12,8 +12,6 @@ protected:
uint32_t telem_delay() const override; uint32_t telem_delay() const 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;

Loading…
Cancel
Save