Skip to content

Commit f28c21b

Browse files
authored
Merge pull request #768 from tier4/sync-beta-310-branch
chore: sync beta/v3.1.0 branch
2 parents 669a9d6 + e25e8db commit f28c21b

File tree

16 files changed

+533
-78
lines changed

16 files changed

+533
-78
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,4 +75,4 @@
7575
average_num: 1000
7676
steering_offset_limit: 0.02
7777

78-
debug_publish_predicted_trajectory: false # publish debug predicted trajectory in Frenet coordinate
78+
debug_publish_predicted_trajectory: true # publish debug predicted trajectory in Frenet coordinate

autoware_launch/config/control/trajectory_follower/longitudinal/pid.param.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@
6262

6363
# acceleration limit
6464
max_acc: 1.86
65-
min_acc: -6.00
65+
min_acc: -3.36
6666

6767
# jerk limit
6868
max_jerk: 2.0
69-
min_jerk: -30.0
69+
min_jerk: -5.0
7070
max_acc_cmd_diff: 50.0 # [m/s^2 * s^-1]
7171

7272
# slope compensation

autoware_launch/config/control/vehicle_cmd_gate/vehicle_cmd_gate.param.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
filter_activated_velocity_threshold: 1.0
1111
external_emergency_stop_heartbeat_timeout: 0.0
1212
stop_hold_acceleration: -1.5
13-
emergency_acceleration: -4.0
13+
emergency_acceleration: -2.5
1414
moderate_stop_service_acceleration: -1.5
1515
stopped_state_entry_duration_time: 0.1
1616
stop_check_duration: 1.0
@@ -19,8 +19,8 @@
1919
reference_speed_points: [0.1, 0.2, 20.0, 30.0]
2020
steer_lim: [1.0, 1.0, 1.0, 0.8]
2121
steer_rate_lim: [1.0, 1.0, 1.0, 0.8]
22-
lon_acc_lim: [6.0, 6.0, 6.0, 6.0]
23-
lon_jerk_lim: [80.0, 30.0, 30.0, 30.0]
22+
lon_acc_lim: [5.0, 5.0, 5.0, 4.0]
23+
lon_jerk_lim: [5.0, 5.0, 5.0, 4.0]
2424
lat_acc_lim: [5.0, 5.0, 5.0, 4.0]
2525
lat_jerk_lim: [7.0, 7.0, 7.0, 6.0]
2626
actual_steer_diff_lim: [1.0, 1.0, 1.0, 0.8]

autoware_launch/config/perception/object_recognition/prediction/map_based_prediction.param.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,8 @@
5050
consider_only_routable_neighbours: false
5151

5252
reference_path_resolution: 0.5 #[m]
53+
54+
# debug parameters
55+
publish_processing_time: true
56+
publish_processing_time_detail: true
57+
publish_debug_markers: true

autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/goal_planner/goal_planner.param.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
maximum_jerk: 1.0
5656
path_priority: "efficient_path" # "efficient_path" or "close_goal"
5757
efficient_path_order: ["SHIFT", "ARC_FORWARD", "ARC_BACKWARD"] # only lane based pull over(exclude freespace parking)
58+
lane_departure_check_expansion_margin: 0.0
5859

5960
# shift parking
6061
shift_parking:

autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/lane_change/lane_change.param.yaml

Lines changed: 30 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@
44
backward_lane_length: 200.0 #[m]
55
prepare_duration: 3.0 # [s]
66

7-
backward_length_buffer_for_end_of_lane: 7.0 # [m]
8-
backward_length_buffer_for_blocking_object: 0.5 # [m]
9-
lane_change_finish_judge_buffer: 0.0 # [m]
7+
backward_length_buffer_for_end_of_lane: 3.0 # [m]
8+
backward_length_buffer_for_blocking_object: 3.0 # [m]
109

1110
lane_changing_lateral_jerk: 0.3 # [m/s3]
1211

@@ -27,34 +26,47 @@
2726
min_longitudinal_acc: -0.5
2827
max_longitudinal_acc: 0.2
2928

29+
skip_process:
30+
longitudinal_distance_diff_threshold:
31+
prepare: 1.0
32+
lane_changing: 1.0
33+
3034
# safety check
3135
safety_check:
3236
allow_loose_check_for_cancel: true
3337
collision_check_yaw_diff_threshold: 3.1416
3438
execution:
3539
expected_front_deceleration: -1.0
36-
expected_rear_deceleration: -1.0
37-
rear_vehicle_reaction_time: 2.0
38-
rear_vehicle_safety_time_margin: 1.0
40+
expected_rear_deceleration: -1.5
41+
rear_vehicle_reaction_time: 2.5
42+
rear_vehicle_safety_time_margin: 0.8
3943
lateral_distance_max_threshold: 2.0
40-
longitudinal_distance_min_threshold: 3.0
41-
longitudinal_velocity_delta_time: 0.8
44+
longitudinal_distance_min_threshold: 6.0
45+
longitudinal_velocity_delta_time: 0.0
46+
parked:
47+
expected_front_deceleration: -1.0
48+
expected_rear_deceleration: -2.0
49+
rear_vehicle_reaction_time: 1.0
50+
rear_vehicle_safety_time_margin: 0.8
51+
lateral_distance_max_threshold: 1.0
52+
longitudinal_distance_min_threshold: 6.0
53+
longitudinal_velocity_delta_time: 0.0
4254
cancel:
4355
expected_front_deceleration: -1.0
4456
expected_rear_deceleration: -2.5
4557
rear_vehicle_reaction_time: 1.0
4658
rear_vehicle_safety_time_margin: 0.5
4759
lateral_distance_max_threshold: 0.75
4860
longitudinal_distance_min_threshold: 2.0
49-
longitudinal_velocity_delta_time: 0.3
61+
longitudinal_velocity_delta_time: 0.0
5062
stuck:
5163
expected_front_deceleration: -1.0
52-
expected_rear_deceleration: -2.0
53-
rear_vehicle_reaction_time: 1.5
54-
rear_vehicle_safety_time_margin: 0.8
55-
lateral_distance_max_threshold: 1.0
56-
longitudinal_distance_min_threshold: 2.5
57-
longitudinal_velocity_delta_time: 0.6
64+
expected_rear_deceleration: -1.0
65+
rear_vehicle_reaction_time: 2.0
66+
rear_vehicle_safety_time_margin: 1.0
67+
lateral_distance_max_threshold: 2.0
68+
longitudinal_distance_min_threshold: 6.0
69+
longitudinal_velocity_delta_time: 0.0
5870

