1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-17 05:15:25 +03:00

Merge branch 'gps_rescue_update_fix' of https://github.com/codecae/betaflight

This commit is contained in:
mikeller 2018-06-17 02:04:24 +12:00
commit ce4a95f33d
4 changed files with 84 additions and 83 deletions

View file

@ -549,7 +549,7 @@ uint8_t calculateThrottlePercent(void)
static bool airmodeIsActivated;
bool isAirmodeActivated()
bool isAirmodeActivated()
{
return airmodeIsActivated;
}
@ -809,7 +809,7 @@ bool processRx(timeUs_t currentTimeUs)
}
}
#endif
if (IS_RC_MODE_ACTIVE(BOXPASSTHRU)) {
ENABLE_FLIGHT_MODE(PASSTHRU_MODE);
} else {
@ -924,10 +924,6 @@ static FAST_CODE_NOINLINE void subTaskMainSubprocesses(timeUs_t currentTimeUs)
}
#endif
#ifdef USE_GPS_RESCUE
updateGPSRescueState();
#endif
#ifdef USE_SDCARD
afatfs_poll();
#endif