Merge pull request #6291 from s0up/gps_rescue

[GPS RESCUE] - disable immediate re-arming on land/abort for gps rescue
This commit is contained in:
Michael Keller 2018-07-06 19:33:05 +12:00 committed by GitHub
commit f3fa519e6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions

View File

@ -172,6 +172,7 @@ void updateGPSRescueState(void)
// If we are over 120% of average magnitude, just disarm since we're pretty much home
if (rescueState.sensor.accMagnitude > rescueState.sensor.accMagnitudeAvg * 1.5) {
setArmingDisabled(ARMING_DISABLED_ARM_SWITCH);
disarm();
rescueState.phase = RESCUE_COMPLETE;
}
@ -186,6 +187,7 @@ void updateGPSRescueState(void)
rescueStop();
break;
case RESCUE_ABORT:
setArmingDisabled(ARMING_DISABLED_ARM_SWITCH);
disarm();
rescueStop();
break;