From a1336e4d03e138794f86ccfc3f3ae55a58525fdd Mon Sep 17 00:00:00 2001 From: James Cotton Date: Sun, 5 Jun 2011 08:34:12 -0500 Subject: [PATCH] OP-493: Make sure accessory desired is not a single instance object --- flight/Modules/Actuator/actuator.c | 6 +++--- .../uavobjectdefinition/accessorydesired.xml | 20 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/flight/Modules/Actuator/actuator.c b/flight/Modules/Actuator/actuator.c index 0b127ea85..a4f398302 100644 --- a/flight/Modules/Actuator/actuator.c +++ b/flight/Modules/Actuator/actuator.c @@ -201,7 +201,7 @@ static void actuatorTask(void* parameters) float curve1 = MixerCurve(desired.Throttle,mixerSettings.ThrottleCurve1); //The source for the secondary curve is selectable - float curve2; + float curve2 = 0; AccessoryDesiredData accessory; switch(mixerSettings.Curve2Source) { case MIXERSETTINGS_CURVE2SOURCE_THROTTLE: @@ -260,8 +260,8 @@ static void actuatorTask(void* parameters) (mixers[ct].type == MIXERSETTINGS_MIXER1TYPE_ACCESSORY3)) { if(AccessoryDesiredInstGet(mixerSettings.Curve2Source - MIXERSETTINGS_CURVE2SOURCE_ACCESSORY1,&accessory) == 0) status[ct] = accessory.AccessoryVal; - else - status[ct] = -1; + else + status[ct] = -1; } command.Channel[ct] = scaleChannel(status[ct], diff --git a/shared/uavobjectdefinition/accessorydesired.xml b/shared/uavobjectdefinition/accessorydesired.xml index 87700a459..d0a7b0ed8 100644 --- a/shared/uavobjectdefinition/accessorydesired.xml +++ b/shared/uavobjectdefinition/accessorydesired.xml @@ -1,10 +1,10 @@ - - - Desired Auxillary actuator settings. Comes from @ref ManualControlModule. - - - - - - - + + + Desired Auxillary actuator settings. Comes from @ref ManualControlModule. + + + + + + +