diff --git a/control_data_collecting_tool/README.md b/control_data_collecting_tool/README.md index f8e7d14ee..9d308d8b0 100644 --- a/control_data_collecting_tool/README.md +++ b/control_data_collecting_tool/README.md @@ -113,9 +113,9 @@ ROS 2 params in `/data_collecting_trajectory_publisher` node: | `acc_kp` | `double` | Accel command proportional gain | 1.0 | | `max_lateral_accel` | `double` | Max lateral acceleration limit [m/ss] | 0.5 | | `lateral_error_threshold` | `double` | Lateral error threshold where applying velocity limit [m/s] | 5.0 | -| `yaw_error_threshold` | `double` | Yaw error threshold where applying velocity limit [rad] | 0.50 | +| `yaw_error_threshold` | `double` | Yaw error threshold where applying velocity limit [rad] | 0.75 | | `velocity_limit_by_tracking_error` | `double` | Velocity limit applied when tracking error exceeds threshold [m/s] | 1.0 | -| `mov_ave_window` | `int` | Moving average smoothing window size | 100 | +| `mov_ave_window` | `int` | Moving average smoothing window size | 50 | | `target_longitudinal_velocity` | `double` | Target longitudinal velocity [m/s] | 6.0 | | `longitudinal_velocity_noise_amp` | `double` | Target longitudinal velocity additional sine noise amplitude [m/s] | 0.01 | | `longitudinal_velocity_noise_min_period` | `double` | Target longitudinal velocity additional sine noise minimum period [s] | 5.0 | diff --git a/control_data_collecting_tool/config/param.yaml b/control_data_collecting_tool/config/param.yaml index 5d82c6b08..ca90f6eb4 100644 --- a/control_data_collecting_tool/config/param.yaml +++ b/control_data_collecting_tool/config/param.yaml @@ -22,10 +22,10 @@ data_collecting_trajectory_publisher: max_lateral_accel: 0.5 lateral_error_threshold: 2.0 - yaw_error_threshold: 0.50 + yaw_error_threshold: 0.75 velocity_limit_by_tracking_error: 1.0 - mov_ave_window: 100 - target_longitudinl_velocity: 6.0 + mov_ave_window: 50 + target_longitudinal_velocity: 6.0 longitudinal_velocity_noise_amp: 0.01 longitudinal_velocity_noise_min_period: 5.0 longitudinal_velocity_noise_max_period: 20.0 @@ -33,7 +33,6 @@ data_collecting_trajectory_publisher: data_collecting_pure_pursuit_trajectory_follower: ros__parameters: pure_pursuit_type: linearized - # pure_pursuit_type: naive lookahead_time: 2.0 min_lookahead: 2.0 linearized_pure_pursuit_steer_kp_param: 2.0 diff --git a/control_data_collecting_tool/scripts/data_collecting_trajectory_publisher.py b/control_data_collecting_tool/scripts/data_collecting_trajectory_publisher.py index 01d76b5e1..add9f77a6 100755 --- a/control_data_collecting_tool/scripts/data_collecting_trajectory_publisher.py +++ b/control_data_collecting_tool/scripts/data_collecting_trajectory_publisher.py @@ -376,7 +376,7 @@ def __init__(self): self.declare_parameter( "yaw_error_threshold", - 0.50, + 0.75, ParameterDescriptor( description="Yaw error threshold where applying velocity limit [rad]" ), @@ -392,7 +392,7 @@ def __init__(self): self.declare_parameter( "mov_ave_window", - 100, + 50, ParameterDescriptor(description="Moving average smoothing window size"), )