1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-23 16:25:31 +03:00

Squash and rebase

This commit is contained in:
Blaine 2017-10-18 00:38:13 -07:00
parent 3038eb79ea
commit 9556ea6bf5
4 changed files with 13 additions and 2 deletions

View file

@ -42,6 +42,8 @@
#include "rx/rx.h"
#include "flight/pid.h"
/*
* Usage:
*
@ -256,7 +258,7 @@ void failsafeUpdateState(void)
failsafeApplyControlInput();
beeperMode = BEEPER_RX_LOST_LANDING;
}
if (failsafeShouldHaveCausedLandingByNow() || !armed) {
if (failsafeShouldHaveCausedLandingByNow() || crashRecoveryModeActive() || !armed) {
failsafeState.receivingRxDataPeriodPreset = PERIOD_OF_30_SECONDS; // require 30 seconds of valid rxData
failsafeState.phase = FAILSAFE_LANDED;
reprocessState = true;