1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-23 08:15:26 +03:00

Merge pull request #1873 from iNavFlight/de_failsafe_nav_fix

Fix failsafe & navigation clash
This commit is contained in:
Konstantin Sharlaimov 2017-11-30 21:19:14 +10:00 committed by GitHub
commit b9fe92e8a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 0 deletions

View file

@ -2326,6 +2326,11 @@ static navigationFSMEvent_t selectNavEventFromBoxModeInput(void)
//We can switch modes only when ARMED
if (ARMING_FLAG(ARMED)) {
// Ask failsafe system if we can use navigation system
if (failsafeBypassNavigation()) {
return NAV_FSM_EVENT_SWITCH_TO_IDLE;
}
// Flags if we can activate certain nav modes (check if we have required sensors and they provide valid data)
bool canActivateAltHold = canActivateAltHoldMode();
bool canActivatePosHold = canActivatePosHoldMode();