Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-24 00:35:39 +03:00
Code Issues Wiki Activity

Merge pull request #3969 from mikeller/fix_arming_for_gyro_calibration_on_arm

Browse source 
Fixed arming condition check when 'gyro calibration on first arm' is activated.
This commit is contained in:
Martin Budden 2017-08-27 06:25:44 +01:00 • committed by GitHub
commit 196d22d168
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 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);
} else if (!IS_RC_MODE_ACTIVE(BOXARM)) {
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;
}
bool isArmingDisabled()
bool isArmingDisabled(void)
{
return armingDisableFlags;
}