|
|
|
@ -501,8 +501,8 @@ float VtolType::pusher_assist()
@@ -501,8 +501,8 @@ float VtolType::pusher_assist()
|
|
|
|
|
|
|
|
|
|
case ENABLE_ABOVE_MPC_LAND_ALT1_WITHOUT_LAND: // disable if below MPC_LAND_ALT1 or in land mode
|
|
|
|
|
if ((_attc->get_pos_sp_triplet()->current.valid |
|
|
|
|
&& _attc->get_pos_sp_triplet()->current.type == position_setpoint_s::SETPOINT_TYPE_LAND |
|
|
|
|
&& _v_control_mode->flag_control_auto_enabled) || |
|
|
|
|
&& _attc->get_pos_sp_triplet()->current.type == position_setpoint_s::SETPOINT_TYPE_LAND |
|
|
|
|
&& _v_control_mode->flag_control_auto_enabled) || |
|
|
|
|
(!PX4_ISFINITE(dist_to_ground) || (dist_to_ground < _params->mpc_land_alt1))) { |
|
|
|
|
return 0.0f; |
|
|
|
|
} |
|
|
|
@ -511,8 +511,8 @@ float VtolType::pusher_assist()
@@ -511,8 +511,8 @@ float VtolType::pusher_assist()
|
|
|
|
|
|
|
|
|
|
case ENABLE_ABOVE_MPC_LAND_ALT2_WITHOUT_LAND: // disable if below MPC_LAND_ALT2 or in land mode
|
|
|
|
|
if ((_attc->get_pos_sp_triplet()->current.valid |
|
|
|
|
&& _attc->get_pos_sp_triplet()->current.type == position_setpoint_s::SETPOINT_TYPE_LAND |
|
|
|
|
&& _v_control_mode->flag_control_auto_enabled) || |
|
|
|
|
&& _attc->get_pos_sp_triplet()->current.type == position_setpoint_s::SETPOINT_TYPE_LAND |
|
|
|
|
&& _v_control_mode->flag_control_auto_enabled) || |
|
|
|
|
(!PX4_ISFINITE(dist_to_ground) || (dist_to_ground < _params->mpc_land_alt2))) { |
|
|
|
|
return 0.0f; |
|
|
|
|
} |
|
|
|
|