Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-23 16:25:31 +03:00
Code Issues Wiki Activity

Fixed arming condition check when 'gyro calibration on first arm' is activated.

Browse source
This commit is contained in:
mikeller 2017-08-27 11:08:31 +12:00
parent 840070b5df
commit 70cd6bdc38
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/fc/fc_core.c
View file

@ -216,7 +216,7 @@ void updateArmingStatus(void)
if (!isUsingSticksForArming()) { if (!isUsingSticksForArming()) {
// If arming is disabled and the ARM switch is on // If arming is disabled and the ARM switch is on
if (isArmingDisabled() && IS_RC_MODE_ACTIVE(BOXARM)) { if (isArmingDisabled() && !(armingConfig()->gyro_cal_on_first_arm && !(getArmingDisableFlags() & ~(ARMING_DISABLED_ARM_SWITCH | ARMING_DISABLED_CALIBRATING))) && IS_RC_MODE_ACTIVE(BOXARM)) {
setArmingDisabled(ARMING_DISABLED_ARM_SWITCH); setArmingDisabled(ARMING_DISABLED_ARM_SWITCH);
} else if (!IS_RC_MODE_ACTIVE(BOXARM)) { } else if (!IS_RC_MODE_ACTIVE(BOXARM)) {
unsetArmingDisabled(ARMING_DISABLED_ARM_SWITCH); unsetArmingDisabled(ARMING_DISABLED_ARM_SWITCH);

2
src/main/fc/runtime_config.c
View file

@ -49,7 +49,7 @@ void unsetArmingDisabled(armingDisableFlags_e flag)
armingDisableFlags = armingDisableFlags & ~flag; armingDisableFlags = armingDisableFlags & ~flag;
} }
bool isArmingDisabled() bool isArmingDisabled(void)
{ {
return armingDisableFlags; return armingDisableFlags;
} }