Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-16 12:55:19 +03:00
Code Issues Wiki Activity

Merge pull request #6204 from mikeller/fix_rearming_without_gps_fix

Browse source 
Enabled rearming with 'GPS rescue' enabled and no GPS fix.
This commit is contained in:
Michael Keller 2018-06-24 21:29:36 +12:00 • committed by GitHub
commit 1c081ae8c3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/main/fc/fc_core.c
View file

@ -257,10 +257,10 @@ void updateArmingStatus(void)
#ifdef USE_GPS_RESCUE #ifdef USE_GPS_RESCUE
if (isModeActivationConditionPresent(BOXGPSRESCUE)) { if (isModeActivationConditionPresent(BOXGPSRESCUE)) {
if (rescueState.sensor.numSat < gpsRescueConfig()->minSats) { if (!gpsRescueConfig()->minSats || STATE(GPS_FIX_HOME) || ARMING_FLAG(WAS_EVER_ARMED)) {
setArmingDisabled(ARMING_DISABLED_GPS);
} else {
unsetArmingDisabled(ARMING_DISABLED_GPS); unsetArmingDisabled(ARMING_DISABLED_GPS);
} else {
setArmingDisabled(ARMING_DISABLED_GPS);
} }
} }
#endif #endif
@ -758,6 +758,7 @@ bool processRx(timeUs_t currentTimeUs)
DISABLE_FLIGHT_MODE(HORIZON_MODE); DISABLE_FLIGHT_MODE(HORIZON_MODE);
} }
#ifdef USE_GPS_RESCUE
if (IS_RC_MODE_ACTIVE(BOXGPSRESCUE) || (failsafeIsActive() && failsafeConfig()->failsafe_procedure == FAILSAFE_PROCEDURE_GPS_RESCUE)) { if (IS_RC_MODE_ACTIVE(BOXGPSRESCUE) || (failsafeIsActive() && failsafeConfig()->failsafe_procedure == FAILSAFE_PROCEDURE_GPS_RESCUE)) {
if (!FLIGHT_MODE(GPS_RESCUE_MODE)) { if (!FLIGHT_MODE(GPS_RESCUE_MODE)) {
ENABLE_FLIGHT_MODE(GPS_RESCUE_MODE); ENABLE_FLIGHT_MODE(GPS_RESCUE_MODE);
@ -765,6 +766,7 @@ bool processRx(timeUs_t currentTimeUs)
} else { } else {
DISABLE_FLIGHT_MODE(GPS_RESCUE_MODE); DISABLE_FLIGHT_MODE(GPS_RESCUE_MODE);
} }
#endif
if (FLIGHT_MODE(ANGLE_MODE) || FLIGHT_MODE(HORIZON_MODE)) { if (FLIGHT_MODE(ANGLE_MODE) || FLIGHT_MODE(HORIZON_MODE)) {
LED1_ON; LED1_ON;