Merge pull request #6936 from etracer65/stick_arming_gyro_calib_fix

Fix initial stick arming when gyro_cal_on_first_arm is used
2018-10-24 23:38:24 +13:00 · 2018-10-24 23:38:24 +13:00 · e820c8f37c
parent 6adfd345db c676ce2f52
commit e820c8f37c
1 changed files with 2 additions and 1 deletions
--- a/src/main/fc/rc_controls.c
+++ b/src/main/fc/rc_controls.c
@ -216,7 +216,8 @@ void processRcStickPositions()
            if (!ARMING_FLAG(ARMED)) {
                // Arm via YAW
                tryArm();
-                if (isTryingToArm()) {
+                if (isTryingToArm() ||
+                    ((getArmingDisableFlags() == ARMING_DISABLED_CALIBRATING) && armingConfig()->gyro_cal_on_first_arm)) {
                    doNotRepeat = false;
                }
            } else {