From 19ddb8e5f36a38e646a55890c9e8afee16efd1f0 Mon Sep 17 00:00:00 2001 From: Randy Mackay Date: Fri, 8 Nov 2013 15:19:53 +0900 Subject: [PATCH] TradHeli: integrate constructor changes to main code --- ArduCopter/ArduCopter.pde | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ArduCopter/ArduCopter.pde b/ArduCopter/ArduCopter.pde index cb41e5d4da..59ea17cf99 100644 --- a/ArduCopter/ArduCopter.pde +++ b/ArduCopter/ArduCopter.pde @@ -454,7 +454,7 @@ static struct { #endif #if FRAME_CONFIG == HELI_FRAME // helicopter constructor requires more arguments -static MOTOR_CLASS motors(&g.rc_1, &g.rc_2, &g.rc_3, &g.rc_4, &g.rc_8, &g.heli_servo_1, &g.heli_servo_2, &g.heli_servo_3, &g.heli_servo_4); +static MOTOR_CLASS motors(&g.rc_1, &g.rc_2, &g.rc_3, &g.rc_4, &g.rc_7, &g.rc_8, &g.heli_servo_1, &g.heli_servo_2, &g.heli_servo_3, &g.heli_servo_4); #elif FRAME_CONFIG == TRI_FRAME // tri constructor requires additional rc_7 argument to allow tail servo reversing static MOTOR_CLASS motors(&g.rc_1, &g.rc_2, &g.rc_3, &g.rc_4, &g.rc_7); #elif FRAME_CONFIG == SINGLE_FRAME // single constructor requires extra servos for flaps @@ -2232,7 +2232,7 @@ static void tuning(){ #if FRAME_CONFIG == HELI_FRAME case CH6_HELI_EXTERNAL_GYRO: - motors.ch7_pwm_setpoint(g.rc_6.control_in); + motors.ext_gyro_gain(g.rc_6.control_in); break; #endif