From 7017345fc9dd95c7b36b77b48e4447ac728a0d96 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Fri, 26 Oct 2018 13:31:01 +1100 Subject: [PATCH] Copter: let RC_Channel parent library do AC_Avoid stuff --- ArduCopter/RC_Channel.cpp | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/ArduCopter/RC_Channel.cpp b/ArduCopter/RC_Channel.cpp index 5ddc52959a..9460c284f8 100644 --- a/ArduCopter/RC_Channel.cpp +++ b/ArduCopter/RC_Channel.cpp @@ -78,7 +78,6 @@ void RC_Channel_Copter::init_aux_function(const aux_func_t ch_option, const aux_ case MOTOR_INTERLOCK: case AVOID_ADSB: case PRECISION_LOITER: - case AVOID_PROXIMITY: case INVERTED: case WINCH_ENABLE: do_aux_function(ch_option, ch_flag); @@ -418,23 +417,6 @@ void RC_Channel_Copter::do_aux_function(const aux_func_t ch_option, const aux_sw #endif break; - case AVOID_PROXIMITY: -#if PROXIMITY_ENABLED == ENABLED && AC_AVOID_ENABLED == ENABLED - switch (ch_flag) { - case HIGH: - copter.avoid.proximity_avoidance_enable(true); - copter.Log_Write_Event(DATA_AVOIDANCE_PROXIMITY_ENABLE); - break; - case MIDDLE: - // nothing - break; - case LOW: - copter.avoid.proximity_avoidance_enable(false); - copter.Log_Write_Event(DATA_AVOIDANCE_PROXIMITY_DISABLE); - break; - } -#endif - break; case ARMDISARM: // arm or disarm the vehicle switch (ch_flag) {