Skip to content

Commit 83d9041

Browse files
breschbkueng
authored andcommitted
Jerk-limited auto mode - use MPC_ACC_HOR instead of MPC_ACC_HOR_MAX
as written in the parameter desctiption
1 parent a4a130f commit 83d9041

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

src/lib/FlightTasks/tasks/AutoLineSmoothVel/FlightTaskAutoLineSmoothVel.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,8 @@ void FlightTaskAutoLineSmoothVel::_prepareSetpoints()
199199
void FlightTaskAutoLineSmoothVel::_updateTrajConstraints()
200200
{
201201
// Update the constraints of the trajectories
202-
_trajectory[0].setMaxAccel(_param_mpc_acc_hor_max.get()); // TODO : Should be computed using heading
203-
_trajectory[1].setMaxAccel(_param_mpc_acc_hor_max.get());
202+
_trajectory[0].setMaxAccel(_param_mpc_acc_hor.get()); // TODO : Should be computed using heading
203+
_trajectory[1].setMaxAccel(_param_mpc_acc_hor.get());
204204
_trajectory[0].setMaxVel(_param_mpc_xy_vel_max.get());
205205
_trajectory[1].setMaxVel(_param_mpc_xy_vel_max.get());
206206
_trajectory[0].setMaxJerk(_param_mpc_jerk_auto.get()); // TODO : Should be computed using heading

src/lib/FlightTasks/tasks/AutoLineSmoothVel/FlightTaskAutoLineSmoothVel.hpp

-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ class FlightTaskAutoLineSmoothVel : public FlightTaskAutoMapper2
5959
(ParamFloat<px4::params::MPC_ACC_HOR>) _param_mpc_acc_hor, // acceleration in flight
6060
(ParamFloat<px4::params::MPC_ACC_UP_MAX>) _param_mpc_acc_up_max,
6161
(ParamFloat<px4::params::MPC_ACC_DOWN_MAX>) _param_mpc_acc_down_max,
62-
(ParamFloat<px4::params::MPC_ACC_HOR_MAX>) _param_mpc_acc_hor_max,
6362
(ParamFloat<px4::params::MPC_JERK_AUTO>) _param_mpc_jerk_auto,
6463
(ParamFloat<px4::params::MPC_XY_TRAJ_P>) _param_mpc_xy_traj_p,
6564
(ParamFloat<px4::params::MPC_Z_TRAJ_P>) _param_mpc_z_traj_p

0 commit comments

Comments
 (0)