Skip to content

Commit 5641698

Browse files
Merge pull request autowarefoundation#1003 from tier4/sync-tier4-upstream
chore: sync upstream
2 parents 6ba8e15 + f59ad91 commit 5641698

File tree

62 files changed

+14299
-83
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+14299
-83
lines changed

.github/workflows/build-and-test-differential.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
build-and-test-differential:
1818
needs: make-sure-label-is-present
1919
if: ${{ needs.make-sure-label-is-present.outputs.result == 'true' }}
20-
runs-on: ubuntu-latest
20+
runs-on: ubuntu-22.04
2121
container: ${{ matrix.container }}
2222
strategy:
2323
fail-fast: false

.github/workflows/build-and-test.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
jobs:
1010
build-and-test:
1111
if: ${{ github.event_name != 'push' || github.ref_name == github.event.repository.default_branch }}
12-
runs-on: ubuntu-latest
12+
runs-on: ubuntu-22.04
1313
container: ${{ matrix.container }}
1414
strategy:
1515
fail-fast: false

.github/workflows/cancel-previous-workflows.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55

66
jobs:
77
cancel-previous-workflows:
8-
runs-on: ubuntu-latest
8+
runs-on: ubuntu-22.04
99
steps:
1010
- name: Cancel previous runs
1111
uses: styfle/cancel-workflow-action@0.12.1

.github/workflows/github-release.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ on:
1515

1616
jobs:
1717
github-release:
18-
runs-on: ubuntu-latest
18+
runs-on: ubuntu-22.04
1919
steps:
2020
- name: Set tag name
2121
id: set-tag-name

.github/workflows/pr-labeler.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
label:
11-
runs-on: ubuntu-latest
11+
runs-on: ubuntu-22.04
1212
steps:
1313
- uses: actions/labeler@v4
1414
with:

.github/workflows/pre-commit-autoupdate.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
pre-commit-autoupdate:
1515
needs: check-secret
1616
if: ${{ needs.check-secret.outputs.set == 'true' }}
17-
runs-on: ubuntu-latest
17+
runs-on: ubuntu-22.04
1818
steps:
1919
- name: Generate token
2020
id: generate-token

.github/workflows/pre-commit-optional.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55

66
jobs:
77
pre-commit-optional:
8-
runs-on: ubuntu-latest
8+
runs-on: ubuntu-22.04
99
steps:
1010
- name: Check out repository
1111
uses: actions/checkout@v4

.github/workflows/pre-commit.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
jobs:
77
pre-commit:
88
if: ${{ github.event.repository.private }} # Use pre-commit.ci for public repositories
9-
runs-on: ubuntu-latest
9+
runs-on: ubuntu-22.04
1010
steps:
1111
- name: Generate token
1212
id: generate-token

.github/workflows/spell-check-differential.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55

66
jobs:
77
spell-check-differential:
8-
runs-on: ubuntu-latest
8+
runs-on: ubuntu-22.04
99
steps:
1010
- name: Check out repository
1111
uses: actions/checkout@v4

.github/workflows/sync-files.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
sync-files:
1515
needs: check-secret
1616
if: ${{ needs.check-secret.outputs.set == 'true' }}
17-
runs-on: ubuntu-latest
17+
runs-on: ubuntu-22.04
1818
steps:
1919
- name: Generate token
2020
id: generate-token

.github/workflows/update-codeowners-from-packages.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
update-codeowners-from-packages:
1515
needs: check-secret
1616
if: ${{ needs.check-secret.outputs.set == 'true' }}
17-
runs-on: ubuntu-latest
17+
runs-on: ubuntu-22.04
1818
steps:
1919
- name: Generate token
2020
id: generate-token

.github/workflows/update-sync-param-files.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
update-sync-param-files:
10-
runs-on: ubuntu-latest
10+
runs-on: ubuntu-22.04
1111
steps:
1212
- name: Generate token
1313
id: generate-token

.prettierignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
*.param.yaml
22
*.rviz
3+
**/diagnostic_graph_aggregator/

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

