fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-05-17 17:17:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

FlightTaskDescend: set no vertical thrust when commanding velocity

Browse Source
This commit is contained in:
Matthias Grob
2019-10-15 13:53:17 +02:00
committed by Julian Oes
parent de90543d6f
commit 22c4bb498c
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/FlightTasks/tasks/Descend/FlightTaskDescend.cpp
+7 -6
View File
@@ -39,11 +39,10 @@
bool FlightTaskDescend::activate(vehicle_local_position_setpoint_s last_setpoint)
{
bool ret = FlightTask::activate(last_setpoint);
_position_setpoint = {NAN, NAN, NAN};
_velocity_setpoint = {NAN, NAN, NAN};
_thrust_setpoint = matrix::Vector3f(0.0f, 0.0f, -_param_mpc_thr_hover.get() * 0.6f);
// stay level to minimize horizontal drift
_thrust_setpoint = matrix::Vector3f(0.0f, 0.0f, NAN);
// keep heading
_yaw_setpoint = _yaw;
_yawspeed_setpoint = 0.0f;
return ret;
}
@@ -52,11 +51,13 @@ bool FlightTaskDescend::update()
if (PX4_ISFINITE(_velocity(2))) {
// land with landspeed
_velocity_setpoint(2) = _param_mpc_land_speed.get();
_thrust_setpoint(2) = NAN;
} else {
return false;
// descend with constant thrust (crash landing)
_velocity_setpoint(2) = NAN;
_thrust_setpoint(2) = -_param_mpc_thr_hover.get() * 0.7f;
}
return true;
}
src/lib/FlightTasks/tasks/Descend/FlightTaskDescend.hpp
+3 -5
View File
@@ -33,7 +33,6 @@
/**
* @file FlightTaskDescend.hpp
*
*/
#pragma once
@@ -44,15 +43,14 @@ class FlightTaskDescend : public FlightTask
{
public:
FlightTaskDescend() = default;
virtual ~FlightTaskDescend() = default;
bool update() override;
bool activate(vehicle_local_position_setpoint_s last_setpoint) override;
private:
DEFINE_PARAMETERS_CUSTOM_PARENT(FlightTask,
(ParamFloat<px4::params::MPC_LAND_SPEED>) _param_mpc_land_speed,
(ParamFloat<px4::params::MPC_THR_HOVER>)
_param_mpc_thr_hover /**< throttle value at which vehicle is at hover equilibrium */
(ParamFloat<px4::params::MPC_THR_HOVER>) _param_mpc_thr_hover, ///< thrust at hover equilibrium
(ParamFloat<px4::params::MPC_LAND_SPEED>) _param_mpc_land_speed ///< velocity for controlled descend
)
};