Skip to content

Commit ded0c95

Browse files
authored
Merge pull request autowarefoundation#880 from tier4/fix/xx1-gen2-params
fix: launch params
2 parents c86f45e + bd9c541 commit ded0c95

File tree

8 files changed

+34
-46
lines changed

8 files changed

+34
-46
lines changed

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

+2
Original file line numberDiff line numberDiff line change
@@ -74,3 +74,5 @@
7474
update_steer_threshold: 0.035
7575
average_num: 1000
7676
steering_offset_limit: 0.02
77+
78+
debug_publish_predicted_trajectory: false # publish debug predicted trajectory in Frenet coordinate

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

+2
Original file line numberDiff line numberDiff line change
@@ -72,5 +72,7 @@
7272
# pitch
7373
use_trajectory_for_pitch_calculation: false
7474
lpf_pitch_gain: 0.95
75+
slope_source: "raw_pitch" # raw_pitch, trajectory_pitch or trajectory_adaptive
76+
adaptive_trajectory_velocity_th: 1.0
7577
max_pitch_rad: 0.1
7678
min_pitch_rad: -0.1
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,21 @@
11
/**:
22
ros__parameters:
3-
trt_precision: fp16
43
encoder_onnx_path: "$(var model_path)/pts_voxel_encoder_$(var model_name).onnx"
54
encoder_engine_path: "$(var model_path)/pts_voxel_encoder_$(var model_name).engine"
65
head_onnx_path: "$(var model_path)/pts_backbone_neck_head_$(var model_name).onnx"
76
head_engine_path: "$(var model_path)/pts_backbone_neck_head_$(var model_name).engine"
8-
9-
model_params:
10-
class_names: ["CAR", "TRUCK", "BUS", "BICYCLE", "PEDESTRIAN"]
11-
paint_class_names: ["CAR", "BICYCLE", "PEDESTRIAN"]
12-
point_feature_size: 7 # x, y, z, time-lag and car, pedestrian, bicycle
13-
max_voxel_size: 40000
14-
point_cloud_range: [-121.6, -76.8, -3.0, 121.6, 76.8, 5.0]
15-
voxel_size: [0.32, 0.32, 8.0]
16-
downsample_factor: 1
17-
encoder_in_feature_size: 12
18-
yaw_norm_thresholds: [0.3, 0.3, 0.3, 0.3, 0.0]
19-
has_twist: false
20-
densification_params:
21-
world_frame_id: "map"
22-
num_past_frames: 0
7+
trt_precision: fp16
238
post_process_params:
249
# post-process params
2510
circle_nms_dist_threshold: 0.3
2611
iou_nms_target_class_names: ["CAR"]
2712
iou_nms_search_distance_2d: 10.0
2813
iou_nms_threshold: 0.1
29-
score_threshold: 0.35
14+
score_threshold: 0.45
15+
yaw_norm_thresholds: [0.3, 0.3, 0.3, 0.3, 0.0]
16+
densification_params:
17+
world_frame_id: "map"
18+
num_past_frames: 1
3019
omp_params:
3120
# omp params
3221
num_threads: 1

autoware_launch/config/perception/occupancy_grid_map/multi_lidar_pointcloud_based_occupancy_grid_map.param.yaml

+10-10
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111
map_length_x: 150.0 # [m]
1212
map_length_y: 150.0 # [m]
1313

14+
# downsample input pointcloud
15+
downsample_input_pointcloud: true
16+
downsample_voxel_size: 0.25 # [m]
17+
1418
# each grid map parameters
1519
ogm_creation_config:
1620
height_filter:
@@ -19,7 +23,7 @@
1923
max_height: 2.0
2024
enable_single_frame_mode: true
2125
# use sensor pointcloud to filter obstacle pointcloud
22-
filter_obstacle_pointcloud_by_raw_pointcloud: true
26+
filter_obstacle_pointcloud_by_raw_pointcloud: false
2327

2428
grid_map_type: "OccupancyGridMapFixedBlindSpot"
2529
OccupancyGridMapFixedBlindSpot:
@@ -35,16 +39,12 @@
3539
# Setting1: tune ogm creation parameters
3640
raw_pointcloud_topics: # put each sensor's pointcloud topic
3741
- "/sensing/lidar/top/pointcloud"
38-
- "/sensing/lidar/side_left/pointcloud"
39-
- "/sensing/lidar/side_right/pointcloud"
40-
- "/sensing/lidar/front_left/pointcloud"
41-
- "/sensing/lidar/front_right/pointcloud"
42+
- "/sensing/lidar/left/pointcloud"
43+
- "/sensing/lidar/right/pointcloud"
4244
fusion_input_ogm_topics:
43-
- "/perception/occupancy_grid_map/top/map"
44-
- "/perception/occupancy_grid_map/side_left/map"
45-
- "/perception/occupancy_grid_map/side_right/map"
46-
- "/perception/occupancy_grid_map/front_left/map"
47-
- "/perception/occupancy_grid_map/front_right/map"
45+
- "/perception/occupancy_grid_map/top_lidar/map"
46+
- "/perception/occupancy_grid_map/left_lidar/map"
47+
- "/perception/occupancy_grid_map/right_lidar/map"
4848
# reliability of each sensor (0.0 ~ 1.0) only work with "log-odds" and "dempster-shafer"
4949
input_ogm_reliabilities:
5050
- 1.0

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

+1-8
Original file line numberDiff line numberDiff line change
@@ -293,11 +293,4 @@
293293

294294
# for debug
295295
debug:
296-
enable_other_objects_marker: true
297-
enable_other_objects_info: true
298-
enable_detection_area_marker: false
299-
enable_drivable_bound_marker: false
300-
enable_safety_check_marker: false
301-
enable_shift_line_marker: false
302-
enable_lane_marker: false
303-
enable_misc_marker: false
296+
marker: false

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

+5-7
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,10 @@
33
blind_spot:
44
use_pass_judge_line: true
55
stop_line_margin: 1.0 # [m]
6-
backward_detection_length: 100.0 # [m]
7-
ignore_width_from_center_line: 0.7 # [m]
6+
backward_length: 50.0 # [m]
7+
ignore_width_from_center_line: 0.0 # [m]
8+
max_future_movement_time: 10.0 # [second]
9+
threshold_yaw_diff: 0.523 # [rad]
810
adjacent_extend_width: 1.5 # [m]
911
opposite_adjacent_extend_width: 1.5 # [m]
10-
max_future_movement_time: 10.0 # [second]
11-
ttc_min: -5.0 # [s]
12-
ttc_max: 5.0 # [s]
13-
ttc_ego_minimal_velocity: 5.0 # [m/s]
14-
enable_rtc: false # If set to true, the scene modules require approval from the rtc (request to cooperate) function. If set to false, the modules can be executed without requiring rtc approval
12+
enable_rtc: false

autoware_launch/launch/autoware.launch.xml

+1
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@
121121
<include file="$(find-pkg-share autoware_launch)/launch/components/tier4_perception_component.launch.xml">
122122
<arg name="data_path" value="$(var data_path)"/>
123123
<arg name="occupancy_grid_map_method" value="$(var occupancy_grid_map_method)"/>
124+
<arg name="sensor_model" value="$(var sensor_model)"/>
124125
</include>
125126
</group>
126127

autoware_launch/launch/components/tier4_perception_component.launch.xml

+7-4
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,14 @@
1616
<arg name="lidar_detection_model" default="pointpainting" description="options: `centerpoint`, `apollo`, `pointpainting`, `clustering`"/>
1717
<arg name="traffic_light_recognition/fusion_only" default="true" description="Whether to start only some of the signal recognition related nodes"/>
1818

19-
<!-- In the Gen2 sensor configuration, the traffic_light_recognition node is launched not through the conventional autoware.universe/launch/tier4_perception_launch but with its own custom launch file.
20-
This is because autoware.universe's launch files do not support an arbitrary number of cameras. If autoware.universe's launch files were to support it, it is recommended to use them instead. -->
21-
<include file="$(find-pkg-share autoware_launch)/launch/components/traffic_light_recognition/traffic_light.launch.xml"/>
19+
<group if="$(eval sensor_model == 'aip_xx1_gen2')">
20+
<!-- In the Gen2 sensor configuration, the traffic_light_recognition node is launched not through the conventional autoware.universe/launch/tier4_perception_launch but with its own custom launch file.
21+
This is because autoware.universe's launch files do not support an arbitrary number of cameras. If autoware.universe's launch files were to support it, it is recommended to use them instead. -->
22+
<include file="$(find-pkg-share autoware_launch)/launch/components/traffic_light_recognition/traffic_light.launch.xml"/>
23+
</group>
2224
<!-- NOTE: Override by false to disable conventional traffic light recognition launch -->
23-
<let name="use_traffic_light_recognition" value="false"/>
25+
<let name="use_traffic_light_recognition" value="false" unless="$(eval &quot;'aip_xx1_gen2' == '$(var sensor_model)'&quot;)"/>
26+
<let name="use_traffic_light_recognition" value="true" if="$(eval &quot;'aip_xx1_gen2' == '$(var sensor_model)'&quot;)"/>
2427

2528
<include file="$(find-pkg-share tier4_perception_launch)/launch/perception.launch.xml">
2629
<arg name="mode" value="$(var perception_mode)"/>

0 commit comments

Comments
 (0)