mirror of
https://gitee.com/mirrors_PX4/PX4-Autopilot.git
synced 2026-10-17 10:53:34 +08:00
send velocity setpoint to enable proper takeoff/land
This commit is contained in:
committed by
Matthias Grob
parent
b135503447
commit
44b8b4f79f
@@ -279,7 +279,6 @@ bool FlightTaskAuto::_evaluateTriplets()
|
||||
_triplet_next_wp,
|
||||
_sub_triplet_setpoint->get().next.yaw,
|
||||
_sub_triplet_setpoint->get().next.yawspeed_valid ? _sub_triplet_setpoint->get().next.yawspeed : NAN);
|
||||
_obstacle_avoidance.updateAvoidanceDesiredSetpoints(_position_setpoint, _velocity_setpoint);
|
||||
_obstacle_avoidance.checkAvoidanceProgress(_position, _triplet_prev_wp, _target_acceptance_radius, _closest_pt);
|
||||
}
|
||||
|
||||
|
||||
@@ -86,6 +86,8 @@ bool FlightTaskAutoMapper::update()
|
||||
_generateVelocitySetpoints();
|
||||
}
|
||||
|
||||
_obstacle_avoidance.updateAvoidanceDesiredSetpoints(_position_setpoint, _velocity_setpoint);
|
||||
|
||||
_obstacle_avoidance.injectAvoidanceSetpoints(_position_setpoint, _velocity_setpoint, _yaw_setpoint,
|
||||
_yawspeed_setpoint);
|
||||
|
||||
|
||||
@@ -91,6 +91,8 @@ bool FlightTaskAutoMapper2::update()
|
||||
break;
|
||||
}
|
||||
|
||||
_obstacle_avoidance.updateAvoidanceDesiredSetpoints(_position_setpoint, _velocity_setpoint);
|
||||
|
||||
_obstacle_avoidance.injectAvoidanceSetpoints(_position_setpoint, _velocity_setpoint, _yaw_setpoint,
|
||||
_yawspeed_setpoint);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user