Skip to content

Commit c8a5b56

Browse files
Merge pull request #619 from tier4/sync-awf-upstream
chore: sync tier4/autoware_launch:awf-latest
2 parents b2c38f6 + 4e3a88b commit c8a5b56

File tree

6 files changed

+23
-50
lines changed

6 files changed

+23
-50
lines changed

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
use_predicted_object_data: false
88
use_object_velocity_calculation: true
99
check_autoware_state: true
10-
min_generated_path_length: 0.5
10+
min_generated_imu_path_length: 0.5
11+
max_generated_imu_path_length: 10.0
1112
imu_prediction_time_horizon: 1.5
1213
imu_prediction_time_interval: 0.1
1314
mpc_prediction_time_horizon: 4.5
@@ -27,6 +28,7 @@
2728
# Point cloud cropping
2829
expand_width: 0.1
2930
path_footprint_extra_margin: 4.0
31+
speed_calculation_expansion_margin: 0.5
3032

3133
# Point cloud clustering
3234
cluster_tolerance: 0.15 #[m]

autoware_launch/config/localization/pose_initializer.param.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66

77
gnss_pose_timeout: 3.0 # [sec]
88
stop_check_duration: 3.0 # [sec]
9+
pose_error_threshold: 5.0 # [m]
10+
pose_error_check_enabled: false
911
ekf_enabled: $(var ekf_enabled)
1012
gnss_enabled: $(var gnss_enabled)
1113
yabloc_enabled: $(var yabloc_enabled)

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

+1
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@
1515
min_y: -200.0
1616
max_z: 2.0
1717
min_z: -10.0
18+
negative: false

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

-8
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
# avoidance is performed for the object type with true
88
target_object:
99
car:
10-
execute_num: 2 # [-]
1110
th_moving_speed: 1.0 # [m/s]
1211
th_moving_time: 1.0 # [s]
1312
max_expand_ratio: 0.0 # [-]
@@ -17,7 +16,6 @@
1716
hard_margin: 0.0 # [m]
1817
hard_margin_for_parked_vehicle: 0.0 # [m]
1918
truck:
20-
execute_num: 2
2119
th_moving_speed: 1.0 # 3.6km/h
2220
th_moving_time: 1.0
2321
max_expand_ratio: 0.0
@@ -27,7 +25,6 @@
2725
hard_margin: 0.0 # [m]
2826
hard_margin_for_parked_vehicle: 0.0 # [m]
2927
bus:
30-
execute_num: 2
3128
th_moving_speed: 1.0 # 3.6km/h
3229
th_moving_time: 1.0
3330
max_expand_ratio: 0.0
@@ -37,7 +34,6 @@
3734
hard_margin: 0.0 # [m]
3835
hard_margin_for_parked_vehicle: 0.0 # [m]
3936
trailer:
40-
execute_num: 2
4137
th_moving_speed: 1.0 # 3.6km/h
4238
th_moving_time: 1.0
4339
max_expand_ratio: 0.0
@@ -47,7 +43,6 @@
4743
hard_margin: 0.0 # [m]
4844
hard_margin_for_parked_vehicle: 0.0 # [m]
4945
unknown:
50-
execute_num: 1
5146
th_moving_speed: 0.28 # 1.0km/h
5247
th_moving_time: 1.0
5348
max_expand_ratio: 0.0
@@ -57,7 +52,6 @@
5752
hard_margin: 0.0 # [m]
5853
hard_margin_for_parked_vehicle: 0.0 # [m]
5954
bicycle:
60-
execute_num: 2
6155
th_moving_speed: 0.28 # 1.0km/h
6256
th_moving_time: 1.0
6357
max_expand_ratio: 0.0
@@ -67,7 +61,6 @@
6761
hard_margin: 1.0 # [m]
6862
hard_margin_for_parked_vehicle: 1.0 # [m]
6963
motorcycle:
70-
execute_num: 2
7164
th_moving_speed: 1.0 # 3.6km/h
7265
th_moving_time: 1.0
7366
max_expand_ratio: 0.0
@@ -77,7 +70,6 @@
7770
hard_margin: 1.0 # [m]
7871
hard_margin_for_parked_vehicle: 1.0 # [m]
7972
pedestrian:
80-
execute_num: 2
8173
th_moving_speed: 0.28 # 1.0km/h
8274
th_moving_time: 1.0
8375
max_expand_ratio: 0.0

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

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
# safety check
3535
safety_check:
3636
allow_loose_check_for_cancel: true
37+
enable_target_lane_bound_check: true
3738
collision_check_yaw_diff_threshold: 3.1416
3839
execution:
3940
expected_front_deceleration: -1.0

