RC_Channel: added flaperon1 and flaperon2 function outputs

libraries/RC_Channel/RC_Channel_aux.cpp

@@ -12,7 +12,7 @@ const AP_Param::GroupInfo RC_Channel_aux::var_info[] PROGMEM = {
     // @Param: FUNCTION
     // @DisplayName: Servo out function
     // @Description: Setting this to Disabled(0) will setup this output for control by auto missions or MAVLink servo set commands. any other value will enable the corresponding function
-    // @Values: 0:Disabled,1:RCPassThru,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,19:Elevator,20:ElevatorWithInput,21:Rudder
+    // @Values: 0:Disabled,1:RCPassThru,2:Flap,3:Flap_auto,4:Aileron,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,19:Elevator,20:ElevatorWithInput,21:Rudder,24:Flaperon1,25:Flaperon2
     // @User: Standard
     AP_GROUPINFO("FUNCTION",       1, RC_Channel_aux, function, 0),
 
@@ -54,7 +54,8 @@ void RC_Channel_aux::update_aux_servo_function(void)
 		switch (function) {
 		case RC_Channel_aux::k_flap:
 		case RC_Channel_aux::k_flap_auto:
-		case RC_Channel_aux::k_flaperon:
+		case RC_Channel_aux::k_flaperon1:
+		case RC_Channel_aux::k_flaperon2:
 		case RC_Channel_aux::k_egg_drop:
 			_aux_channels[i]->set_range(0,100);
 			break;

libraries/RC_Channel/RC_Channel_aux.h

@@ -39,7 +39,7 @@ public:
         k_flap                  = 2,            ///< flap
         k_flap_auto             = 3,            ///< flap automated
         k_aileron               = 4,            ///< aileron
-        k_flaperon              = 5,            ///< flaperon (flaps and aileron combined, needs two independent servos one for each wing)
+        k_unused1               = 5,            ///< unused function
         k_mount_pan             = 6,            ///< mount yaw (pan)
         k_mount_tilt            = 7,            ///< mount pitch (tilt)
         k_mount_roll            = 8,            ///< mount roll
@@ -58,6 +58,8 @@ public:
         k_rudder                = 21,            ///< secondary rudder channel
         k_sprayer_pump          = 22,            ///< crop sprayer pump channel
         k_sprayer_spinner       = 23,            ///< crop sprayer spinner channel
+        k_flaperon1             = 24,            ///< flaperon, left wing
+        k_flaperon2             = 25,            ///< flaperon, right wing
         k_nr_aux_servo_functions         ///< This must be the last enum value (only add new values _before_ this one)
     } Aux_servo_function_t;