1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-19 22:35:23 +03:00

remove gps_required and gps_minimum sats and revert to gps_rescue_min_sats

This commit is contained in:
ctzsnooze 2022-10-19 15:58:54 +11:00
parent c5468981e6
commit 341d65becf
22 changed files with 41 additions and 63 deletions

View file

@ -345,7 +345,7 @@ void updateArmingStatus(void)
#ifdef USE_GPS_RESCUE
if (gpsRescueIsConfigured()) {
if (gpsRescueConfig()->allowArmingWithoutFix || (STATE(GPS_FIX) && (gpsSol.numSat >= gpsConfig()->gpsRequiredSats)) ||
if (gpsRescueConfig()->allowArmingWithoutFix || (STATE(GPS_FIX) && (gpsSol.numSat >= gpsRescueConfig()->minSats)) ||
ARMING_FLAG(WAS_EVER_ARMED) || IS_RC_MODE_ACTIVE(BOXFLIPOVERAFTERCRASH)) {
unsetArmingDisabled(ARMING_DISABLED_GPS);
} else {
@ -577,7 +577,7 @@ void tryArm(void)
GPS_reset_home_position();
//beep to indicate arming
if (featureIsEnabled(FEATURE_GPS)) {
if (STATE(GPS_FIX) && gpsSol.numSat >= gpsConfig()->gpsRequiredSats) {
if (STATE(GPS_FIX) && gpsSol.numSat >= gpsRescueConfig()->minSats) {
beeper(BEEPER_ARMING_GPS_FIX);
} else {
beeper(BEEPER_ARMING_GPS_NO_FIX);