1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-23 00:05:33 +03:00

Fix 3D arming checks when using switched 3D mode

When FEATURE_3D is on and BOX3DONASWITCH is configured the "standard"
throttle arming condition is used.
This commit is contained in:
Dan Nixon 2017-11-08 19:00:52 +00:00
parent 0315005445
commit c97fbd04b8
2 changed files with 97 additions and 8 deletions

View file

@ -221,6 +221,7 @@ void updateArmingStatus(void)
/* Ignore ARMING_DISABLED_THROTTLE (once arm switch is on) if we are in 3D mode */
bool ignoreThrottle = feature(FEATURE_3D)
&& !IS_RC_MODE_ACTIVE(BOX3DDISABLE)
&& !isModeActivationConditionPresent(BOX3DONASWITCH)
&& !(getArmingDisableFlags() & ~(ARMING_DISABLED_ARM_SWITCH | ARMING_DISABLED_THROTTLE));
// If arming is disabled and the ARM switch is on