Skip to content

Commit dfe98be

Browse files
Merge pull request #337 from tier4/sync-awf-latest
chore: sync awf-latest
2 parents 55f6374 + d6bb368 commit dfe98be

File tree

5 files changed

+70
-34
lines changed

5 files changed

+70
-34
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
max_x: 150.0
1212
min_y: -70.0
1313
max_y: 70.0
14-
max_z: 2.5
15-
min_z: -2.5 # recommended 0.0 for non elevation_grid_mode
14+
margin_max_z: 0.0 # to extend the crop box max_z from vehicle_height
15+
margin_min_z: -2.5 # to extend the crop box min_z from ground
1616
negative: False
1717

1818
common_ground_filter:

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

+32-16
Original file line numberDiff line numberDiff line change
@@ -29,80 +29,96 @@
2929
execute_num: 1 # [-]
3030
moving_speed_threshold: 1.0 # [m/s]
3131
moving_time_threshold: 2.0 # [s]
32+
lateral_margin:
33+
soft_margin: 0.7 # [m]
34+
hard_margin: 0.3 # [m]
35+
hard_margin_for_parked_vehicle: 0.3 # [m]
3236
max_expand_ratio: 0.0 # [-]
3337
envelope_buffer_margin: 0.5 # [m]
34-
avoid_margin_lateral: 0.7 # [m]
35-
safety_buffer_lateral: 0.3 # [m]
3638
safety_buffer_longitudinal: 0.0 # [m]
3739
use_conservative_buffer_longitudinal: true # [-] When set to true, the base_link2front is added to the longitudinal buffer before avoidance.
3840
truck:
3941
execute_num: 1
4042
moving_speed_threshold: 1.0 # 3.6km/h
4143
moving_time_threshold: 2.0
44+
lateral_margin:
45+
soft_margin: 0.9 # [m]
46+
hard_margin: 0.1 # [m]
47+
hard_margin_for_parked_vehicle: 0.1 # [m]
4248
max_expand_ratio: 0.0
4349
envelope_buffer_margin: 0.5
44-
avoid_margin_lateral: 0.9
45-
safety_buffer_lateral: 0.1
4650
safety_buffer_longitudinal: 0.0
4751
use_conservative_buffer_longitudinal: true
4852
bus:
4953
execute_num: 1
5054
moving_speed_threshold: 1.0 # 3.6km/h
5155
moving_time_threshold: 2.0
56+
lateral_margin:
57+
soft_margin: 0.9 # [m]
58+
hard_margin: 0.1 # [m]
59+
hard_margin_for_parked_vehicle: 0.1 # [m]
5260
max_expand_ratio: 0.0
5361
envelope_buffer_margin: 0.5
54-
avoid_margin_lateral: 0.9
55-
safety_buffer_lateral: 0.1
5662
safety_buffer_longitudinal: 0.0
5763
use_conservative_buffer_longitudinal: true
5864
trailer:
5965
execute_num: 1
6066
moving_speed_threshold: 1.0 # 3.6km/h
6167
moving_time_threshold: 2.0
68+
lateral_margin:
69+
soft_margin: 0.9 # [m]
70+
hard_margin: 0.1 # [m]
71+
hard_margin_for_parked_vehicle: 0.1 # [m]
6272
max_expand_ratio: 0.0
6373
envelope_buffer_margin: 0.5
64-
avoid_margin_lateral: 0.9
65-
safety_buffer_lateral: 0.1
6674
safety_buffer_longitudinal: 0.0
6775
use_conservative_buffer_longitudinal: true
6876
unknown:
6977
execute_num: 1
7078
moving_speed_threshold: 0.28 # 1.0km/h
7179
moving_time_threshold: 1.0
80+
lateral_margin:
81+
soft_margin: 0.7 # [m]
82+
hard_margin: -0.2 # [m]
83+
hard_margin_for_parked_vehicle: -0.2 # [m]
7284
max_expand_ratio: 0.0
7385
envelope_buffer_margin: 0.1
74-
avoid_margin_lateral: 0.7
75-
safety_buffer_lateral: -0.2
7686
safety_buffer_longitudinal: 0.0
7787
use_conservative_buffer_longitudinal: true
7888
bicycle:
7989
execute_num: 1
8090
moving_speed_threshold: 0.28 # 1.0km/h
8191
moving_time_threshold: 1.0
92+
lateral_margin:
93+
soft_margin: 0.7 # [m]
94+
hard_margin: 0.5 # [m]
95+
hard_margin_for_parked_vehicle: 0.5 # [m]
8296
max_expand_ratio: 0.0
8397
envelope_buffer_margin: 0.5
84-
avoid_margin_lateral: 0.7
85-
safety_buffer_lateral: 0.5
8698
safety_buffer_longitudinal: 1.0
8799
use_conservative_buffer_longitudinal: true
88100
motorcycle:
89101
execute_num: 1
90102
moving_speed_threshold: 1.0 # 3.6km/h
91103
moving_time_threshold: 1.0
104+
lateral_margin:
105+
soft_margin: 0.7 # [m]
106+
hard_margin: 0.3 # [m]
107+
hard_margin_for_parked_vehicle: 0.3 # [m]
92108
max_expand_ratio: 0.0
93109
envelope_buffer_margin: 0.5
94-
avoid_margin_lateral: 0.7
95-
safety_buffer_lateral: 0.3
96110
safety_buffer_longitudinal: 1.0
97111
use_conservative_buffer_longitudinal: true
98112
pedestrian:
99113
execute_num: 1
100114
moving_speed_threshold: 0.28 # 1.0km/h
101115
moving_time_threshold: 1.0
116+
lateral_margin:
117+
soft_margin: 0.7 # [m]
118+
hard_margin: 0.5 # [m]
119+
hard_margin_for_parked_vehicle: 0.5 # [m]
102120
max_expand_ratio: 0.0
103121
envelope_buffer_margin: 0.5
104-
avoid_margin_lateral: 0.7
105-
safety_buffer_lateral: 0.5
106122
safety_buffer_longitudinal: 1.0
107123
use_conservative_buffer_longitudinal: true
108124
lower_distance_for_polygon_expansion: 30.0 # [m]

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

