|
|
@ -1567,7 +1567,7 @@ void QuadPlane::update_transition(void) |
|
|
|
plane.rollController.reset_I(); |
|
|
|
plane.rollController.reset_I(); |
|
|
|
|
|
|
|
|
|
|
|
// give full authority to attitude control
|
|
|
|
// give full authority to attitude control
|
|
|
|
attitude_control->set_throttle_mix_max(); |
|
|
|
attitude_control->set_throttle_mix_max(1.0f); |
|
|
|
break; |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -3099,7 +3099,7 @@ void QuadPlane::update_throttle_thr_mix(void) |
|
|
|
bool descent_not_demanded = pos_control->get_desired_velocity().z >= 0.0f; |
|
|
|
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(); |
|
|
|
attitude_control->set_throttle_mix_max(1.0); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
attitude_control->set_throttle_mix_min(); |
|
|
|
attitude_control->set_throttle_mix_min(); |
|
|
|
} |
|
|
|
} |
|
|
|