From 637dc718df150252cfaecac183399bae003b5922 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 9 Nov 2018 11:03:51 +1100 Subject: [PATCH] Copter: moved LANDING_GEAR to common RC_Channel --- ArduCopter/RC_Channel.cpp | 15 --------------- ArduCopter/make.inc | 1 - ArduCopter/wscript | 1 - 3 files changed, 17 deletions(-) diff --git a/ArduCopter/RC_Channel.cpp b/ArduCopter/RC_Channel.cpp index 9460c284f8..7777171860 100644 --- a/ArduCopter/RC_Channel.cpp +++ b/ArduCopter/RC_Channel.cpp @@ -95,7 +95,6 @@ void RC_Channel_Copter::init_aux_function(const aux_func_t ch_option, const aux_ case THROW: case SMART_RTL: case GUIDED: - case LANDING_GEAR: case PARACHUTE_RELEASE: case ARMDISARM: case WINCH_CONTROL: @@ -351,20 +350,6 @@ void RC_Channel_Copter::do_aux_function(const aux_func_t ch_option, const aux_sw #endif break; - case LANDING_GEAR: - switch (ch_flag) { - case LOW: - copter.landinggear.set_position(AP_LandingGear::LandingGear_Deploy); - break; - case MIDDLE: - // nothing - break; - case HIGH: - copter.landinggear.set_position(AP_LandingGear::LandingGear_Retract); - break; - } - break; - case MOTOR_ESTOP: // Turn on Emergency Stop logic when channel is high copter.set_motor_emergency_stop(ch_flag == HIGH); diff --git a/ArduCopter/make.inc b/ArduCopter/make.inc index b0a22fb8c8..e875936b5e 100644 --- a/ArduCopter/make.inc +++ b/ArduCopter/make.inc @@ -46,7 +46,6 @@ LIBRARIES += AP_BattMonitor LIBRARIES += AP_BoardConfig LIBRARIES += AP_Frsky_Telem LIBRARIES += AP_Parachute -LIBRARIES += AP_LandingGear LIBRARIES += AP_Terrain LIBRARIES += AP_RPM LIBRARIES += AC_PrecLand diff --git a/ArduCopter/wscript b/ArduCopter/wscript index 834903b937..cb84c7dd10 100644 --- a/ArduCopter/wscript +++ b/ArduCopter/wscript @@ -18,7 +18,6 @@ def build(bld): 'AP_Camera', 'AP_IRLock', 'AP_InertialNav', - 'AP_LandingGear', 'AP_Motors', 'AP_Parachute', 'AP_RCMapper',