Browse Source

Copter: moved LANDING_GEAR to common RC_Channel

master
Andrew Tridgell 6 years ago
parent
commit
637dc718df
  1. 15
      ArduCopter/RC_Channel.cpp
  2. 1
      ArduCopter/make.inc
  3. 1
      ArduCopter/wscript

15
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 THROW:
case SMART_RTL: case SMART_RTL:
case GUIDED: case GUIDED:
case LANDING_GEAR:
case PARACHUTE_RELEASE: case PARACHUTE_RELEASE:
case ARMDISARM: case ARMDISARM:
case WINCH_CONTROL: case WINCH_CONTROL:
@ -351,20 +350,6 @@ void RC_Channel_Copter::do_aux_function(const aux_func_t ch_option, const aux_sw
#endif #endif
break; 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: case MOTOR_ESTOP:
// Turn on Emergency Stop logic when channel is high // Turn on Emergency Stop logic when channel is high
copter.set_motor_emergency_stop(ch_flag == HIGH); copter.set_motor_emergency_stop(ch_flag == HIGH);

1
ArduCopter/make.inc

@ -46,7 +46,6 @@ LIBRARIES += AP_BattMonitor
LIBRARIES += AP_BoardConfig LIBRARIES += AP_BoardConfig
LIBRARIES += AP_Frsky_Telem LIBRARIES += AP_Frsky_Telem
LIBRARIES += AP_Parachute LIBRARIES += AP_Parachute
LIBRARIES += AP_LandingGear
LIBRARIES += AP_Terrain LIBRARIES += AP_Terrain
LIBRARIES += AP_RPM LIBRARIES += AP_RPM
LIBRARIES += AC_PrecLand LIBRARIES += AC_PrecLand

1
ArduCopter/wscript

@ -18,7 +18,6 @@ def build(bld):
'AP_Camera', 'AP_Camera',
'AP_IRLock', 'AP_IRLock',
'AP_InertialNav', 'AP_InertialNav',
'AP_LandingGear',
'AP_Motors', 'AP_Motors',
'AP_Parachute', 'AP_Parachute',
'AP_RCMapper', 'AP_RCMapper',

Loading…
Cancel
Save