From a604138fe3ce9014ee98974f04b13ba9a133c83b Mon Sep 17 00:00:00 2001 From: "Konstantin (DigitalEntity) Sharlaimov" Date: Sun, 24 Jul 2016 04:02:14 +0300 Subject: [PATCH] Bug fix for bloced arming --- src/main/fc/rc_controls.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/fc/rc_controls.c b/src/main/fc/rc_controls.c index eda363741..73f755650 100644 --- a/src/main/fc/rc_controls.c +++ b/src/main/fc/rc_controls.c @@ -195,14 +195,13 @@ void processRcStickPositions(rxConfig_t *rxConfig, throttleStatus_e throttleStat } if (isUsingSticksToArm) { - // Dont disarm if fixedwing and motorstop - if (STATE(FIXED_WING) && feature(FEATURE_MOTOR_STOP) && fixed_wing_auto_arm) { - return; - } - // Disarm on throttle down + yaw if (rcSticks == THR_LO + YAW_LO + PIT_CE + ROL_CE) { - if (ARMING_FLAG(ARMED)) { + // Dont disarm if fixedwing and motorstop + if (STATE(FIXED_WING) && feature(FEATURE_MOTOR_STOP) && fixed_wing_auto_arm) { + return; + } + else if (ARMING_FLAG(ARMED)) { mwDisarm(); } else {