Skip to content

Commit 8c52fd2

Browse files
committed
Rebase all x2 changes to tier4/main
fix parameter namespace remove old parameter file remove old style parameter file remove unused parameter remove duplicated parameter remove old style parameter remove old style parameter pick new style parameter remove duplicated parameter remove unnecessary parameter remove old parameter Revert "feat: sp tuning for low obstacle (#578)" This reverts commit f00363f. Revert "chore(ground_segmentation): reduce ground_segmentation range (#649)" This reverts commit 3aacc89. fix ekf parameter remove temporary parameter disable pull over of mrm change initial_selector_mode to local reset analytical smoother parameter remove hazard lights selector remove l4toolkit enable stuck vehicle detection in left turn chore diagnostic_graph_aggregator params fix module name chore x2_preset.yaml fix(static_obstacle_avoidance): parameter tuning Signed-off-by: satoshi-ota <[email protected]> fix(slow_down): parameter tuning Signed-off-by: satoshi-ota <[email protected]> fix typo remove duplicated parameter remove old node revert common planning param for safety reason. use mrm_handler as default relax emergency stop acceleration for safety reason modify rviz setting remove l4toolkit from simulation fix lane change priority fix behavior velocity planner parameter make same mpt param as main update mlmodel parameter style fix old parameter name
1 parent 000c7b4 commit 8c52fd2

File tree

37 files changed

+137
-746
lines changed

37 files changed

+137
-746
lines changed

autoware_launch/config/control/control_validator/control_validator.param.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,3 @@
1010

