From 8620a036de3c25132c25518498ed5a82af897f22 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 16 Sep 2012 15:50:13 +1000
Subject: [PATCH] RC_Channel_aux: minor cleanups

remove unused enable_out_ch() and enable k_manual channels. This
ensures k_manual channels used for bottle drop are initialised
correctly to trim output
---
 libraries/RC_Channel/RC_Channel_aux.cpp | 17 +++--------------
 libraries/RC_Channel/RC_Channel_aux.h   |  2 --
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/libraries/RC_Channel/RC_Channel_aux.cpp b/libraries/RC_Channel/RC_Channel_aux.cpp
index c0a380bd02..496119f64c 100644
--- a/libraries/RC_Channel/RC_Channel_aux.cpp
+++ b/libraries/RC_Channel/RC_Channel_aux.cpp
@@ -18,26 +18,15 @@ const AP_Param::GroupInfo RC_Channel_aux::var_info[] PROGMEM = {
 
 static RC_Channel_aux *_aux_channels[7];
 
-/// enable_out_ch - enable the channel through APM_RC
-void
-RC_Channel_aux::enable_out_ch(unsigned char ch_nr)
-{
-    // enable_out this channel if it assigned to a function
-    if( function != k_none ) {
-        _apm_rc->enable_out(ch_nr);
-    }
-}
-
 /// map a function to a servo channel and output it
 void
 RC_Channel_aux::output_ch(unsigned char ch_nr)
 {
-    // take care or two corner cases
+    // take care of two corner cases
     switch(function)
     {
     case k_none:                // disabled
         return;
-        break;
     case k_manual:              // manual
         radio_out = radio_in;
         break;
@@ -97,7 +86,8 @@ enable_aux_servos()
         if (_aux_channels[i]) {
 			RC_Channel_aux::Aux_servo_function_t function = (RC_Channel_aux::Aux_servo_function_t)_aux_channels[i]->function.get();
 			// see if it is a valid function
-			if (function > RC_Channel_aux::k_none && function < RC_Channel_aux::k_nr_aux_servo_functions) {
+			if (function < RC_Channel_aux::k_nr_aux_servo_functions) {
+				_aux_channels[i]->radio_out = _aux_channels[i]->radio_trim;
 				_aux_channels[i]->enable_out();
 			}
 		}
@@ -118,7 +108,6 @@ RC_Channel_aux::set_radio_trim(RC_Channel_aux::Aux_servo_function_t function)
 			_aux_channels[i]->radio_trim.save();
 		}
     }
-
 }
 
 /*
diff --git a/libraries/RC_Channel/RC_Channel_aux.h b/libraries/RC_Channel/RC_Channel_aux.h
index c27e39bfbd..dc65a8a394 100644
--- a/libraries/RC_Channel/RC_Channel_aux.h
+++ b/libraries/RC_Channel/RC_Channel_aux.h
@@ -46,8 +46,6 @@ public:
 
     AP_Int8         function;           ///< see Aux_servo_function_t enum
 
-    void            enable_out_ch(unsigned char ch_nr);
-
     void            output_ch(unsigned char ch_nr);
 
 	// set and save the trim for a function channel to radio_in