Skip to content

Commit dbddacb

Browse files
Merge pull request #914 from tier4/beta-to-tier4-main-sync
chore: sync beta branch beta/v0.47 with tier4/main
2 parents 32a57a7 + 48e9694 commit dbddacb

File tree

28 files changed

+4607
-5245
lines changed

28 files changed

+4607
-5245
lines changed

autoware_launch/config/perception/object_recognition/detection/clustering/voxel_grid_based_euclidean_cluster.param.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@
44
voxel_leaf_size: 0.3
55
min_points_number_per_voxel: 1
66
min_cluster_size: 10
7-
max_cluster_size: 3000
7+
max_cluster_size: 3000 # this is the maximum number of voxels when clustered
8+
max_voxel_cluster_for_output: 800 # Maximum number of voxels in a cluster when outputted
9+
min_voxel_cluster_size_for_filtering: 65 # Clusters below this number of voxels are exempt from per-voxel filtering
10+
max_points_per_voxel_in_large_cluster: 10 # Max points allowed per voxel in a large cluster
811
use_height: false
912
input_frame: "base_link"
1013

autoware_launch/config/perception/object_recognition/detection/detected_object_validation/object_lanelet_filter.param.yaml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,20 @@
1212

1313
filter_settings:
1414
# polygon overlap based filter
15-
polygon_overlap_filter:
16-
enabled: true
15+
lanelet_xy_overlap_filter:
16+
enabled: true
17+
1718
# velocity direction based filter
1819
lanelet_direction_filter:
1920
enabled: false
2021
velocity_yaw_threshold: 0.785398 # [rad] (45 deg)
2122
object_speed_threshold: 3.0 # [m/s]
22-
debug: false
23+
24+
# object's elevation from lanelet based filter
25+
lanelet_object_elevation_filter:
26+
enabled: false
27+
max_elevation_threshold: 5.0 # [m] from a lanelet's surface
28+
min_elevation_threshold: 0.0 # [m] from a lanelet's surface
29+
2330
lanelet_extra_margin: 0.0
24-
use_height_threshold: false
25-
max_height_threshold: 10.0 # [m] from the base_link height in map frame
26-
min_height_threshold: -1.0 # [m] from the base_link height in map frame
31+
debug: false

autoware_launch/config/perception/object_recognition/detection/irregular_object_detection/irregular_object_detector.param.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
detection_range_z_max: 3.2
2626
elevation_grid_mode: true
2727
use_recheck_ground_cluster: true
28+
recheck_start_distance: 20.0
2829
use_lowest_point: false
2930
low_priority_region_x: -20.0
3031
center_pcl_shift: 0.0
@@ -35,7 +36,9 @@
3536
roi_pointcloud_fusion:
3637
parameters:
3738
fuse_unknown_only: true
39+
override_class_with_unknown: false
3840
min_cluster_size: 2
3941
max_cluster_size: 100
4042
cluster_2d_tolerance: 0.5
4143
roi_scale_factor: 2.0
44+
max_object_size: 2.0

autoware_launch/config/perception/object_recognition/detection/object_filter/object_lanelet_filter.param.yaml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,20 @@
1212

1313
filter_settings:
1414
# polygon overlap based filter
15-
polygon_overlap_filter:
15+
lanelet_xy_overlap_filter:
1616
enabled: true
17+
1718
# velocity direction based filter
1819
lanelet_direction_filter:
1920
enabled: false
2021
velocity_yaw_threshold: 0.785398 # [rad] (45 deg)
2122
object_speed_threshold: 3.0 # [m/s]
22-
debug: false
23+
24+
# object's elevation from lanelet based filter
25+
lanelet_object_elevation_filter:
26+
enabled: false
27+
max_elevation_threshold: 5.0 # [m] from a lanelet's surface
28+
min_elevation_threshold: 0.0 # [m] from a lanelet's surface
29+
2330
lanelet_extra_margin: 0.0
24-
use_height_threshold: false
25-
max_height_threshold: 10.0 # [m] from the base_link height in map frame
26-
min_height_threshold: -1.0 # [m] from the base_link height in map frame
31+
debug: false

