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 #3854 from DanNixon/simplify_prearm_check_confition

Browse source 
Simplify boolean expression for prearm state test
This commit is contained in:
Martin Budden 2017-08-15 19:41:53 +01:00 • committed by GitHub
commit 391d9afe94
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -206,12 +206,13 @@ void updateArmingStatus(void)
unsetArmingDisabled(ARMING_DISABLED_CALIBRATING); unsetArmingDisabled(ARMING_DISABLED_CALIBRATING);
} }
if ((isModeActivationConditionPresent(BOXPREARM) && IS_RC_MODE_ACTIVE(BOXPREARM) && !ARMING_FLAG(WAS_ARMED_WITH_PREARM)) if (isModeActivationConditionPresent(BOXPREARM)) {
|| !isModeActivationConditionPresent(BOXPREARM)) { if (IS_RC_MODE_ACTIVE(BOXPREARM) && !ARMING_FLAG(WAS_ARMED_WITH_PREARM)) {
unsetArmingDisabled(ARMING_DISABLED_NOPREARM); unsetArmingDisabled(ARMING_DISABLED_NOPREARM);
} else { } else {
setArmingDisabled(ARMING_DISABLED_NOPREARM); setArmingDisabled(ARMING_DISABLED_NOPREARM);
} }
}
if (!isUsingSticksForArming()) { if (!isUsingSticksForArming()) {
// If arming is disabled and the ARM switch is on // If arming is disabled and the ARM switch is on