From d0a5a66b62eec11c7c245c635cbd545f5f2b13f6 Mon Sep 17 00:00:00 2001 From: DTF UHF Date: Thu, 23 Jan 2014 17:48:27 -0500 Subject: [PATCH 1/2] Enable gimbal_flags servo passthru in airplane modes and other mixer modes that use servos --- src/mixer.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/mixer.c b/src/mixer.c index 5402ad0b7d..da22f6c616 100755 --- a/src/mixer.c +++ b/src/mixer.c @@ -471,7 +471,11 @@ void mixTable(void) // forward AUX1-4 to servo outputs (not constrained) if (cfg.gimbal_flags & GIMBAL_FORWARDAUX) { int offset = 0; - if (feature(FEATURE_SERVO_TILT)) + //offset servos based off number already used in mixer types + //airplane and servo_tilt together can't be used + if (mcfg.mixerConfiguration == MULTITYPE_AIRPLANE || mcfg.mixerConfiguration == MULTITYPE_FLYING_WING) + offset = 4; + else if (mixers[mcfg.mixerConfiguration].useServo) offset = 2; for (i = 0; i < 4; i++) pwmWriteServo(i + offset, rcData[AUX1 + i]); From 1cb905b7c23bd84a266d83b0d8c43c922cd2c19c Mon Sep 17 00:00:00 2001 From: DTF UHF Date: Thu, 23 Jan 2014 17:52:04 -0500 Subject: [PATCH 2/2] fix spacing --- src/mixer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mixer.c b/src/mixer.c index da22f6c616..254d71f161 100755 --- a/src/mixer.c +++ b/src/mixer.c @@ -471,8 +471,8 @@ void mixTable(void) // forward AUX1-4 to servo outputs (not constrained) if (cfg.gimbal_flags & GIMBAL_FORWARDAUX) { int offset = 0; - //offset servos based off number already used in mixer types - //airplane and servo_tilt together can't be used + // offset servos based off number already used in mixer types + // airplane and servo_tilt together can't be used if (mcfg.mixerConfiguration == MULTITYPE_AIRPLANE || mcfg.mixerConfiguration == MULTITYPE_FLYING_WING) offset = 4; else if (mixers[mcfg.mixerConfiguration].useServo)