Copter: set throttle_mix to min when disarmed

This commit is contained in:
Leonard Hall 2015-06-17 22:08:20 +09:00 committed by Randy Mackay
parent 8cdfac8fcd
commit 911bee3518

View File

@ -113,9 +113,15 @@ void Copter::set_land_complete_maybe(bool b)
// has no effect when throttle is above hover throttle // has no effect when throttle is above hover throttle
void Copter::update_throttle_thr_mix() void Copter::update_throttle_thr_mix()
{ {
// if disarmed prioritise throttle
if(!motors.armed()) {
motors.set_throttle_mix_min();
return;
}
if (mode_has_manual_throttle(control_mode)) { if (mode_has_manual_throttle(control_mode)) {
// manual throttle // manual throttle
if(!motors.armed() || channel_throttle->control_in <= 0) { if(channel_throttle->control_in <= 0) {
motors.set_throttle_mix_min(); motors.set_throttle_mix_min();
} else { } else {
motors.set_throttle_mix_mid(); motors.set_throttle_mix_mid();