5971
# lane expansion for object filtering
6072
lane_expansion:
@@ -109,7 +121,9 @@
109121
overhang_tolerance: 0.0 # [m]
110122
unsafe_hysteresis_threshold: 5 # [/]
111123

112-
finish_judge_lateral_threshold: 0.2 # [m]
124+
lane_change_finish_judge_buffer: 2.0 # [m]
125+
finish_judge_lateral_threshold: 0.1 # [m]
126+
finish_judge_lateral_angle_deviation: 1.0 # [deg]
113127

114128
# debug
115129
publish_debug_marker: true

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,15 @@
7070
collision_start_margin_time: 2.0
7171
collision_end_margin_time: 0.0
7272
partially_prioritized:
73-
collision_start_margin_time: 4.0
74-
collision_end_margin_time: 6.0
73+
collision_start_margin_time: 3.0
74+
collision_end_margin_time: 2.0
7575
not_prioritized:
76-
collision_start_margin_time: 4.0 # [s] this + state_transit_margin_time should be higher to account for collision with fast/accelerating object
77-
collision_end_margin_time: 6.0 # [s] this + state_transit_margin_time should be higher to account for collision with slow/decelerating object
76+
collision_start_margin_time: 3.0
77+
collision_end_margin_time: 2.0
7878
yield_on_green_traffic_light:
7979
distance_to_assigned_lanelet_start: 10.0
8080
duration: 8.0
81-
object_dist_to_stopline: 10.0 # [m]
81+
object_dist_to_stopline: 10.0
8282
ignore_on_amber_traffic_light:
8383
object_expected_deceleration:
8484
car: 2.0

autoware_launch/config/system/mrm_comfortable_stop_operator/mrm_comfortable_stop_operator.param.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
ros__parameters:
33
update_rate: 10
44
min_acceleration: -1.0
5-
max_jerk: 0.6
6-
min_jerk: -0.6
5+
max_jerk: 0.3
6+
min_jerk: -0.3

autoware_launch/config/system/system_diagnostic_monitor/autoware-main.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ files:
66
- { path: $(dirname)/perception.yaml }
77
- { path: $(dirname)/planning.yaml }
88
- { path: $(dirname)/others.yaml }
9-
# - { path: $(dirname)/sensing.yaml }
9+
- { path: $(dirname)/sensing.yaml }
1010
- { path: $(dirname)/system.yaml }
1111
- { path: $(dirname)/vehicle.yaml }
1212

autoware_launch/config/system/system_diagnostic_monitor/control.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ units:
2727
- { type: link, link: /control/004-lane_departure-error }
2828
- { type: link, link: /control/005-trajectory_deviation-error }
2929
# - { type: link, link: /control/009-aeb_emergency_stop }
30-
- { type: link, link: /control/010-max_distance_deviation-error }
30+
# - { type: link, link: /control/010-max_distance_deviation-error }
3131
- { type: link, link: /control/011-slip_detection }
3232

3333
- path: /control/comfortable_stop

autoware_launch/config/system/system_diagnostic_monitor/others.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ units:
2525
list:
2626
#- { type: link, link: /others/002-blockage_validation-error }
2727
- { type: link, link: /others/004-concat_status }
28-
- { type: link, link: /others/005-visibility_validation-error }
29-
- { type: link, link: /others/012-vehicle_stuck_checker }
28+
# - { type: link, link: /others/005-visibility_validation-error }
29+
# - { type: link, link: /others/012-vehicle_stuck_checker }
3030

3131
- path: /others/comfortable_stop
3232
type: and

autoware_launch/config/system/system_diagnostic_monitor/planning.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ units:
3535
- { type: link, link: /planning/010-trajectory_steering_validation-error }
3636
- { type: link, link: /planning/011-trajectory_steering_rate_validation-error }
3737
- { type: link, link: /planning/012-trajectory_velocity_deviation_validation-error }
38-
- { type: link, link: /planning/013-collision_checker-error }
38+
# - { type: link, link: /planning/013-collision_checker-error }
3939

4040
- path: /planning/comfortable_stop
4141
type: and

0 commit comments

Comments
 (0)