Skip to content

Commit 729924b

Browse files
Merge pull request #568 from tier4/beta-to-tier4-main-sync
chore: sync beta branch beta/v0.33 with tier4/main
2 parents c46bcdc + 91f473e commit 729924b

File tree

19 files changed

+119
-68
lines changed

19 files changed

+119
-68
lines changed

autoware_launch/config/control/autoware_autonomous_emergency_braking/autonomous_emergency_braking.param.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
use_pointcloud_data: true
77
use_predicted_object_data: false
88
use_object_velocity_calculation: true
9+
check_autoware_state: true
910
min_generated_path_length: 0.5
1011
imu_prediction_time_horizon: 1.5
1112
imu_prediction_time_interval: 0.1

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,4 +75,4 @@
7575
average_num: 1000
7676
steering_offset_limit: 0.02
7777

78-
debug_publish_predicted_trajectory: false # publish debug predicted trajectory in Frenet coordinate
78+
debug_publish_predicted_trajectory: true # publish debug predicted trajectory in Frenet coordinate

autoware_launch/config/control/vehicle_cmd_gate/vehicle_cmd_gate.param.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,13 @@
44
system_emergency_heartbeat_timeout: 0.5
55
use_emergency_handling: true
66
check_external_emergency_heartbeat: $(var check_external_emergency_heartbeat)
7-
use_start_request: false
87
enable_cmd_limit_filter: true
98
filter_activated_count_threshold: 5
109
filter_activated_velocity_threshold: 1.0
1110
external_emergency_stop_heartbeat_timeout: 0.0
1211
stop_hold_acceleration: -1.5
1312
emergency_acceleration: -2.4
1413
moderate_stop_service_acceleration: -1.5
15-
stopped_state_entry_duration_time: 0.1
1614
stop_check_duration: 1.0
1715
nominal:
1816
vel_lim: 25.0
Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,21 @@
11
/**:
22
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-
cloud_capacity: 2000000
21-
densification_num_past_frames: 1
22-
densification_world_frame_id: map
233

244
# weight files
255
encoder_onnx_path: "$(var model_path)/pts_voxel_encoder_$(var model_name).onnx"
266
encoder_engine_path: "$(var model_path)/pts_voxel_encoder_$(var model_name).engine"
277
head_onnx_path: "$(var model_path)/pts_backbone_neck_head_$(var model_name).onnx"
288
head_engine_path: "$(var model_path)/pts_backbone_neck_head_$(var model_name).engine"
9+
trt_precision: fp16
10+
cloud_capacity: 2000000
11+
post_process_params:
12+
# post-process params
13+
circle_nms_dist_threshold: 0.5
14+
iou_nms_target_class_names: ["CAR"]
15+
iou_nms_search_distance_2d: 10.0
16+
iou_nms_threshold: 0.1
17+
yaw_norm_thresholds: [0.3, 0.3, 0.3, 0.3, 0.0]
18+
score_threshold: 0.35
19+
densification_params:
20+
world_frame_id: map
21+
num_past_frames: 1

autoware_launch/config/perception/object_recognition/prediction/map_based_prediction.param.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,8 @@
5050
consider_only_routable_neighbours: false
5151

5252
reference_path_resolution: 0.5 #[m]
53+
54+
# debug parameters
55+
publish_processing_time: true
56+
publish_processing_time_detail: true
57+
publish_debug_markers: true

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
name: "apollo"
4141
short_name: "Lap"
4242
# LIDAR-CAMERA - DNN
43-
# cspell:ignore lidar_pointpainitng pointpainting
44-
lidar_pointpainitng:
43+
# cspell:ignore lidar_pointpainting pointpainting
44+
lidar_pointpainting:
4545
topic: "/perception/object_recognition/detection/pointpainting/objects"
4646
can_spawn_new_tracker: true
4747
optional:

autoware_launch/config/perception/object_recognition/tracking/tracking_object_merger/decorative_tracker_merger.param.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
/**:
33
ros__parameters:
44
base_link_frame_id: "base_link"
5+
merge_frame_id: "map"
56
time_sync_threshold: 0.999
67
sub_object_timeout_sec: 0.8
78
publish_interpolated_sub_objects: true #for debug

autoware_launch/config/planning/scenario_planning/common/costmap_generator.param.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@
1818
use_parkinglot: true
1919
use_objects: true
2020
use_points: true
21-
expand_polygon_size: 1.0
21+
expand_polygon_size: 0.5
2222
size_of_expansion_kernel: 9

autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/autoware_behavior_path_static_obstacle_avoidance_module/static_obstacle_avoidance.param.yaml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
hard_margin_for_parked_vehicle: 0.7 # [m]
2929
max_expand_ratio: 0.0 # [-] FOR DEVELOPER
3030
envelope_buffer_margin: 0.5 # [m] FOR DEVELOPER
31+
th_error_eclipse_long_radius : 0.6 # [m]
3132
truck:
3233
th_moving_speed: 1.0
3334
th_moving_time: 2.0
@@ -38,6 +39,7 @@
3839
hard_margin_for_parked_vehicle: 0.7
3940
max_expand_ratio: 0.0
4041
envelope_buffer_margin: 0.5
42+
th_error_eclipse_long_radius : 0.6
4143
bus:
4244
th_moving_speed: 1.0
4345
th_moving_time: 2.0
@@ -48,6 +50,7 @@
4850
hard_margin_for_parked_vehicle: 0.7
4951
max_expand_ratio: 0.0
5052
envelope_buffer_margin: 0.5
53+
th_error_eclipse_long_radius : 0.6
5154
trailer:
5255
th_moving_speed: 1.0
5356
th_moving_time: 2.0
@@ -58,6 +61,7 @@
5861
hard_margin_for_parked_vehicle: 0.7
5962
max_expand_ratio: 0.0
6063
envelope_buffer_margin: 0.5
64+
th_error_eclipse_long_radius : 0.6
6165
unknown:
6266
th_moving_speed: 0.28
6367
th_moving_time: 1.0
@@ -68,6 +72,7 @@
6872
hard_margin_for_parked_vehicle: -0.2
6973
max_expand_ratio: 0.0
7074
envelope_buffer_margin: 0.1
75+
th_error_eclipse_long_radius : 0.6
7176
bicycle:
7277
th_moving_speed: 0.28
7378
th_moving_time: 1.0
@@ -78,6 +83,7 @@
7883
hard_margin_for_parked_vehicle: 0.5
7984
max_expand_ratio: 0.0
8085
envelope_buffer_margin: 0.5
86+
th_error_eclipse_long_radius : 0.6
8187
motorcycle:
8288
th_moving_speed: 1.0
8389
th_moving_time: 1.0
@@ -88,6 +94,7 @@
8894
hard_margin_for_parked_vehicle: 0.3
8995
max_expand_ratio: 0.0
9096
envelope_buffer_margin: 0.5
97+
th_error_eclipse_long_radius : 0.6
9198
pedestrian:
9299
th_moving_speed: 0.28
93100
th_moving_time: 1.0
@@ -98,6 +105,7 @@
98105
hard_margin_for_parked_vehicle: 0.5
99106
max_expand_ratio: 0.0
100107
envelope_buffer_margin: 0.5
108+
th_error_eclipse_long_radius : 0.6
101109
lower_distance_for_polygon_expansion: 30.0 # [m] FOR DEVELOPER
102110
upper_distance_for_polygon_expansion: 100.0 # [m] FOR DEVELOPER
103111

@@ -142,16 +150,16 @@
142150
# "auto" : generate candidate path. if RTC is running as AUTO mode, the ego avoids it automatically.
143151
# "manual" : generate candidate path and wait operator approval even if RTC is running as AUTO mode.
144152
# "ignore" : never avoid it.
145-
policy: "auto" # [-]
153+
policy: "manual" # [-]
146154
condition:
147155
th_stopped_time: 3.0 # [s]
148156
th_moving_distance: 1.0 # [m]
149157
ignore_area:
150158
traffic_light:
151-
front_distance: 100.0 # [m]
159+
front_distance: 20.0 # [m]
152160
crosswalk:
153-
front_distance: 30.0 # [m]
154-
behind_distance: 30.0 # [m]
161+
front_distance: 20.0 # [m]
162+
behind_distance: 0.0 # [m]
155163
wait_and_see:
156164
target_behaviors: ["MERGING", "DEVIATING"] # [-]
157165
th_closest_distance: 10.0 # [m]

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
# object recognition
3737
object_recognition:
3838
use_object_recognition: true
39-
collision_check_soft_margins: [2.0, 1.5, 1.0]
39+
collision_check_soft_margins: [5.0, 4.5, 4.0, 3.5, 3.0, 2.5, 2.0, 1.5, 1.0] # the maximum margin when ego and objects are oriented.
4040
collision_check_hard_margins: [0.6] # this should be larger than `surround_check_distance` of surround_obstacle_checker
4141
object_recognition_collision_check_max_extra_stopping_margin: 1.0
4242
th_moving_object_velocity: 1.0
@@ -55,6 +55,7 @@
5555
maximum_jerk: 1.0
5656
path_priority: "efficient_path" # "efficient_path" or "close_goal"
5757
efficient_path_order: ["SHIFT", "ARC_FORWARD", "ARC_BACKWARD"] # only lane based pull over(exclude freespace parking)
58+
lane_departure_check_expansion_margin: 0.0
5859

5960
# shift parking
6061
shift_parking:
@@ -112,9 +113,11 @@
112113
use_back: true
113114
adapt_expansion_distance: true
114115
expansion_distance: 0.5
116+
near_goal_distance: 3.0
115117
distance_heuristic_weight: 2.0
116118
smoothness_weight: 0.5
117119
obstacle_distance_weight: 1.75
120+
goal_lat_distance_weight: 5.0
118121
# -- RRT* search Configurations --
119122
rrtstar:
120123
enable_update: true

0 commit comments

Comments
 (0)