Browse Source

AP_AdvancedFailsafe: GCS_MAVLink takes care of mavlink capabilities

master
Peter Barker 7 years ago committed by Peter Barker
parent
commit
d250442e68
  1. 2
      libraries/AP_AdvancedFailsafe/AP_AdvancedFailsafe.cpp
  2. 2
      libraries/AP_AdvancedFailsafe/AP_AdvancedFailsafe.h

2
libraries/AP_AdvancedFailsafe/AP_AdvancedFailsafe.cpp

@ -156,8 +156,6 @@ AP_AdvancedFailsafe::check(uint32_t last_heartbeat_ms, bool geofence_breached, u @@ -156,8 +156,6 @@ AP_AdvancedFailsafe::check(uint32_t last_heartbeat_ms, bool geofence_breached, u
if (!_enable) {
return;
}
// only set the termination capability, clearing it can mess up copter and sub which can always be terminated
hal.util->set_capabilities(MAV_PROTOCOL_CAPABILITY_FLIGHT_TERMINATION);
// we always check for fence breach
if(_enable_geofence_fs) {

2
libraries/AP_AdvancedFailsafe/AP_AdvancedFailsafe.h

@ -65,6 +65,8 @@ public: @@ -65,6 +65,8 @@ public:
_saved_wp = 0;
}
bool enabled() { return _enable; }
// check that everything is OK
void check(uint32_t last_heartbeat_ms, bool geofence_breached, uint32_t last_valid_rc_ms);

Loading…
Cancel
Save