mirror of
https://gitee.com/mirrors_PX4/PX4-Autopilot.git
synced 2026-10-16 07:43:34 +08:00
mecanum: deprecate RM_MISS_SPD_DEF
This commit is contained in:
committed by
chfriedrich98
parent
7e705bbf55
commit
6cce443005
@@ -41,7 +41,7 @@ using namespace time_literals;
|
||||
RoverMecanumGuidance::RoverMecanumGuidance(ModuleParams *parent) : ModuleParams(parent)
|
||||
{
|
||||
updateParams();
|
||||
_max_velocity_magnitude = _param_rm_miss_spd_def.get();
|
||||
_max_velocity_magnitude = _param_rm_max_speed.get();
|
||||
_rover_mecanum_guidance_status_pub.advertise();
|
||||
}
|
||||
|
||||
@@ -195,13 +195,9 @@ void RoverMecanumGuidance::updateWaypoints()
|
||||
_waypoint_transition_angle = acosf(cosin);
|
||||
|
||||
// Waypoint cruising speed
|
||||
if (position_setpoint_triplet.current.cruising_speed > FLT_EPSILON) {
|
||||
_max_velocity_magnitude = math::constrain(position_setpoint_triplet.current.cruising_speed, 0.f,
|
||||
_param_rm_max_speed.get());
|
||||
|
||||
} else {
|
||||
_max_velocity_magnitude = _param_rm_miss_spd_def.get();
|
||||
}
|
||||
_max_velocity_magnitude = position_setpoint_triplet.current.cruising_speed > FLT_EPSILON ? math::constrain(
|
||||
position_setpoint_triplet.current.cruising_speed, 0.f,
|
||||
_param_rm_max_speed.get()) : _param_rm_max_speed.get();
|
||||
|
||||
// Waypoint yaw setpoint
|
||||
if (PX4_ISFINITE(position_setpoint_triplet.current.yaw)) {
|
||||
|
||||
@@ -133,7 +133,6 @@ private:
|
||||
(ParamFloat<px4::params::NAV_ACC_RAD>) _param_nav_acc_rad,
|
||||
(ParamFloat<px4::params::RM_MAX_JERK>) _param_rm_max_jerk,
|
||||
(ParamFloat<px4::params::RM_MAX_ACCEL>) _param_rm_max_accel,
|
||||
(ParamFloat<px4::params::RM_MISS_SPD_DEF>) _param_rm_miss_spd_def,
|
||||
(ParamFloat<px4::params::RM_MAX_YAW_RATE>) _param_rm_max_yaw_rate,
|
||||
(ParamFloat<px4::params::RM_MISS_VEL_GAIN>) _param_rm_miss_vel_gain
|
||||
)
|
||||
|
||||
@@ -173,17 +173,6 @@ parameters:
|
||||
decimal: 2
|
||||
default: 0.5
|
||||
|
||||
RM_MISS_SPD_DEF:
|
||||
description:
|
||||
short: Default rover speed during a mission
|
||||
type: float
|
||||
unit: m/s
|
||||
min: 0
|
||||
max: 100
|
||||
increment: 0.01
|
||||
decimal: 2
|
||||
default: 1
|
||||
|
||||
RM_MISS_VEL_GAIN:
|
||||
description:
|
||||
short: Tuning parameter for the velocity reduction during waypoint transition
|
||||
|
||||
Reference in New Issue
Block a user