fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-25 23:03:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

separate valid/invalid pos cases again

Browse Source
This commit is contained in:
Balduin
2025-07-23 14:06:35 +02:00
parent 4f99cdfe24
commit ee7e9cc28a
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/flight_mode_manager/tasks/Auto/FlightTaskAuto.cpp
+15 -4
View File
@@ -293,10 +293,21 @@ void FlightTaskAuto::_prepareLandSetpoints()
PX4_INFO(" max speed: %.2f", (double) max_speed); PX4_INFO(" max speed: %.2f", (double) max_speed);
_stick_acceleration_xy.setVelocityConstraint(max_speed); if (position_valid) {
_stick_acceleration_xy.generateSetpoints(sticks_xy, _yaw, _land_heading, pos, _stick_acceleration_xy.setVelocityConstraint(max_speed);
_velocity_setpoint_feedback.xy(), _deltatime); _stick_acceleration_xy.generateSetpoints(sticks_xy, _yaw, _land_heading, pos,
_stick_acceleration_xy.getSetpoints(_land_position, _velocity_setpoint, _acceleration_setpoint); _velocity_setpoint_feedback.xy(), _deltatime);
_stick_acceleration_xy.getSetpoints(_land_position, _velocity_setpoint, _acceleration_setpoint);
} else {
// Position independent nudging from FlightTaskDescend
_stick_yaw.generateYawSetpoint(_yawspeed_setpoint, _yaw_setpoint, _sticks.getYawExpo(), _yaw, _deltatime);
_acceleration_setpoint.xy() = _stick_tilt_xy.generateAccelerationSetpoints(_sticks.getPitchRoll(), _deltatime, _yaw,
_yaw_setpoint);
// Stick full up -1 -> stop, stick full down 1 -> double the value
_velocity_setpoint(2) *= (1 - _sticks.getThrottleZeroCenteredExpo());
_acceleration_setpoint(2) -= _sticks.getThrottleZeroCentered() * 10.f;
}
PX4_INFO("_land_position: (%.2f, %.2f)", (double) _land_position(0), (double) _land_position(1)); PX4_INFO("_land_position: (%.2f, %.2f)", (double) _land_position(0), (double) _land_position(1));
PX4_INFO("_velocity_setpoint: (%.2f, %.2f)", (double) _velocity_setpoint(0), (double) _velocity_setpoint(1)); PX4_INFO("_velocity_setpoint: (%.2f, %.2f)", (double) _velocity_setpoint(0), (double) _velocity_setpoint(1));