Skip to content

Commit

Permalink
Expanded Vehicleconstraints to xy for emergency braking
Browse files Browse the repository at this point in the history
  • Loading branch information
Claudio-Chies committed Oct 18, 2024
1 parent 9d90285 commit f019e3a
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -816,7 +816,7 @@ void FlightTaskAuto::_updateTrajConstraints()
// correction required by the altitude/vertical position controller
_constraints.speed_down = 1.2f * _param_mpc_z_v_auto_dn.get();
_constraints.speed_up = 1.2f * _param_mpc_xy_vel_max.get();
_constraints.speed_xy = 1.2f * _param_mpc_xy_vel_max.get();
_constraints.speed_xy = 1.2f * _param_mpc_xy_vel_max.get();;

if (_is_emergency_braking_active) {
// When initializing with large velocity, allow 1g of
Expand Down
1 change: 1 addition & 0 deletions src/modules/mc_pos_control/GotoControl/GotoControl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ void GotoControl::update(const float dt, const matrix::Vector3f &position, const
.timestamp = goto_setpoint.timestamp,
.speed_up = NAN,
.speed_down = NAN,
.speed_xy = NAN,
.want_takeoff = false
};
_vehicle_constraints_pub.publish(vehicle_constraints);
Expand Down
1 change: 1 addition & 0 deletions src/modules/mc_pos_control/MulticopterPositionControl.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ class MulticopterPositionControl : public ModuleBase<MulticopterPositionControl>
.timestamp = 0,
.speed_up = NAN,
.speed_down = NAN,
.speed_xy = NAN,
.want_takeoff = false,
};

Expand Down

0 comments on commit f019e3a

Please sign in to comment.