From 8f2fad6918362bf9deed357db9ada54ea0e8e361 Mon Sep 17 00:00:00 2001 From: James Cotton Date: Sat, 10 Sep 2011 15:54:10 -0500 Subject: [PATCH] Fix for merging with the collective channel with the swashplate fix. --- flight/Modules/Actuator/actuator.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/flight/Modules/Actuator/actuator.c b/flight/Modules/Actuator/actuator.c index f610eedbe..f50848ddc 100644 --- a/flight/Modules/Actuator/actuator.c +++ b/flight/Modules/Actuator/actuator.c @@ -240,7 +240,8 @@ static void actuatorTask(void* parameters) break; case MIXERSETTINGS_CURVE2SOURCE_COLLECTIVE: ManualControlCommandCollectiveGet(&curve2); - curve2 = MixerCurve(curve2,mixerSettings.ThrottleCurve2); + curve2 = MixerCurve(curve2,mixerSettings.ThrottleCurve2, + MIXERSETTINGS_THROTTLECURVE2_NUMELEM); break; case MIXERSETTINGS_CURVE2SOURCE_ACCESSORY0: case MIXERSETTINGS_CURVE2SOURCE_ACCESSORY1: