From a2cdd758709feacb532d8913800625933041ced6 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 9 Oct 2016 19:15:30 +1100 Subject: [PATCH] Plane: removed THROTTLE_OUT define this can be achieved with THR_MAX parameter instead --- ArduPlane/config.h | 8 -------- ArduPlane/servos.cpp | 4 ---- 2 files changed, 12 deletions(-) diff --git a/ArduPlane/config.h b/ArduPlane/config.h index cbd376de92..83803974b0 100644 --- a/ArduPlane/config.h +++ b/ArduPlane/config.h @@ -182,14 +182,6 @@ #endif -////////////////////////////////////////////////////////////////////////////// -// THROTTLE_OUT -// -#ifndef THROTTE_OUT - # define THROTTLE_OUT ENABLED -#endif - - ////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////// // STARTUP BEHAVIOUR diff --git a/ArduPlane/servos.cpp b/ArduPlane/servos.cpp index 9acba7893a..36810dd2f7 100644 --- a/ArduPlane/servos.cpp +++ b/ArduPlane/servos.cpp @@ -460,9 +460,6 @@ void Plane::set_servos_controlled(void) channel_rudder->calc_pwm(); -#if THROTTLE_OUT == 0 - channel_throttle->set_servo_out(0); -#else // convert 0 to 100% (or -100 to +100) into PWM int8_t min_throttle = aparm.throttle_min.get(); int8_t max_throttle = aparm.throttle_max.get(); @@ -527,7 +524,6 @@ void Plane::set_servos_controlled(void) // normal throttle calculation based on servo_out channel_throttle->calc_pwm(); } -#endif } /*****************************************