autoware_launch/rviz/autoware.rviz

+16-41
Original file line numberDiff line numberDiff line change
@@ -520,39 +520,26 @@ Visualization Manager:
520520
Topic:
521521
Depth: 5
522522
Durability Policy: Volatile
523-
Filter size: 10
524523
History Policy: Keep Last
525524
Reliability Policy: Reliable
526525
Value: /localization/pose_estimator/pose_with_covariance
527-
Value: false
526+
Value: true
528527
- Buffer Size: 200
529-
Class: rviz_plugins::PoseWithCovarianceHistory
530-
Covariance:
531-
Alpha: 0.5
532-
Color: 204; 51; 204
533-
Scale: 1
534-
Value: true
528+
Class: rviz_plugins::PoseHistory
535529
Enabled: false
536-
Name: PoseWithCovarianceHistory
537-
Path:
538-
Shape Type:
539-
Alpha: 0.999
540-
Color: 170; 255; 127
541-
Head Length: 0.20000
542-
Head diameter: 0.30000
543-
Shaft Length: 0.30000
544-
Shaft diameter: 0.15000
545-
Value: Line
546-
Width: 0.10000
530+
Line:
531+
Color: 170; 255; 127
547532
Value: true
533+
Width: 0.10000000149011612
534+
Alpha: 0.999
535+
Name: PoseHistory
548536
Topic:
549537
Depth: 5
550538
Durability Policy: Volatile
551-
Filter size: 10
552539
History Policy: Keep Last
553540
Reliability Policy: Reliable
554-
Value: /localization/pose_estimator/pose_with_covariance
555-
Value: false
541+
Value: /localization/pose_estimator/pose
542+
Value: true
556543
- Alpha: 0.999
557544
Autocompute Intensity Bounds: true
558545
Autocompute Value Bounds:
@@ -635,32 +622,20 @@ Visualization Manager:
635622
- Class: rviz_common/Group
636623
Displays:
637624
- Buffer Size: 1000
638-
Class: rviz_plugins::PoseWithCovarianceHistory
639-
Covariance:
640-
Alpha: 0.5
641-
Color: 153; 193; 241
642-
Scale: 1
643-
Value: false
625+
Class: rviz_plugins::PoseHistory
644626
Enabled: true
645-
Name: PoseWithCovarianceHistory
646-
Path:
647-
Shape Type:
648-
Alpha: 0.999
649-
Color: 0; 255; 255
650-
Head Length: 0.20000
651-
Head diameter: 0.300000
652-
Shaft Length: 0.30000
653-
Shaft diameter: 0.15000
654-
Value: Line
655-
Width: 0.10000
627+
Line:
628+
Color: 0; 255; 255
656629
Value: true
630+
Width: 0.10000000149011612
631+
Alpha: 0.999
632+
Name: PoseHistory
657633
Topic:
658634
Depth: 5
659635
Durability Policy: Volatile
660-
Filter size: 10
661636
History Policy: Keep Last
662637
Reliability Policy: Reliable
663-
Value: /localization/pose_with_covariance
638+
Value: /localization/pose_twist_fusion_filter/pose
664639
Value: true
665640
Enabled: true
666641
Name: EKF

0 commit comments

Comments
 (0)