diff --git a/ArduCopter/Copter.cpp b/ArduCopter/Copter.cpp index b4bb7f1d55..2f8be1d33a 100644 --- a/ArduCopter/Copter.cpp +++ b/ArduCopter/Copter.cpp @@ -286,7 +286,7 @@ void Copter::rc_loop() void Copter::throttle_loop() { // update throttle_low_comp value (controls priority of throttle vs attitude control) - update_throttle_thr_mix(); + update_throttle_mix(); // check auto_armed status update_auto_armed(); diff --git a/ArduCopter/Copter.h b/ArduCopter/Copter.h index 1b265d6c0d..3a015a3402 100644 --- a/ArduCopter/Copter.h +++ b/ArduCopter/Copter.h @@ -750,7 +750,7 @@ private: void update_land_detector(); void set_land_complete(bool b); void set_land_complete_maybe(bool b); - void update_throttle_thr_mix(); + void update_throttle_mix(); // landing_gear.cpp void landinggear_update(); diff --git a/ArduCopter/land_detector.cpp b/ArduCopter/land_detector.cpp index 2a048fb843..00f85b3e28 100644 --- a/ArduCopter/land_detector.cpp +++ b/ArduCopter/land_detector.cpp @@ -137,14 +137,14 @@ void Copter::set_land_complete_maybe(bool b) ap.land_complete_maybe = b; } -// update_throttle_thr_mix - sets motors throttle_low_comp value depending upon vehicle state +// sets motors throttle_low_comp value depending upon vehicle state // low values favour pilot/autopilot throttle over attitude control, high values favour attitude control over throttle // has no effect when throttle is above hover throttle -void Copter::update_throttle_thr_mix() +void Copter::update_throttle_mix() { #if FRAME_CONFIG != HELI_FRAME // if disarmed or landed prioritise throttle - if(!motors->armed() || ap.land_complete) { + if (!motors->armed() || ap.land_complete) { attitude_control->set_throttle_mix_min(); return; } @@ -175,7 +175,7 @@ void Copter::update_throttle_thr_mix() // check for requested decent bool descent_not_demanded = pos_control->get_desired_velocity().z >= 0.0f; - if ( large_angle_request || large_angle_error || accel_moving || descent_not_demanded) { + if (large_angle_request || large_angle_error || accel_moving || descent_not_demanded) { attitude_control->set_throttle_mix_max(pos_control->get_vel_z_control_ratio()); } else { attitude_control->set_throttle_mix_min();