+8-8
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121
# Point cloud partitioning
2222
detection_range_min_height: 0.0
2323
detection_range_max_height_margin: 0.0
24-
voxel_grid_x: 0.05
25-
voxel_grid_y: 0.05
26-
voxel_grid_z: 100000.0
24+
voxel_grid_x: 0.1
25+
voxel_grid_y: 0.1
26+
voxel_grid_z: 0.5
2727

2828
# Point cloud cropping
29-
expand_width: 0.1
30-
path_footprint_extra_margin: 4.0
31-
speed_calculation_expansion_margin: 0.5
29+
expand_width: -0.2
30+
path_footprint_extra_margin: 1.0
31+
speed_calculation_expansion_margin: 0.7
3232

3333
# Point cloud clustering
3434
cluster_tolerance: 0.15 #[m]
@@ -37,10 +37,10 @@
3737
maximum_cluster_size: 10000
3838

3939
# RSS distance collision check
40-
longitudinal_offset: 2.0
40+
longitudinal_offset: 1.0
4141
t_response: 1.0
4242
a_ego_min: -3.0
4343
a_obj_min: -1.0
44-
collision_keeping_sec: 2.0
44+
collision_keeping_sec: 3.0
4545
previous_obstacle_keep_time: 1.0
4646
aeb_hz: 10.0
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
/**:
2+
ros__parameters:
3+
use_pointcloud: false # use pointcloud as obstacle check
4+
use_dynamic_object: true # use dynamic object as obstacle check
5+
collision_distance: 0.1 # Distance at which an object is determined to have collided with ego [m]
6+
nearby_filter_radius: 5.0 # Radius to filter nearby objects [m]
7+
keep_ignoring_time: 10.0 # Time to keep filtering objects that first appeared in the vicinity
8+
nearby_object_type_filters: # Classes subject to filtering for objects first appearing in the vicinity
9+
filter_car: false
10+
filter_truck: false
11+
filter_bus: false
12+
filter_trailer: false
13+
filter_bicycle: false
14+
filter_motorcycle: false
15+
filter_pedestrian: false
16+
filter_unknown: true

autoware_launch/config/control/control_validator/control_validator.param.yaml

+6-2
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,9 @@
99

1010
thresholds:
1111
max_distance_deviation: 1.0
12-
max_reverse_velocity: 0.2
13-
max_over_velocity_ratio: 0.1
12+
rolling_back_velocity: 0.5
13+
over_velocity_offset: 2.0
14+
over_velocity_ratio: 0.2
15+
16+
vel_lpf_gain: 0.9 # Time constant 0.33
17+
hold_velocity_error_until_stop: true

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# state transition
1212
drive_state_stop_dist: 0.5
1313
drive_state_offset_stop_dist: 1.0
14-
stopping_state_stop_dist: 0.5
14+
stopping_state_stop_dist: 0.49
1515
stopped_state_entry_duration_time: 0.1
1616
stopped_state_entry_vel: 0.01
1717
stopped_state_entry_acc: 0.1

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# state transition
1212
drive_state_stop_dist: 0.5
1313
drive_state_offset_stop_dist: 1.0
14-
stopping_state_stop_dist: 0.5
14+
stopping_state_stop_dist: 0.49
1515
stopped_state_entry_duration_time: 0.1
1616
stopped_state_entry_vel: 0.01
1717
stopped_state_entry_acc: 0.1

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# state transition
1212
drive_state_stop_dist: 0.5
1313
drive_state_offset_stop_dist: 1.0
14-
stopping_state_stop_dist: 0.5
14+
stopping_state_stop_dist: 0.49
1515
stopped_state_entry_duration_time: 0.1
1616
stopped_state_entry_vel: 0.01
1717
stopped_state_entry_acc: 0.1

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# state transition
1212
drive_state_stop_dist: 0.5
1313
drive_state_offset_stop_dist: 1.0
14-
stopping_state_stop_dist: 0.5
14+
stopping_state_stop_dist: 0.49
1515
stopped_state_entry_duration_time: 0.1
1616
stopped_state_entry_vel: 0.01
1717
stopped_state_entry_acc: 0.1

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# state transition
1212
drive_state_stop_dist: 0.5
1313
drive_state_offset_stop_dist: 1.0
14-
stopping_state_stop_dist: 0.5
14+
stopping_state_stop_dist: 0.49
1515
stopped_state_entry_duration_time: 0.1
1616
stopped_state_entry_vel: 0.01
1717
stopped_state_entry_acc: 0.1

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# state transition
1212
drive_state_stop_dist: 0.5
1313
drive_state_offset_stop_dist: 1.0
14-
stopping_state_stop_dist: 0.5
14+
stopping_state_stop_dist: 0.49
1515
stopped_state_entry_duration_time: 0.1
1616
stopped_state_entry_vel: 0.01
1717
stopped_state_entry_acc: 0.1

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# state transition
1212
drive_state_stop_dist: 0.5
1313
drive_state_offset_stop_dist: 1.0
14-
stopping_state_stop_dist: 0.5
14+
stopping_state_stop_dist: 0.49
1515
stopped_state_entry_duration_time: 0.1
1616
stopped_state_entry_vel: 0.01
1717
stopped_state_entry_acc: 0.1

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# state transition
1212
drive_state_stop_dist: 0.5
1313
drive_state_offset_stop_dist: 1.0
14-
stopping_state_stop_dist: 0.5
14+
stopping_state_stop_dist: 0.49
1515
stopped_state_entry_duration_time: 0.1
1616
stopped_state_entry_vel: 0.01
1717
stopped_state_entry_acc: 0.1

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# state transition
1212
drive_state_stop_dist: 0.5
1313
drive_state_offset_stop_dist: 1.0
14-
stopping_state_stop_dist: 0.5
14+
stopping_state_stop_dist: 0.49
1515
stopped_state_entry_duration_time: 0.1
1616
stopped_state_entry_vel: 0.01
1717
stopped_state_entry_acc: 0.1

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# state transition
1212
drive_state_stop_dist: 0.5
1313
drive_state_offset_stop_dist: 1.0
14-
stopping_state_stop_dist: 0.5
14+
stopping_state_stop_dist: 0.49
1515
stopped_state_entry_duration_time: 0.1
1616
stopped_state_entry_vel: 0.01
1717
stopped_state_entry_acc: 0.1

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# state transition
1212
drive_state_stop_dist: 0.5
1313
drive_state_offset_stop_dist: 1.0
14-
stopping_state_stop_dist: 0.5
14+
stopping_state_stop_dist: 0.49
1515
stopped_state_entry_duration_time: 0.1
1616
stopped_state_entry_vel: 0.01
1717
stopped_state_entry_acc: 0.1

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# state transition
1212
drive_state_stop_dist: 0.5
1313
drive_state_offset_stop_dist: 1.0
14-
stopping_state_stop_dist: 0.5
14+
stopping_state_stop_dist: 0.49
1515
stopped_state_entry_duration_time: 0.1
1616
stopped_state_entry_vel: 0.01
1717
stopped_state_entry_acc: 0.1

autoware_launch/config/localization/ekf_localizer.param.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
enable_yaw_bias_estimation: false
66
predict_frequency: 50.0
77
tf_rate: 50.0
8-
publish_tf: true
98
extend_state_step: 50
109

1110
pose_measurement:

autoware_launch/config/perception/object_recognition/detection/image_projection_based_fusion/fusion_common.param.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
timeout_ms: 70.0
55
match_threshold_ms: 50.0
66
image_buffer_size: 15
7+
point_project_to_unrectified_image: false
78
debug_mode: false
89
filter_scope_min_x: -100.0
910
filter_scope_min_y: -100.0

autoware_launch/config/perception/object_recognition/detection/pointcloud_filter/pointcloud_map_filter.param.yaml

+4-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
publish_debug_pcd: False
1515

1616
# use dynamic map loading
17-
use_dynamic_map_loading: True
17+
use_dynamic_map_loading: False
1818

1919
# time interval to check dynamic map loading
2020
timer_interval_ms: 100
@@ -24,3 +24,6 @@
2424

2525
# radius map for dynamic map loading
2626
map_loader_radius: 150.0
27+
28+
# Threshold of grid size to split map pointcloud
29+
max_map_grid_size: 100.0

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
grid_length_y: 70.0
1313
grid_position_x: 0.0
1414
grid_position_y: 0.0
15-
maximum_lidar_height_thres: 0.3
16-
minimum_lidar_height_thres: -2.2
15+
maximum_lidar_height_thres: 2.5 # [m] when use_points is true, ignore points with a z value above this (in the vehicle_frame)
16+
minimum_lidar_height_thres: 0.0 # [m] when use_points is true, ignore points with a z value bellow this (in the vehicle_frame)
1717
use_wayarea: true
1818
use_parkinglot: true
1919
use_objects: true

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
maximum_jerk: 1.0
6060
path_priority: "efficient_path" # "efficient_path" or "close_goal"
6161
efficient_path_order: ["SHIFT", "ARC_FORWARD", "ARC_BACKWARD"] # only lane based pull over(exclude freespace parking)
62-
lane_departure_check_expansion_margin: 0.0
62+
lane_departure_check_expansion_margin: 0.2
6363

6464
# shift parking
6565
shift_parking:
@@ -73,21 +73,21 @@
7373
# parallel parking path
7474
parallel_parking:
7575
path_interval: 1.0
76-
max_steer_angle: 0.35 # 20deg
76+
max_steer_angle: 0.4 #22.9deg
7777
forward:
7878
enable_arc_forward_parking: true
7979
after_forward_parking_straight_distance: 2.0
8080
forward_parking_velocity: 1.38
8181
forward_parking_lane_departure_margin: 0.0
8282
forward_parking_path_interval: 1.0
83-
forward_parking_max_steer_angle: 0.35 # 20deg
83+
forward_parking_max_steer_angle: 0.4 # 22.9deg
8484
backward:
8585
enable_arc_backward_parking: true
8686
after_backward_parking_straight_distance: 2.0
8787
backward_parking_velocity: -1.38
8888
backward_parking_lane_departure_margin: 0.0
8989
backward_parking_path_interval: 1.0
90-
backward_parking_max_steer_angle: 0.35 # 20deg
90+
backward_parking_max_steer_angle: 0.4 # 22.9deg
9191

9292
# freespace parking
9393
freespace_parking:

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
@@ -6,6 +6,7 @@
66

77
backward_length_buffer_for_end_of_lane: 3.0 # [m]
88
backward_length_buffer_for_blocking_object: 3.0 # [m]
9+
backward_length_from_intersection: 5.0 # [m]
910

1011
lane_changing_lateral_jerk: 0.5 # [m/s3]
1112

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,14 @@
4343
lane_departure_margin: 0.2
4444
lane_departure_check_expansion_margin: 0.0
4545
backward_velocity: -1.0
46-
pull_out_max_steer_angle: 0.26 # 15deg
46+
pull_out_max_steer_angle: 0.4 # 22.9deg
4747
# search start pose backward
4848
enable_back: true
4949
search_priority: "short_back_distance" # "efficient_path" or "short_back_distance"
5050
max_back_distance: 8.0
5151
backward_search_resolution: 2.0
5252
backward_path_update_duration: 3.0
53-
ignore_distance_from_lane_end: 15.0
53+
ignore_distance_from_lane_end: 0.0
5454
# turns signal
5555
prepare_time_before_start: 0.0
5656
# freespace planner

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
@@ -80,7 +80,7 @@
8080
# param for occlusions
8181
occlusion:
8282
enable: true # if true, ego will slowdown around crosswalks that are occluded
83-
occluded_object_velocity: 1.0 # [m/s] assumed velocity of objects that may come out of the occluded space
83+
occluded_object_velocity: 2.0 # [m/s] assumed velocity of objects that may come out of the occluded space
8484
slow_down_velocity: 1.0 # [m/s]
8585
time_buffer: 0.5 # [s] consecutive time with/without an occlusion to add/remove the slowdown
8686
min_size: 1.0 # [m] minimum size of an occlusion (square side size)

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

+1
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@
99
hold_stop_margin_distance: 0.0
1010
distance_to_judge_over_stop_line: 0.5
1111
enable_rtc: false # if true, the scene modules should be approved by (request to cooperate)rtc function. if false, the module can be run without approval from rtc.
12+
suppress_pass_judge_when_stopping: false

0 commit comments

Comments
 (0)