1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-16 04:45:24 +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

@ -924,10 +924,6 @@ static FAST_CODE_NOINLINE void subTaskMainSubprocesses(timeUs_t currentTimeUs)
} }
#endif #endif
#ifdef USE_GPS_RESCUE
updateGPSRescueState();
#endif
#ifdef USE_SDCARD #ifdef USE_SDCARD
afatfs_poll(); afatfs_poll();
#endif #endif

View file

@ -182,6 +182,8 @@ void updateGPSRescueState(void)
disarm(); disarm();
rescueStop(); rescueStop();
break; break;
default:
break;
} }
performSanityChecks(); performSanityChecks();

View file

@ -531,6 +531,9 @@ void gpsUpdate(timeUs_t currentTimeUs)
if (sensors(SENSOR_GPS)) { if (sensors(SENSOR_GPS)) {
updateGpsIndicator(currentTimeUs); updateGpsIndicator(currentTimeUs);
} }
#if defined(USE_GPS_RESCUE)
updateGPSRescueState();
#endif
} }
static void gpsNewData(uint16_t c) static void gpsNewData(uint16_t c)