+32-16
Original file line numberDiff line numberDiff line change
@@ -12,64 +12,80 @@
1212
moving_time_threshold: 1.0 # [s]
1313
max_expand_ratio: 0.0 # [-]
1414
envelope_buffer_margin: 0.3 # [m]
15-
avoid_margin_lateral: 0.0 # [m]
16-
safety_buffer_lateral: 0.0 # [m]
15+
lateral_margin:
16+
soft_margin: 0.0 # [m]
17+
hard_margin: 0.0 # [m]
18+
hard_margin_for_parked_vehicle: 0.0 # [m]
1719
truck:
1820
execute_num: 2
1921
moving_speed_threshold: 1.0 # 3.6km/h
2022
moving_time_threshold: 1.0
2123
max_expand_ratio: 0.0
2224
envelope_buffer_margin: 0.3
23-
avoid_margin_lateral: 0.0
24-
safety_buffer_lateral: 0.0
25+
lateral_margin:
26+
soft_margin: 0.0 # [m]
27+
hard_margin: 0.0 # [m]
28+
hard_margin_for_parked_vehicle: 0.0 # [m]
2529
bus:
2630
execute_num: 2
2731
moving_speed_threshold: 1.0 # 3.6km/h
2832
moving_time_threshold: 1.0
2933
max_expand_ratio: 0.0
3034
envelope_buffer_margin: 0.3
31-
avoid_margin_lateral: 0.0
32-
safety_buffer_lateral: 0.0
35+
lateral_margin:
36+
soft_margin: 0.0 # [m]
37+
hard_margin: 0.0 # [m]
38+
hard_margin_for_parked_vehicle: 0.0 # [m]
3339
trailer:
3440
execute_num: 2
3541
moving_speed_threshold: 1.0 # 3.6km/h
3642
moving_time_threshold: 1.0
3743
max_expand_ratio: 0.0
3844
envelope_buffer_margin: 0.3
39-
avoid_margin_lateral: 0.0
40-
safety_buffer_lateral: 0.0
45+
lateral_margin:
46+
soft_margin: 0.0 # [m]
47+
hard_margin: 0.0 # [m]
48+
hard_margin_for_parked_vehicle: 0.0 # [m]
4149
unknown:
4250
execute_num: 1
4351
moving_speed_threshold: 0.28 # 1.0km/h
4452
moving_time_threshold: 1.0
4553
max_expand_ratio: 0.0
4654
envelope_buffer_margin: 0.3
47-
avoid_margin_lateral: 0.0
48-
safety_buffer_lateral: 0.0
55+
lateral_margin:
56+
soft_margin: 0.0 # [m]
57+
hard_margin: 0.0 # [m]
58+
hard_margin_for_parked_vehicle: 0.0 # [m]
4959
bicycle:
5060
execute_num: 2
5161
moving_speed_threshold: 0.28 # 1.0km/h
5262
moving_time_threshold: 1.0
5363
max_expand_ratio: 0.0
5464
envelope_buffer_margin: 0.8
55-
avoid_margin_lateral: 0.0
56-
safety_buffer_lateral: 1.0
65+
lateral_margin:
66+
soft_margin: 0.0 # [m]
67+
hard_margin: 1.0 # [m]
68+
hard_margin_for_parked_vehicle: 1.0 # [m]
5769
motorcycle:
5870
execute_num: 2
5971
moving_speed_threshold: 1.0 # 3.6km/h
6072
moving_time_threshold: 1.0
6173
max_expand_ratio: 0.0
6274
envelope_buffer_margin: 0.8
63-
avoid_margin_lateral: 0.0
64-
safety_buffer_lateral: 1.0
75+
lateral_margin:
76+
soft_margin: 0.0 # [m]
77+
hard_margin: 1.0 # [m]
78+
hard_margin_for_parked_vehicle: 1.0 # [m]
6579
pedestrian:
6680
execute_num: 2
6781
moving_speed_threshold: 0.28 # 1.0km/h
6882
moving_time_threshold: 1.0
6983
max_expand_ratio: 0.0
7084
envelope_buffer_margin: 0.8
71-
avoid_margin_lateral: 0.0
72-
safety_buffer_lateral: 1.0
85+
lateral_margin:
86+
soft_margin: 0.0 # [m]
87+
hard_margin: 1.0 # [m]
88+
hard_margin_for_parked_vehicle: 1.0 # [m]
7389
lower_distance_for_polygon_expansion: 0.0 # [m]
7490
upper_distance_for_polygon_expansion: 1.0 # [m]
7591

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

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
th_stopped_time: 1.0
88
collision_check_margins: [2.0, 1.0, 0.5, 0.1]
99
collision_check_margin_from_front_object: 5.0
10+
extra_width_margin_for_rear_obstacle: 0.5
1011
th_moving_object_velocity: 1.0
1112
object_types_to_check_for_path_generation:
1213
check_car: true

autoware_launch/config/vehicle/raw_vehicle_cmd_converter/raw_vehicle_cmd_converter.param.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
/**:
22
ros__parameters:
3+
csv_path_accel_map: $(find-pkg-share raw_vehicle_cmd_converter)/data/default/accel_map.csv
4+
csv_path_brake_map: $(find-pkg-share raw_vehicle_cmd_converter)/data/default/brake_map.csv
5+
csv_path_steer_map: $(find-pkg-share raw_vehicle_cmd_converter)/data/default/steer_map.csv
36
convert_accel_cmd: true
47
convert_brake_cmd: true
58
convert_steer_cmd: false

0 commit comments

Comments
 (0)