From 1426078cdb95a6ac1474a58e4db6e58e9007792a Mon Sep 17 00:00:00 2001 From: Randy Mackay Date: Fri, 7 Feb 2014 22:02:01 +0900 Subject: [PATCH] TradHeli: disable aux channels 7 and 8 --- libraries/AP_Motors/AP_MotorsHeli.cpp | 4 ++++ libraries/AP_Motors/AP_MotorsHeli.h | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/AP_Motors/AP_MotorsHeli.cpp b/libraries/AP_Motors/AP_MotorsHeli.cpp index 4c9b77f461..f372acafee 100644 --- a/libraries/AP_Motors/AP_MotorsHeli.cpp +++ b/libraries/AP_Motors/AP_MotorsHeli.cpp @@ -227,6 +227,10 @@ void AP_MotorsHeli::Init() // initialise swash plate init_swash(); + + // disable channels 7 and 8 from being used by RC_Channel_aux + RC_Channel_aux::disable_aux_channel(_motor_to_channel_map[AP_MOTORS_HELI_AUX]); + RC_Channel_aux::disable_aux_channel(_motor_to_channel_map[AP_MOTORS_HELI_RSC]); } // set update rate to motors - a value in hertz diff --git a/libraries/AP_Motors/AP_MotorsHeli.h b/libraries/AP_Motors/AP_MotorsHeli.h index 6a7a41b0d3..1f89d81a28 100644 --- a/libraries/AP_Motors/AP_MotorsHeli.h +++ b/libraries/AP_Motors/AP_MotorsHeli.h @@ -12,10 +12,6 @@ #include // RC Channel Library #include "AP_Motors.h" -// output channels -#define AP_MOTORS_HELI_EXT_GYRO CH_7 // tail servo uses channel 7 -#define AP_MOTORS_HELI_EXT_RSC CH_8 // main rotor controlled with channel 8 - // maximum number of swashplate servos #define AP_MOTORS_HELI_NUM_SWASHPLATE_SERVOS 3