Skip to content

Commit 1b59e52

Browse files
authored
Merge pull request #316 from tier4/sync-awf-latest
chore: sync awf-latest
2 parents 6d1c934 + edf0e7b commit 1b59e52

File tree

5 files changed

+16
-4
lines changed

5 files changed

+16
-4
lines changed

autoware_launch/config/control/trajectory_follower/lateral/mpc.param.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
curvature_smoothing_num_ref_steer: 15 # point-to-point index distance used in curvature calculation (for steer command reference): curvature is calculated from three points p(i-num), p(i), p(i+num)
1414

1515
# -- trajectory extending --
16-
extend_trajectory_for_end_yaw_control: true # flag of trajectory extending for terminal yaw control
16+
extend_trajectory_for_end_yaw_control: false # flag of trajectory extending for terminal yaw control
1717

1818
# -- mpc optimization --
1919
qp_solver_type: "osqp" # optimization solver option (unconstraint_fast or osqp)

autoware_launch/config/planning/scenario_planning/common/common.param.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
/**:
22
ros__parameters:
3+
max_vel: 11.1 # max velocity limit [m/s]
4+
35
# constraints param for normal driving
46
normal:
57
min_acc: -1.0 # min deceleration [m/ss]

autoware_launch/config/planning/scenario_planning/common/motion_velocity_smoother/motion_velocity_smoother.param.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
/**:
22
ros__parameters:
33
# motion state constraints
4-
max_velocity: 11.1 # max velocity limit [m/s]
54
stop_decel: 0.0 # deceleration at a stop point[m/ss]
65

76
# external velocity limit parameter
@@ -26,7 +25,7 @@
2625
# engage & replan parameters
2726
replan_vel_deviation: 5.53 # velocity deviation to replan initial velocity [m/s]
2827
engage_velocity: 0.25 # engage velocity threshold [m/s] (if the trajectory velocity is higher than this value, use this velocity for engage vehicle speed)
29-
engage_acceleration: 0.1 # engage acceleration [m/ss] (use this acceleration when engagement)
28+
engage_acceleration: 0.5 # engage acceleration [m/ss] (use this acceleration when engagement)
3029
engage_exit_ratio: 0.5 # exit engage sequence to normal velocity planning when the velocity exceeds engage_exit_ratio x engage_velocity.
3130
stop_dist_to_prohibit_engage: 0.5 # if the stop point is in this distance, the speed is set to 0 not to move the vehicle [m]
3231

autoware_launch/config/planning/scenario_planning/common/planning_validator/planning_validator.param.yaml

+11
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,14 @@
2626
steering_rate: 10.0
2727
velocity_deviation: 100.0
2828
distance_deviation: 100.0
29+
longitudinal_distance_deviation: 1.0
30+
31+
parameters:
32+
# The required trajectory length is calculated as the distance needed
33+
# to stop from the current speed at this deceleration.
34+
forward_trajectory_length_acceleration: -3.0
35+
36+
# An error is raised if the required trajectory length is less than this distance.
37+
# Setting it to 0 means an error will occur if even slightly exceeding the end of the path,
38+
# therefore, a certain margin is necessary.
39+
forward_trajectory_length_margin: 2.0

autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_velocity_planner/blind_spot.param.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
use_pass_judge_line: true
55
stop_line_margin: 1.0 # [m]
66
backward_length: 50.0 # [m]
7-
ignore_width_from_center_line: 0.7 # [m]
7+
ignore_width_from_center_line: 0.0 # [m]
88
max_future_movement_time: 10.0 # [second]
99
threshold_yaw_diff: 0.523 # [rad]
1010
adjacent_extend_width: 1.5 # [m]

0 commit comments

Comments
 (0)