Moved updateGPSRescueState to imuUpdateAttitude. gps_rescue.c tidy.

This commit is contained in:
Curtis Bangert 2018-06-13 11:17:21 -04:00
parent 11d8171c36
commit 953e2ad0e9
3 changed files with 93 additions and 91 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

@ -41,6 +41,7 @@
#include "flight/imu.h" #include "flight/imu.h"
#include "flight/mixer.h" #include "flight/mixer.h"
#include "flight/pid.h" #include "flight/pid.h"
#include "flight/gps_rescue.h"
#include "io/gps.h" #include "io/gps.h"
@ -521,6 +522,9 @@ void imuUpdateAttitude(timeUs_t currentTimeUs)
acc.accADC[Y] = 0; acc.accADC[Y] = 0;
acc.accADC[Z] = 0; acc.accADC[Z] = 0;
} }
#ifdef USE_GPS_RESCUE
updateGPSRescueState();
#endif
} }
bool shouldInitializeGPSHeading() bool shouldInitializeGPSHeading()