Skip to content

Commit 85a67d4

Browse files
Merge pull request autowarefoundation#842 from tier4/sync-tier4-upstream
chore: sync upstream
2 parents dc2183a + 655763a commit 85a67d4

File tree

11 files changed

+192
-164
lines changed

11 files changed

+192
-164
lines changed

autoware_launch/config/perception/object_recognition/detection/lidar_model/centerpoint.param.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
iou_nms_threshold: 0.1
1616
yaw_norm_thresholds: [0.3, 0.3, 0.3, 0.3, 0.0]
1717
score_threshold: 0.35
18+
has_variance: false
1819
has_twist: false
1920
trt_precision: fp16
2021
densification_num_past_frames: 1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/**:
2+
ros__parameters:
3+
class_names: ["CAR", "TRUCK", "BUS", "BICYCLE", "PEDESTRIAN"]
4+
point_feature_size: 4
5+
max_voxel_size: 40000
6+
point_cloud_range: [-76.8, -76.8, -4.0, 76.8, 76.8, 6.0]
7+
voxel_size: [0.32, 0.32, 10.0]
8+
downsample_factor: 1
9+
encoder_in_feature_size: 9
10+
# post-process params
11+
circle_nms_dist_threshold: 0.5
12+
iou_nms_target_class_names: ["CAR"]
13+
iou_nms_search_distance_2d: 10.0
14+
iou_nms_threshold: 0.1
15+
yaw_norm_thresholds: [0.3, 0.3, 0.3, 0.3, 0.0]
16+
score_threshold: 0.35
17+
has_variance: true
18+
has_twist: true
19+
trt_precision: fp16
20+
densification_num_past_frames: 1
21+
densification_world_frame_id: map
22+
23+
# weight files
24+
encoder_onnx_path: "$(var model_path)/pts_voxel_encoder_$(var model_name).onnx"
25+
encoder_engine_path: "$(var model_path)/pts_voxel_encoder_$(var model_name).engine"
26+
head_onnx_path: "$(var model_path)/pts_backbone_neck_head_$(var model_name).onnx"
27+
head_engine_path: "$(var model_path)/pts_backbone_neck_head_$(var model_name).engine"

autoware_launch/config/perception/object_recognition/detection/lidar_model/centerpoint_tiny.param.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
iou_nms_threshold: 0.1
1515
yaw_norm_thresholds: [0.3, 0.3, 0.3, 0.3, 0.0]
1616
score_threshold: 0.35
17+
has_variance: false
1718
has_twist: false
1819
trt_precision: fp16
1920
densification_num_past_frames: 1

autoware_launch/config/perception/object_recognition/detection/lidar_model/pointpainting.param.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
downsample_factor: 1
1717
encoder_in_feature_size: 12
1818
yaw_norm_thresholds: [0.3, 0.3, 0.3, 0.3, 0.0]
19+
has_variance: false
1920
has_twist: false
2021
densification_params:
2122
world_frame_id: "map"

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

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
detection_range_z_max: 2.5
3131
elevation_grid_mode: true
3232
use_recheck_ground_cluster: true
33+
use_lowest_point: true
3334
low_priority_region_x: -20.0
3435
center_pcl_shift: 0.0
3536
radial_divider_angle_deg: 1.0

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

+139-144
Large diffs are not rendered by default.

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

+16-16
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
target_object:
99
car:
1010
execute_num: 2 # [-]
11-
moving_speed_threshold: 1.0 # [m/s]
12-
moving_time_threshold: 1.0 # [s]
11+
th_moving_speed: 1.0 # [m/s]
12+
th_moving_time: 1.0 # [s]
1313
max_expand_ratio: 0.0 # [-]
1414
envelope_buffer_margin: 0.3 # [m]
1515
lateral_margin:
@@ -18,8 +18,8 @@
1818
hard_margin_for_parked_vehicle: 0.0 # [m]
1919
truck:
2020
execute_num: 2
21-
moving_speed_threshold: 1.0 # 3.6km/h
22-
moving_time_threshold: 1.0
21+
th_moving_speed: 1.0 # 3.6km/h
22+
th_moving_time: 1.0
2323
max_expand_ratio: 0.0
2424
envelope_buffer_margin: 0.3
2525
lateral_margin:
@@ -28,8 +28,8 @@
2828
hard_margin_for_parked_vehicle: 0.0 # [m]
2929
bus:
3030
execute_num: 2
31-
moving_speed_threshold: 1.0 # 3.6km/h
32-
moving_time_threshold: 1.0
31+
th_moving_speed: 1.0 # 3.6km/h
32+
th_moving_time: 1.0
3333
max_expand_ratio: 0.0
3434
envelope_buffer_margin: 0.3
3535
lateral_margin:
@@ -38,8 +38,8 @@
3838
hard_margin_for_parked_vehicle: 0.0 # [m]
3939
trailer:
4040
execute_num: 2
41-
moving_speed_threshold: 1.0 # 3.6km/h
42-
moving_time_threshold: 1.0
41+
th_moving_speed: 1.0 # 3.6km/h
42+
th_moving_time: 1.0
4343
max_expand_ratio: 0.0
4444
envelope_buffer_margin: 0.3
4545
lateral_margin:
@@ -49,8 +49,8 @@
4949
unknown:
5050
is_target: false
5151
execute_num: 1
52-
moving_speed_threshold: 0.28 # 1.0km/h
53-
moving_time_threshold: 1.0
52+
th_moving_speed: 0.28 # 1.0km/h
53+
th_moving_time: 1.0
5454
max_expand_ratio: 0.0
5555
envelope_buffer_margin: 0.3
5656
lateral_margin:
@@ -59,8 +59,8 @@
5959
hard_margin_for_parked_vehicle: 0.0 # [m]
6060
bicycle:
6161
execute_num: 2
62-
moving_speed_threshold: 0.28 # 1.0km/h
63-
moving_time_threshold: 1.0
62+
th_moving_speed: 0.28 # 1.0km/h
63+
th_moving_time: 1.0
6464
max_expand_ratio: 0.0
6565
envelope_buffer_margin: 0.8
6666
lateral_margin:
@@ -69,8 +69,8 @@
6969
hard_margin_for_parked_vehicle: 1.0 # [m]
7070
motorcycle:
7171
execute_num: 2
72-
moving_speed_threshold: 1.0 # 3.6km/h
73-
moving_time_threshold: 1.0
72+
th_moving_speed: 1.0 # 3.6km/h
73+
th_moving_time: 1.0
7474
max_expand_ratio: 0.0
7575
envelope_buffer_margin: 0.8
7676
lateral_margin:
@@ -79,8 +79,8 @@
7979
hard_margin_for_parked_vehicle: 1.0 # [m]
8080
pedestrian:
8181
execute_num: 2
82-
moving_speed_threshold: 0.28 # 1.0km/h
83-
moving_time_threshold: 1.0
82+
th_moving_speed: 0.28 # 1.0km/h
83+
th_moving_time: 1.0
8484
max_expand_ratio: 0.0
8585
envelope_buffer_margin: 0.8
8686
lateral_margin:

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

+4-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,10 @@
7878
pedestrian: true
7979

8080
# collision check
81-
enable_prepare_segment_collision_check: false
81+
enable_collision_check_for_prepare_phase:
82+
general_lanes: false
83+
intersection: true
84+
turns: true
8285
prepare_segment_ignore_object_velocity_thresh: 0.1 # [m/s]
8386
check_objects_on_current_lanes: false
8487
check_objects_on_other_lanes: false

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
creep_velocity: 0.8333
102102
peeking_offset: -0.5
103103
occlusion_required_clearance_distance: 55.0
104-
possible_object_bbox: [1.5, 2.5]
104+
possible_object_bbox: [1.75, 2.5]
105105
ignore_parked_vehicle_speed_threshold: 0.8333
106106
occlusion_detection_hold_time: 1.5
107107
temporal_stop_time_before_peeking: 0.1

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

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
ego_cut_line_length: 3.0 # The width of the ego's cut line
1818
ego_footprint_extra_margin: 0.5 # [m] expand the ego vehicles' footprint by this value on all sides when building the ego footprint path
1919
keep_obstacle_on_path_time_threshold: 1.0 # [s] How much time a previous run out target obstacle is kept in the run out candidate list if it enters the ego path.
20+
keep_stop_point_time: 1.0 # [s] If a stop point is issued by this module, keep the stop point for this many seconds. Only works if approach is disabled
2021

2122
# Parameter to create abstracted dynamic obstacles
2223
dynamic_obstacle:

autoware_launch/launch/components/tier4_control_component.launch.xml

-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@
3333
<arg name="nearest_search_param_path" value="$(find-pkg-share autoware_launch)/config/control/common/nearest_search.param.yaml"/>
3434

3535
<!-- package param path -->
36-
<arg name="lat_controller_param_path" value="$(var lat_controller_param_path)"/>
37-
<arg name="lon_controller_param_path" value="$(var lon_controller_param_path)"/>
3836
<arg name="vehicle_cmd_gate_param_path" value="$(find-pkg-share autoware_launch)/config/control/vehicle_cmd_gate/vehicle_cmd_gate.param.yaml"/>
3937
<arg name="lane_departure_checker_param_path" value="$(find-pkg-share autoware_launch)/config/control/lane_departure_checker/lane_departure_checker.param.yaml"/>
4038
<arg name="control_validator_param_path" value="$(find-pkg-share autoware_launch)/config/control/control_validator/control_validator.param.yaml"/>

0 commit comments

Comments
 (0)