autoware_launch/config/perception/object_recognition/detection/object_filter/radar_lanelet_filter.param.yaml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,20 @@
1212

1313
filter_settings:
1414
# polygon overlap based filter
15-
polygon_overlap_filter:
15+
lanelet_xy_overlap_filter:
1616
enabled: true
17+
1718
# velocity direction based filter
1819
lanelet_direction_filter:
1920
enabled: false
2021
velocity_yaw_threshold: 0.785398 # [rad] (45 deg)
2122
object_speed_threshold: 3.0 # [m/s]
22-
debug: false
23+
24+
# object's elevation from lanelet based filter
25+
lanelet_object_elevation_filter:
26+
enabled: false
27+
max_elevation_threshold: 5.0 # [m] from a lanelet's surface
28+
min_elevation_threshold: 0.0 # [m] from a lanelet's surface
29+
2330
lanelet_extra_margin: 0.0
24-
use_height_threshold: false
25-
max_height_threshold: 10.0 # [m] from the base_link height in map frame
26-
min_height_threshold: -1.0 # [m] from the base_link height in map frame
31+
debug: false

autoware_launch/config/perception/obstacle_segmentation/ground_segmentation/ground_segmentation.param.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,12 @@
2323
split_height_distance: 0.2
2424
non_ground_height_threshold: 0.20
2525
grid_size_m: 0.5
26-
grid_mode_switch_radius: 20.0
26+
grid_mode_switch_radius: 150.0
2727
gnd_grid_buffer_size: 4
2828
detection_range_z_max: 2.5
2929
elevation_grid_mode: true
3030
use_recheck_ground_cluster: true
31+
recheck_start_distance: 20.0
3132
use_lowest_point: true
3233
low_priority_region_x: -20.0
3334
center_pcl_shift: 0.0

autoware_launch/config/planning/preset/default_preset.yaml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ launch:
3939
- arg:
4040
name: launch_side_shift_module
4141
default: "true"
42+
- arg:
43+
name: launch_bidirectional_traffic_module
44+
default: "true"
4245

4346
# behavior velocity modules
4447
- arg:
@@ -121,13 +124,6 @@ launch:
121124
name: launch_mvp_run_out_module
122125
default: "false"
123126

