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

FlightTaskManualAltitude: vertical velocity limit interface

Browse Source
This commit is contained in:
Matthias Grob
2023-12-08 21:17:59 +01:00
parent bb617f6c4d
commit 84220407ea
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/flight_mode_manager/tasks/ManualAltitude/FlightTaskManualAltitude.cpp
+3 -2
View File
@@ -92,8 +92,9 @@ void FlightTaskManualAltitude::_updateConstraintsFromEstimator()
void FlightTaskManualAltitude::_scaleSticks() void FlightTaskManualAltitude::_scaleSticks()
{ {
// Use sticks input with deadzone and exponential curve for vertical velocity // Use sticks input with deadzone and exponential curve for vertical velocity
const float vel_max_z = (_sticks.getPosition()(2) > 0.0f) ? _param_mpc_z_vel_max_dn.get() : const float vel_max_up = fminf(_param_mpc_z_vel_max_up.get(), _velocity_constraint_up);
_param_mpc_z_vel_max_up.get(); const float vel_max_down = fminf(_param_mpc_z_vel_max_dn.get(), _velocity_constraint_down);
const float vel_max_z = (_sticks.getPosition()(2) > 0.0f) ? vel_max_down : vel_max_up;
_velocity_setpoint(2) = vel_max_z * _sticks.getPositionExpo()(2); _velocity_setpoint(2) = vel_max_z * _sticks.getPositionExpo()(2);
} }
src/modules/flight_mode_manager/tasks/ManualAltitude/FlightTaskManualAltitude.hpp
+3
View File
@@ -75,6 +75,9 @@ protected:
bool _sticks_data_required = true; ///< let inherited task-class define if it depends on stick data bool _sticks_data_required = true; ///< let inherited task-class define if it depends on stick data
bool _terrain_hold{false}; /**< true when vehicle is controlling height above a static ground position */ bool _terrain_hold{false}; /**< true when vehicle is controlling height above a static ground position */
float _velocity_constraint_up{INFINITY};
float _velocity_constraint_down{INFINITY};
DEFINE_PARAMETERS_CUSTOM_PARENT(FlightTask, DEFINE_PARAMETERS_CUSTOM_PARENT(FlightTask,
(ParamFloat<px4::params::MPC_HOLD_MAX_Z>) _param_mpc_hold_max_z, (ParamFloat<px4::params::MPC_HOLD_MAX_Z>) _param_mpc_hold_max_z,
(ParamInt<px4::params::MPC_ALT_MODE>) _param_mpc_alt_mode, (ParamInt<px4::params::MPC_ALT_MODE>) _param_mpc_alt_mode,