mirror of
https://github.com/ArduPilot/ardupilot
synced 2025-02-23 00:04:02 -04:00
Copter: radio fs continue-if-guided loses dependency on gcs failsafe
This commit is contained in:
parent
b3869f3a7c
commit
b56bd41034
@ -62,9 +62,8 @@ void Copter::failsafe_radio_on_event()
|
|||||||
announce_failsafe("Radio", "Continuing Auto");
|
announce_failsafe("Radio", "Continuing Auto");
|
||||||
desired_action = FailsafeAction::NONE;
|
desired_action = FailsafeAction::NONE;
|
||||||
|
|
||||||
} else if ((flightmode->in_guided_mode()) &&
|
} else if ((flightmode->in_guided_mode()) && failsafe_option(FailsafeOption::RC_CONTINUE_IF_GUIDED)) {
|
||||||
(failsafe_option(FailsafeOption::RC_CONTINUE_IF_GUIDED)) && (g.failsafe_gcs != FS_GCS_DISABLED)) {
|
// Allow guided mode to continue when FS_OPTIONS is set to continue in guided mode
|
||||||
// Allow guided mode to continue when FS_OPTIONS is set to continue in guided mode. Only if the GCS failsafe is enabled.
|
|
||||||
announce_failsafe("Radio", "Continuing Guided Mode");
|
announce_failsafe("Radio", "Continuing Guided Mode");
|
||||||
desired_action = FailsafeAction::NONE;
|
desired_action = FailsafeAction::NONE;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user