124-
- arg:
125-
name: motion_stop_planner_type
126-
default: none
127-
# option: obstacle_stop_planner
128-
# obstacle_cruise_planner
129-
# none
130-
131127
- arg:
132128
name: velocity_smoother_type
133129
default: JerkFiltered
@@ -144,3 +140,11 @@ launch:
144140
- arg:
145141
name: launch_parking_module
146142
default: "true"
143+
144+
# validator modules
145+
- arg:
146+
name: launch_latency_checker
147+
default: "true"
148+
- arg:
149+
name: launch_trajectory_checker
150+
default: "true"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
/**:
2+
ros__parameters:
3+
update_rate: 10 # Hz
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
/**:
2+
ros__parameters:
3+
latency_checker:
4+
enable: true
5+
threshold: 1.0
6+
is_critical: false
Lines changed: 1 addition & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/**:
22
ros__parameters:
3+
planning_hz: 10.0
34
# Operation option when invalid trajectory is detected
45
# 0: publish the trajectory even if it is invalid
56
# 1: stop publishing the trajectory
@@ -20,57 +21,3 @@
2021
enable_soft_stop_on_prev_traj: true
2122
soft_stop_deceleration: -1.0 # [m/s^2]
2223
soft_stop_jerk_lim: 0.3 # [m/s^3]
23-
24-
validity_checks:
25-
latency:
26-
enable: true
27-
threshold: 1.0
28-
is_critical: false
29-
interval:
30-
enable: true
31-
threshold: 100.0
32-
is_critical: false
33-
curvature:
34-
enable: true
35-
threshold: 1.0
36-
is_critical: false
37-
relative_angle:
38-
enable: true
39-
threshold: 2.0 # (= 115 degree)
40-
is_critical: false
41-
acceleration:
42-
enable: true
43-
lateral_th: 9.8
44-
longitudinal_max_th: 9.8
45-
longitudinal_min_th: -9.8
46-
is_critical: false
47-
lateral_jerk:
48-
enable: true
49-
threshold: 7.0
50-
is_critical: false
51-
steering:
52-
enable: true
53-
threshold: 1.414
54-
is_critical: false
55-
steering_rate:
56-
enable: true
57-
threshold: 10.0
58-
is_critical: false
59-
deviation:
60-
enable: true
61-
velocity_th: 100.0
62-
distance_th: 100.0
63-
lon_distance_th: 1.0
64-
yaw_th: 1.5708 # (= 90 degrees)
65-
is_critical: false
66-
forward_trajectory_length:
67-
enable: true
68-
acceleration: -3.0
69-
margin: 2.0
70-
is_critical: false
71-
trajectory_shift:
72-
enable: true
73-
lat_shift_th: 0.5
74-
forward_shift_th: 1.0
75-
backward_shift_th: 0.1
76-
is_critical: true
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
/**:
2+
ros__parameters:
3+
trajectory_checker:
4+
interval:
5+
enable: true
6+
threshold: 100.0
7+
is_critical: false
8+
curvature:
9+
enable: true
10+
threshold: 1.0
11+
is_critical: false
12+
relative_angle:
13+
enable: true
14+
threshold: 2.0 # (= 115 degree)
15+
is_critical: false
16+
lateral_accel:
17+
enable: true
18+
threshold: 9.8
19+
is_critical: false
20+
min_lon_accel:
21+
enable: true
22+
threshold: -9.8
23+
is_critical: false
24+
max_lon_accel:
25+
enable: true
26+
threshold: 9.8
27+
is_critical: false
28+
lateral_jerk:
29+
enable: true
30+
threshold: 7.0
31+
is_critical: false
32+
steering:
33+
enable: true
34+
threshold: 1.414
35+
is_critical: false
36+
steering_rate:
37+
enable: true
38+
threshold: 10.0
39+
is_critical: false
40+
distance_deviation:
41+
enable: true
42+
threshold: 100.0
43+
is_critical: false
44+
lon_distance_deviation:
45+
enable: true
46+
threshold: 1.0
47+
is_critical: false
48+
velocity_deviation:
49+
enable: true
50+
threshold: 100.0
51+
is_critical: false
52+
yaw_deviation:
53+
enable: true
54+
threshold: 1.5708 # (= 90 degrees)
55+
is_critical: false
56+
forward_trajectory_length:
57+
enable: true
58+
acceleration: -3.0
59+
margin: 2.0
60+
is_critical: false
61+
trajectory_shift:
62+
enable: true
63+
lat_shift_th: 0.5
64+
forward_shift_th: 1.0
65+
backward_shift_th: 0.1
66+
is_critical: true
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
/**:
2+
ros__parameters:
3+
bidirectional_traffic:
4+
time_to_prepare_pull_over: 1.0
5+
min_distance_from_roadside: 0.2
6+
keep_left_distance_from_center_line: 0.5
7+
shift_distance_to_pull_over_from_center_line: 1.6
8+
wait_time_for_oncoming_car: 15.0
9+
max_lateral_jerk: 3.0
10+
min_lateral_jerk: 2.0

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
# detection range
153153
object_check_forward_distance: 100.0
154154
object_check_backward_distance: 100.0
155-
ignore_object_velocity_threshold: 1.0
155+
ignore_object_velocity_threshold: 0.25
156156
# ObjectTypesToCheck
157157
object_types_to_check:
158158
check_car: true

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
- "lane_change_right"
2121
- "external_request_lane_change_left"
2222
- "external_request_lane_change_right"
23+
- "bidirectional_traffic"
2324
slot3:
2425
- "goal_planner"
2526
slot4:
@@ -80,3 +81,8 @@
8081
enable_rtc: false
8182
enable_simultaneous_execution_as_approved_module: false
8283
enable_simultaneous_execution_as_candidate_module: false
84+
85+
bidirectional_traffic:
86+
enable_rtc: false
87+
enable_simultaneous_execution_as_approved_module: true
88+
enable_simultaneous_execution_as_candidate_module: true

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
# detection range
117117
object_check_forward_distance: 10.0
118118
object_check_backward_distance: 100.0
119-
ignore_object_velocity_threshold: 1.0
119+
ignore_object_velocity_threshold: 0.25
120120
# ObjectTypesToCheck
121121
object_types_to_check:
122122
check_car: true

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,3 +93,12 @@
9393
custom_labels: ["PEDESTRIAN"] # labels for which to define a non-default velocity threshold (see autoware_auto_perception_msgs::msg::ObjectClassification for all the labels)
9494
custom_thresholds: [0.0] # velocities of the custom labels
9595
extra_predicted_objects_size: 0.5 # [m] extra size added to the objects for masking the occlusions
96+
97+
# param for parked vehicles stop
98+
parked_vehicles_stop:
99+
enable: false # if true, ego will stop if there are parked vehicles before the crosswalk
100+
search_distance: 5.0 # [m] distance ahead of the crosswalk where to search for parked vehicles
101+
min_ego_stop_duration: 1.0 # [s] minimum duration ego should stop before it can continue
102+
vehicle_permanence_duration: 0.5 # [s] if an object disappears or is no longer classified as parked vehicle, its last state is still used for this duration
103+
ego_inside_safe_area_margin: 0.3 # [m] margin used to consider if ego is inside the search area. Should be higher than the expected longitudinal error when stopping.
104+
parked_velocity_threshold: 0.5 # [m/s] vehicle are considered to be parked if their velocity is less or equal this threshold

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,11 @@
109109
creep_velocity_without_traffic_light: 1.388
110110
static_occlusion_with_traffic_light_timeout: 0.5
111111

112+
conservative_merging:
113+
enable_yield: false
114+
minimum_lateral_distance_threshold: 0.2
115+
merging_judge_angle_threshold: 0.785
116+
112117
debug:
113118
ttc: [0]
114119

autoware_launch/config/planning/scenario_planning/lane_driving/motion_planning/motion_velocity_planner/obstacle_stop.param.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,14 @@
1010
terminal_stop_margin : 3.0 # Stop margin at the goal. This value cannot exceed stop margin. [m]
1111
min_behavior_stop_margin: 3.0 # [m]
1212

13+
max_negative_velocity: -0.1 # [m/s] maximum velocity of opposing traffic to consider stop planning
14+
stop_margin_opposing_traffic: 10.0 # Ideal stop-margin from moving opposing obstacle when ego comes to a stop
15+
effective_deceleration_opposing_traffic: 4.0 # Setting a higher value brings the final stop-margin closer to the ideal value above
16+
17+
min_on_duration: 0.3 # [s] minimum duration needed before a decision can be triggered
18+
min_off_duration: 1.0 # [s] minimum duration needed before a decision can be canceled
19+
update_distance_th: 0.5 # [m] minimum distance threshold to update stop point
20+
1321
hold_stop_velocity_threshold: 0.01 # The maximum ego velocity to hold stopping [m/s]
1422
hold_stop_distance_threshold: 0.3 # The ego keeps stopping if the distance to stop changes within the threshold [m]
1523

@@ -80,3 +88,4 @@
8088

8189
crossing_obstacle:
8290
collision_time_margin : 1.0 # time threshold of collision between obstacle adn ego for cruise or stop [s]
91+
traj_angle_threshold: 0.523599 # [rad] = 70 [deg], yaw threshold of crossing obstacle against the nearest trajectory point for cruise or stop

0 commit comments

Comments
 (0)