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

StickAccelerationXY: factor in stricter tilt limit on takeoff

Browse Source
This commit is contained in:
Matthias Grob
2021-04-20 18:18:21 +02:00
parent 29e07b1e52
commit 4865d027f9
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/flight_mode_manager/tasks/Utility/StickAccelerationXY.cpp
+6 -2
View File
@@ -72,7 +72,7 @@ void StickAccelerationXY::generateSetpoints(Vector2f stick_xy, const float yaw,
Vector2f acceleration_scale(_param_mpc_acc_hor.get(), _param_mpc_acc_hor.get());
Vector2f velocity_scale(_param_mpc_vel_manual.get(), _param_mpc_vel_manual.get());
acceleration_scale *= 2.f; // because of drag the average aceleration is half
acceleration_scale *= 2.f; // because of drag the average acceleration is half
// Map stick input to acceleration
Sticks::limitStickUnitLengthXY(stick_xy);
@@ -144,9 +144,13 @@ Vector2f StickAccelerationXY::calculateDrag(Vector2f drag_coefficient, const flo
void StickAccelerationXY::applyTiltLimit(Vector2f &acceleration)
{
// fetch the tilt limit which is lower than the maximum during takeoff
takeoff_status_s takeoff_status{};
_takeoff_status_sub.copy(&takeoff_status);
// Check if acceleration would exceed the tilt limit
const float acc = acceleration.length();
const float acc_tilt_max = tanf(M_DEG_TO_RAD_F * _param_mpc_tiltmax_air.get()) * CONSTANTS_ONE_G;
const float acc_tilt_max = tanf(takeoff_status.tilt_limit) * CONSTANTS_ONE_G;
if (acc > acc_tilt_max) {
acceleration *= acc_tilt_max / acc;