Skip to content

Commit 013e666

Browse files
committed
Merge branch 'main' into autoware_msg
2 parents 37ef5bb + 948d3ba commit 013e666

File tree

9 files changed

+116
-19
lines changed

9 files changed

+116
-19
lines changed

autoware_launch/config/localization/ndt_scan_matcher/ndt_scan_matcher.param.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@
1111
map_frame: "map"
1212

1313

14+
sensor_points:
15+
# Required distance of input sensor points. [m]
16+
# If the max distance of input sensor points is lower than this value, the scan matching will not be performed.
17+
required_distance: 10.0
18+
19+
1420
ndt:
1521
# The maximum difference between two consecutive
1622
# transformations in order to consider convergence
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
# sample grid map fusion parameters for sample sensor kit
2+
/**:
3+
ros__parameters:
4+
# shared parameters
5+
shared_config:
6+
map_frame: "map"
7+
base_link_frame: "base_link"
8+
# center of the grid map
9+
gridmap_origin_frame: "base_link"
10+
11+
map_resolution: 0.5 # [m]
12+
map_length_x: 150.0 # [m]
13+
map_length_y: 150.0 # [m]
14+
15+
# each grid map parameters
16+
ogm_creation_config:
17+
height_filter:
18+
use_height_filter: true
19+
min_height: -1.0
20+
max_height: 2.0
21+
enable_single_frame_mode: true
22+
# use sensor pointcloud to filter obstacle pointcloud
23+
filter_obstacle_pointcloud_by_raw_pointcloud: true
24+
25+
grid_map_type: "OccupancyGridMapFixedBlindSpot"
26+
OccupancyGridMapFixedBlindSpot:
27+
distance_margin: 1.0
28+
OccupancyGridMapProjectiveBlindSpot:
29+
projection_dz_threshold: 0.01 # [m] for avoiding null division
30+
obstacle_separation_threshold: 1.0 # [m] fill the interval between obstacles with unknown for this length
31+
pub_debug_grid: false
32+
33+
# parameter settings for ogm fusion
34+
fusion_config:
35+
# following parameters are shared: map_frame, base_link_frame, gridmap_origin_frame, map_resolution, map_length
36+
# Setting1: tune ogm creation parameters
37+
raw_pointcloud_topics: # put each sensor's pointcloud topic
38+
- "/sensing/lidar/top/pointcloud"
39+
- "/sensing/lidar/left/pointcloud"
40+
- "/sensing/lidar/right/pointcloud"
41+
fusion_input_ogm_topics:
42+
- "/perception/occupancy_grid_map/top_lidar/map"
43+
- "/perception/occupancy_grid_map/left_lidar/map"
44+
- "/perception/occupancy_grid_map/right_lidar/map"
45+
# reliability of each sensor (0.0 ~ 1.0) only work with "log-odds" and "dempster-shafer"
46+
input_ogm_reliabilities:
47+
- 1.0
48+
- 0.6
49+
- 0.6
50+
51+
# Setting2: tune ogm fusion parameters
52+
## choose fusion method from ["overwrite", "log-odds", "dempster-shafer"]
53+
fusion_method: "overwrite"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
/**:
2+
ros__parameters:
3+
# 1. fusion parameters
4+
fusion_input_ogm_topics: ["topic1", "topic2"]
5+
input_ogm_reliabilities: [0.8, 0.2]
6+
fusion_method: "overwrite" # choose from ["overwrite", "log-odds", "dempster-shafer"]
7+
8+
# 2. synchronization settings
9+
match_threshold_sec: 0.01 # 10ms
10+
timeout_sec: 0.1 # 100ms
11+
input_offset_sec: [0.0, 0.0] # no offset
12+
13+
# 3. settings for fused fusion map
14+
# remember resolution and map size should be same with input maps
15+
map_frame_: "map"
16+
base_link_frame_: "base_link"
17+
grid_map_origin_frame_: "base_link"
18+
fusion_map_length_x: 100.0
19+
fusion_map_length_y: 100.0
20+
fusion_map_resolution: 0.5

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

+15-15
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
moving_speed_threshold: 1.0 # [m/s]
3131
moving_time_threshold: 2.0 # [s]
3232
lateral_margin:
33-
soft_margin: 0.7 # [m]
34-
hard_margin: 0.3 # [m]
35-
hard_margin_for_parked_vehicle: 0.3 # [m]
33+
soft_margin: 0.3 # [m]
34+
hard_margin: 0.2 # [m]
35+
hard_margin_for_parked_vehicle: 0.7 # [m]
3636
max_expand_ratio: 0.0 # [-]
3737
envelope_buffer_margin: 0.5 # [m]
3838
safety_buffer_longitudinal: 0.0 # [m]
@@ -42,9 +42,9 @@
4242
moving_speed_threshold: 1.0 # 3.6km/h
4343
moving_time_threshold: 2.0
4444
lateral_margin:
45-
soft_margin: 0.9 # [m]
46-
hard_margin: 0.1 # [m]
47-
hard_margin_for_parked_vehicle: 0.1 # [m]
45+
soft_margin: 0.3 # [m]
46+
hard_margin: 0.2 # [m]
47+
hard_margin_for_parked_vehicle: 0.7 # [m]
4848
max_expand_ratio: 0.0
4949
envelope_buffer_margin: 0.5
5050
safety_buffer_longitudinal: 0.0
@@ -54,9 +54,9 @@
5454
moving_speed_threshold: 1.0 # 3.6km/h
5555
moving_time_threshold: 2.0
5656
lateral_margin:
57-
soft_margin: 0.9 # [m]
58-
hard_margin: 0.1 # [m]
59-
hard_margin_for_parked_vehicle: 0.1 # [m]
57+
soft_margin: 0.3 # [m]
58+
hard_margin: 0.2 # [m]
59+
hard_margin_for_parked_vehicle: 0.7 # [m]
6060
max_expand_ratio: 0.0
6161
envelope_buffer_margin: 0.5
6262
safety_buffer_longitudinal: 0.0
@@ -66,9 +66,9 @@
6666
moving_speed_threshold: 1.0 # 3.6km/h
6767
moving_time_threshold: 2.0
6868
lateral_margin:
69-
soft_margin: 0.9 # [m]
70-
hard_margin: 0.1 # [m]
71-
hard_margin_for_parked_vehicle: 0.1 # [m]
69+
soft_margin: 0.3 # [m]
70+
hard_margin: 0.2 # [m]
71+
hard_margin_for_parked_vehicle: 0.7 # [m]
7272
max_expand_ratio: 0.0
7373
envelope_buffer_margin: 0.5
7474
safety_buffer_longitudinal: 0.0
@@ -154,7 +154,7 @@
154154
backward_distance: 10.0 # [m]
155155

156156
# params for avoidance of vehicle type objects that are ambiguous as to whether they are parked.
157-
force_avoidance:
157+
avoidance_for_ambiguous_vehicle:
158158
enable: true # [-]
159159
time_threshold: 3.0 # [s]
160160
distance_threshold: 1.0 # [m]
@@ -192,7 +192,7 @@
192192
check_all_predicted_path: false # [-]
193193
safety_check_backward_distance: 100.0 # [m]
194194
hysteresis_factor_expand_rate: 1.5 # [-]
195-
hysteresis_factor_safe_count: 10 # [-]
195+
hysteresis_factor_safe_count: 3 # [-]
196196
# predicted path parameters
197197
min_velocity: 1.38 # [m/s]
198198
max_velocity: 50.0 # [m/s]
@@ -208,7 +208,7 @@
208208
rear_vehicle_safety_time_margin: 1.0 # [s]
209209
lateral_distance_max_threshold: 2.0 # [m]
210210
longitudinal_distance_min_threshold: 3.0 # [m]
211-
longitudinal_velocity_delta_time: 0.8 # [s]
211+
longitudinal_velocity_delta_time: 0.0 # [s]
212212

213213
# For avoidance maneuver
214214
avoidance:

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
occluded_object_velocity: 1.0 # [m/s] assumed velocity of objects that may come out of the occluded space
7676
slow_down_velocity: 1.0 # [m/s]
7777
time_buffer: 0.5 # [s] consecutive time with/without an occlusion to add/remove the slowdown
78-
min_size: 0.5 # [m] minimum size of an occlusion (square side size)
78+
min_size: 1.0 # [m] minimum size of an occlusion (square side size)
7979
free_space_max: 43 # [-] maximum value of a free space cell in the occupancy grid
8080
occupied_min: 58 # [-] minimum value of an occupied cell in the occupancy grid
8181
ignore_with_red_traffic_light: true # [-] if true, occlusions at crosswalks with traffic lights are ignored

autoware_launch/config/planning/scenario_planning/lane_driving/motion_planning/obstacle_cruise_planner/obstacle_cruise_planner.param.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
ego_obstacle_overlap_time_threshold : 2.0 # time threshold to decide cut-in obstacle for cruise or stop [s]
9797
max_prediction_time_for_collision_check : 20.0 # prediction time to check collision between obstacle and ego
9898
yield:
99-
enable_yield: false
99+
enable_yield: true
100100
lat_distance_threshold: 5.0 # lateral margin between obstacle in neighbor lanes and trajectory band with ego's width for yielding
101101
max_lat_dist_between_obstacles: 2.5 # lateral margin between moving obstacle in neighbor lanes and stopped obstacle in front of it
102102
max_obstacles_collision_time: 10.0 # how far the blocking obstacle
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
/**:
22
ros__parameters:
33
update_rate: 10.0
4-
add_duplicated_node_names_to_msg: false # if true, duplicated node names are added to msg
4+
add_duplicated_node_names_to_msg: true # if true, duplicated node names are added to msg

autoware_launch/launch/components/tier4_perception_component.launch.xml

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
<?xml version="1.0"?>
22
<launch>
3-
<arg name="occupancy_grid_map_method" default="pointcloud_based_occupancy_grid_map" description="options: pointcloud_based_occupancy_grid_map, laserscan_based_occupancy_grid_map"/>
3+
<arg
4+
name="occupancy_grid_map_method"
5+
default="pointcloud_based_occupancy_grid_map"
6+
description="options: pointcloud_based_occupancy_grid_map, laserscan_based_occupancy_grid_map, multi_lidar_pointcloud_based_occupancy_grid_map"
7+
/>
48
<arg name="occupancy_grid_map_updater" default="binary_bayes_filter" description="options: binary_bayes_filter"/>
59
<arg name="detected_objects_filter_method" default="lanelet_filter" description="options: lanelet_filter, position_filter"/>
610
<arg
@@ -19,6 +23,7 @@
1923
<arg name="objects_filter_method" value="$(var detected_objects_filter_method)"/>
2024
<arg name="objects_validation_method" value="$(var detected_objects_validation_method)"/>
2125
<arg name="data_path" value="$(var data_path)"/>
26+
<arg name="use_low_height_cropbox" value="false"/>
2227

2328
<!-- object recognition -->
2429
<arg

autoware_launch/rviz/autoware.rviz

+13
Original file line numberDiff line numberDiff line change
@@ -2374,6 +2374,19 @@ Visualization Manager:
23742374
Constant Color: false
23752375
Scale: 0.30000001192092896
23762376
Value: false
2377+
- Class: rviz_default_plugins/Marker
2378+
Enabled: false
2379+
Name: Stop Reason
2380+
Namespaces:
2381+
{}
2382+
Topic:
2383+
Depth: 5
2384+
Durability Policy: Volatile
2385+
Filter size: 10
2386+
History Policy: Keep Last
2387+
Reliability Policy: Reliable
2388+
Value: /control/trajectory_follower/longitudinal/stop_reason
2389+
Value: false
23772390
- Class: rviz_default_plugins/MarkerArray
23782391
Enabled: false
23792392
Name: Debug/MPC

0 commit comments

Comments
 (0)