1111
thresholds:
1212
max_distance_deviation: 1.0
13-
min_velocity_for_checking: 1.0 # m/s
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
/**:
22
ros__parameters:
33
update_rate: 10.0
4-
initial_selector_mode: "remote" # ["local", "remote"]
4+
initial_selector_mode: "local" # ["local", "remote"]

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,8 @@
7171

7272
# slope compensation
7373
# pitch
74-
use_trajectory_for_pitch_calculation: true
7574
lpf_pitch_gain: 0.95
76-
slope_source: "raw_pitch" # raw_pitch, trajectory_pitch or trajectory_adaptive
75+
slope_source: "trajectory_pitch" # raw_pitch, trajectory_pitch or trajectory_adaptive
7776
adaptive_trajectory_velocity_th: 1.0
7877
max_pitch_rad: 0.1
7978
min_pitch_rad: -0.1

autoware_launch/config/localization/ekf_localizer.param.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
/**:
22
ros__parameters:
3-
show_debug_info: false
4-
enable_yaw_bias_estimation: false
5-
predict_frequency: 50.0
6-
tf_rate: 50.0
7-
extend_state_step: 50
3+
node:
4+
show_debug_info: false
5+
enable_yaw_bias_estimation: false
6+
predict_frequency: 50.0
7+
tf_rate: 50.0
8+
publish_tf: true
9+
extend_state_step: 50
810

911
pose_measurement:
1012
# for Pose measurement
@@ -40,7 +42,5 @@
4042

4143
misc:
4244
# for velocity measurement limitation (Set 0.0 if you want to ignore)
43-
threshold_observable_velocity_mps: 0.0 # [m/s]
45+
threshold_observable_velocity_mps: 0.5 # [m/s]
4446
pose_frame_id: "map"
45-
# for velocity measurement limitation (Set 0.0 if you want to ignore)
46-
threshold_observable_velocity_mps: 0.5 # [m/s]

autoware_launch/config/localization/ndt_scan_matcher.param.yaml

Lines changed: 0 additions & 84 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
tolerance: 0.7
44
voxel_leaf_size: 0.3
55
min_points_number_per_voxel: 1
6-
min_cluster_size: 3
6+
min_cluster_size: 10
77
max_cluster_size: 3000
88
use_height: false
99
input_frame: "base_link"
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
/**:
2+
ros__parameters:
3+
4+
# weight files
5+
encoder_onnx_path: "$(var model_path)/pts_voxel_encoder_$(var model_name).onnx"
6+
encoder_engine_path: "$(var model_path)/pts_voxel_encoder_$(var model_name).engine"
7+
head_onnx_path: "$(var model_path)/pts_backbone_neck_head_$(var model_name).onnx"
8+
head_engine_path: "$(var model_path)/pts_backbone_neck_head_$(var model_name).engine"
9+
trt_precision: fp16
10+
post_process_params:
11+
# post-process params
12+
circle_nms_dist_threshold: 0.5
13+
iou_nms_target_class_names: ["CAR"]
14+
iou_nms_search_distance_2d: 10.0
15+
iou_nms_threshold: 0.1
16+
yaw_norm_thresholds: [0.3, 0.3, 0.3, 0.3, 0.0]
17+
score_threshold: 0.35
18+
densification_params:
19+
world_frame_id: map
20+
num_past_frames: 1

autoware_launch/config/perception/object_recognition/detection/pointcloud_filter/pointcloud_map_filter.param.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
ros__parameters:
33

44
# voxel size for downsample filter
5-
down_sample_voxel_size: 0.05
5+
down_sample_voxel_size: 0.1
66

77
# distance threshold for compare compare
88
distance_threshold: 0.5
99

1010
# ratio to reduce voxel_leaf_size and neighbor points distance threshold in z axis
11-
downsize_ratio_z_axis: 0.3
11+
downsize_ratio_z_axis: 0.6
1212

1313
# publish voxelized map pointcloud for debug
1414
publish_debug_pcd: False

autoware_launch/config/perception/object_recognition/tracking/multi_object_tracker/data_association_matrix.param.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656

5757
min_iou_matrix: # If value is negative, it will be ignored.
5858
#UNKNOWN, CAR, TRUCK, BUS, TRAILER, MOTORBIKE, BICYCLE, PEDESTRIAN
59-
[0.0, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, #UNKNOWN
59+
[0.0001, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, #UNKNOWN
6060
0.1, 0.1, 0.2, 0.2, 0.2, 0.1, 0.1, 0.1, #CAR
6161
0.1, 0.2, 0.3, 0.3, 0.3, 0.1, 0.1, 0.1, #TRUCK
6262
0.1, 0.2, 0.3, 0.3, 0.3, 0.1, 0.1, 0.1, #BUS

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

Lines changed: 18 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
/**:
22
ros__parameters:
3-
additional_lidars: ["front_lower"]
3+
additional_lidars: []
44
ransac_input_topics: []
55
use_single_frame_filter: False
66
use_time_series_filter: True
77

88
common_crop_box_filter:
99
parameters:
1010
min_x: -70.0
11-
max_x: 100.0
11+
max_x: 120.0
1212
min_y: -75.0
1313
max_y: 75.0
14-
max_z: 3.2
15-
min_z: -2.5 # recommended 0.0 for non elevation_grid_mode
14+
margin_max_z: 3.2
15+
margin_min_z: -2.5 # recommended 0.0 for non elevation_grid_mode
1616
negative: False
1717

1818
common_ground_filter:
1919
plugin: "ground_segmentation::ScanGroundFilterComponent"
2020
parameters:
2121
global_slope_max_angle_deg: 10.0
2222
local_slope_max_angle_deg: 25.0 # recommended 30.0 for non elevation_grid_mode
23-
split_points_distance_tolerance: 0.15
23+
split_points_distance_tolerance: 0.2
2424
use_virtual_ground_point: True
2525
split_height_distance: 0.2
26-
non_ground_height_threshold: 0.12
26+
non_ground_height_threshold: 0.20
2727
grid_size_m: 0.2
2828
grid_mode_switch_radius: 20.0
2929
gnd_grid_buffer_size: 5
@@ -44,12 +44,12 @@
4444

4545
front_upper_crop_box_filter:
4646
parameters:
47-
min_x: 5.8
47+
min_x: -50.0
4848
max_x: 100.0
4949
min_y: -50.0
5050
max_y: 50.0
51-
max_z: 3.2 # recommended 2.5 for non elevation_grid_mode
52-
min_z: -2.5 # recommended 0.0 for non elevation_grid_mode
51+
margin_max_z: 3.2 # recommended 2.5 for non elevation_grid_mode
52+
margin_min_z: -2.5 # recommended 0.0 for non elevation_grid_mode
5353
negative: False
5454

5555
front_upper_ground_filter:
@@ -58,7 +58,7 @@
5858
global_slope_max_angle_deg: 10.0
5959
local_slope_max_angle_deg: 18.0 # recommended 30.0 for non elevation_grid_mode
6060
split_points_distance_tolerance: 0.20 # recommended 0.045 for non elevation_grid_mode
61-
split_height_distance: 0.15 # recommended 0.15 for non elevation_grid_mode
61+
split_height_distance: 0.2 # recommended 0.15 for non elevation_grid_mode
6262
use_virtual_ground_point: False
6363
non_ground_height_threshold: 0.1
6464
grid_size_m: 0.1
@@ -74,59 +74,29 @@
7474

7575
front_lower_crop_box_filter:
7676
parameters:
77-
min_x: 5.8
77+
min_x: -50.0
7878
max_x: 100.0
7979
min_y: -50.0
8080
max_y: 50.0
81-
max_z: 3.2 # recommended 2.5 for non elevation_grid_mode
82-
min_z: -2.5 # recommended 0.0 for non elevation_grid_mode
81+
margin_max_z: 3.2 # recommended 2.5 for non elevation_grid_mode
82+
margin_min_z: -2.5 # recommended 0.0 for non elevation_grid_mode
8383
negative: False
8484

8585
front_lower_ground_filter:
8686
plugin: "ground_segmentation::ScanGroundFilterComponent"
8787
parameters:
8888
global_slope_max_angle_deg: 10.0
8989
local_slope_max_angle_deg: 18.0 # recommended 30.0 for non elevation_grid_mode
90-
split_points_distance_tolerance: 0.10 # recommended 0.1 for non elevation_grid_mode
91-
split_height_distance: 0.05 # recommended 0.05 for non elevation_grid_mode
92-
use_virtual_ground_point: true
90+
split_points_distance_tolerance: 0.20 # recommended 0.1 for non elevation_grid_mode
91+
split_height_distance: 0.2 # recommended 0.05 for non elevation_grid_mode
92+
use_virtual_ground_point: False
9393
non_ground_height_threshold: 0.1
9494
grid_size_m: 0.1
9595
grid_mode_switch_radius: 20.0
9696
gnd_grid_buffer_size: 4
9797
detection_range_z_max: 3.2
98-
elevation_grid_mode: true
99-
use_recheck_ground_cluster: true
100-
use_lowest_point: true
101-
low_priority_region_x: -20.0
102-
center_pcl_shift: 0.0
103-
radial_divider_angle_deg: 1.0
104-
105-
left_upper_crop_box_filter:
106-
parameters:
107-
min_x: 5.8
108-
max_x: 40.0
109-
min_y: -10.0
110-
max_y: 10.0
111-
max_z: 1. # recommended 2.5 for non elevation_grid_mode
112-
min_z: -1.0 # recommended 0.0 for non elevation_grid_mode
113-
negative: False
114-
115-
left_upper_ground_filter:
116-
plugin: "ground_segmentation::ScanGroundFilterComponent"
117-
parameters:
118-
global_slope_max_angle_deg: 6.0
119-
local_slope_max_angle_deg: 6.0 # recommended 30.0 for non elevation_grid_mode
120-
split_points_distance_tolerance: 0.20 # recommended 0.045 for non elevation_grid_mode
121-
split_height_distance: 0.2 # recommended 0.15 for non elevation_grid_mode
122-
use_virtual_ground_point: False
123-
non_ground_height_threshold: 0.05
124-
grid_size_m: 0.2
125-
grid_mode_switch_radius: 10.0
126-
gnd_grid_buffer_size: 3
127-
detection_range_z_max: 3.2
128-
elevation_grid_mode: true
129-
use_recheck_ground_cluster: true
98+
elevation_grid_mode: false
99+
use_recheck_ground_cluster: false
130100
use_lowest_point: true
131101
low_priority_region_x: -20.0
132102
center_pcl_shift: 0.0

autoware_launch/config/planning/preset/x2_preset.yaml

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
launch:
22
# behavior path modules
33
- arg:
4-
name: launch_avoidance_module
4+
name: launch_static_obstacle_avoidance
55
default: "true"
66
- arg:
77
name: launch_avoidance_by_lane_change_module
88
default: "false"
99
- arg:
10-
name: launch_dynamic_avoidance_module
10+
name: launch_dynamic_obstacle_avoidance
1111
default: "false"
12+
- arg:
13+
name: launch_sampling_planner_module
14+
default: "false" # Warning, experimental module, use only in simulations
1215
- arg:
1316
name: launch_lane_change_right_module
1417
default: "true"
@@ -71,9 +74,6 @@ launch:
7174
- arg:
7275
name: launch_speed_bump_module
7376
default: "false"
74-
- arg:
75-
name: launch_out_of_lane_module
76-
default: "true"
7777
- arg:
7878
name: launch_no_drivable_lane_module
7979
default: "false"
@@ -87,21 +87,31 @@ launch:
8787

8888
- arg:
8989
name: motion_path_planner_type
90-
default: obstacle_avoidance_planner
91-
# option: obstacle_avoidance_planner
90+
default: path_optimizer
91+
# option: path_optimizer
9292
# path_sampler
9393
# none
9494

95+
# motion velocity planner modules
96+
- arg:
97+
name: launch_dynamic_obstacle_stop_module
98+
default: "false"
99+
- arg:
100+
name: launch_out_of_lane_module
101+
default: "true"
102+
- arg:
103+
name: launch_obstacle_velocity_limiter_module
104+
default: "true"
105+
95106
- arg:
96107
name: motion_stop_planner_type
97-
default: obstacle_cruise_planner_with_pseudo_occlusion
108+
default: obstacle_cruise_planner
98109
# option: obstacle_stop_planner
99110
# obstacle_cruise_planner
100-
# obstacle_cruise_planner_with_pseudo_occlusion
101111
# none
102112

103113
- arg:
104-
name: motion_velocity_smoother_type
114+
name: velocity_smoother_type
105115
default: JerkFiltered
106116
# option: JerkFiltered
107117
# L2

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
kp: 0.3
1818

1919
backward:
20-
start_jerk: -0.3
21-
min_jerk_mild_stop: -0.5
20+
start_jerk: -0.1
21+
min_jerk_mild_stop: -0.3
2222
min_jerk: -1.5
2323
min_acc_mild_stop: -1.0
2424
min_acc: -2.5

0 commit comments

Comments
 (0)