From d2170230f438f92325bee34fa74621f3f867b418 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 21 Nov 2012 11:47:36 +1100 Subject: [PATCH] RC_Channel: added aileron_with_input aux function --- libraries/RC_Channel/RC_Channel_aux.cpp | 3 ++- libraries/RC_Channel/RC_Channel_aux.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libraries/RC_Channel/RC_Channel_aux.cpp b/libraries/RC_Channel/RC_Channel_aux.cpp index c5cc14b951..efb9ffe447 100644 --- a/libraries/RC_Channel/RC_Channel_aux.cpp +++ b/libraries/RC_Channel/RC_Channel_aux.cpp @@ -9,7 +9,7 @@ const AP_Param::GroupInfo RC_Channel_aux::var_info[] PROGMEM = { // @Param: FUNCTION // @DisplayName: Servo out function // @Description: Setting this to Disabled(0) will disable this output, any other value will enable the corresponding function - // @Values: 0:Disabled,1:Manual,2:Flap,3:Flap_auto,4:Aileron,5:flaperon,6:mount_pan,7:mount_tilt,8:mount_roll,9:mount_open,10:camera_trigger,11:release + // @Values: 0:Disabled,1:Manual,2:Flap,3:Flap_auto,4:Aileron,5:flaperon,6:mount_pan,7:mount_tilt,8:mount_roll,9:mount_open,10:camera_trigger,11:release,12:mount2_pan,13:mount2_tilt,14:mount2_roll,15:mount2_open,16:DifferentialSpoiler1,17:DifferentialSpoiler2,18:AileronWithInput // @User: Standard AP_GROUPINFO("FUNCTION", 1, RC_Channel_aux, function, 0), @@ -69,6 +69,7 @@ void update_aux_servo_function( RC_Channel_aux* rc_a, _aux_channels[i]->set_range(0,100); break; case RC_Channel_aux::k_aileron: + case RC_Channel_aux::k_aileron_with_input: _aux_channels[i]->set_angle(4500); break; case RC_Channel_aux::k_dspoiler1: diff --git a/libraries/RC_Channel/RC_Channel_aux.h b/libraries/RC_Channel/RC_Channel_aux.h index 4bbd9148d0..46651ad162 100644 --- a/libraries/RC_Channel/RC_Channel_aux.h +++ b/libraries/RC_Channel/RC_Channel_aux.h @@ -43,6 +43,7 @@ public: k_mount2_open = 15, ///< mount2 open (deploy) / close (retract) k_dspoiler1 = 16, ///< differential spoiler 1 (left wing) k_dspoiler2 = 17, ///< differential spoiler 2 (right wing) + k_aileron_with_input = 18, ///< aileron, with rc input k_nr_aux_servo_functions ///< This must be the last enum value (only add new values _before_ this one) } Aux_servo_function_t;