Skip to content

Commit c46bcdc

Browse files
Merge pull request #530 from tier4/beta-to-tier4-main-sync
chore: sync beta branch beta/v0.32.0 with tier4/main
2 parents f302186 + 9e4c30c commit c46bcdc

File tree

19 files changed

+81
-56
lines changed

19 files changed

+81
-56
lines changed

.github/CODEOWNERS

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@ autoware_launch/** [email protected] [email protected] yukihiro.saito@ti
55
# /**
66
# .github/**
77
8-
8+
99
1010
1111
autoware_launch/config/perception/** [email protected] [email protected] [email protected]
12-
12+
1313
1414
autoware_launch/config/system/** [email protected] [email protected]
15-
15+
1616
autoware_launch/launch/components/tier4_autoware_api_component.launch.xml [email protected]
17-
autoware_launch/launch/components/tier4_control_component.launch.xml [email protected] [email protected] [email protected] [email protected]
17+
1818
1919
2020
autoware_launch/launch/components/tier4_perception_component.launch.xml [email protected] [email protected] [email protected]
21-
autoware_launch/launch/components/tier4_planning_component.launch.xml [email protected] [email protected] [email protected] [email protected]
21+
2222
autoware_launch/launch/components/tier4_sensing_component.launch.xml [email protected] [email protected] [email protected]
2323
autoware_launch/launch/components/tier4_simulator_component.launch.xml [email protected] [email protected] [email protected] [email protected]
2424
autoware_launch/launch/components/tier4_system_component.launch.xml [email protected] [email protected] [email protected] [email protected]

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
ros__parameters:
33
# Ego path calculation
44
use_predicted_trajectory: true
5-
use_imu_path: false
5+
use_imu_path: true
66
use_pointcloud_data: true
77
use_predicted_object_data: false
88
use_object_velocity_calculation: true
99
min_generated_path_length: 0.5
1010
imu_prediction_time_horizon: 1.5
1111
imu_prediction_time_interval: 0.1
12-
mpc_prediction_time_horizon: 1.5
12+
mpc_prediction_time_horizon: 4.5
1313
mpc_prediction_time_interval: 0.1
1414

1515
# Debug
@@ -29,7 +29,7 @@
2929

3030
# Point cloud clustering
3131
cluster_tolerance: 0.15 #[m]
32-
cluster_minimum_height: 0.0
32+
cluster_minimum_height: 0.1
3333
minimum_cluster_size: 10
3434
maximum_cluster_size: 10000
3535

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/**:
22
ros__parameters:
3-
43
# If the number of consecutive invalid predicted_path exceeds this threshold, the Diag will be set to ERROR.
54
# (For example, threshold = 1 means, even if the predicted_path is invalid, Diag will not be ERROR if
65
# the next predicted_path is valid.)
@@ -10,3 +9,5 @@
109

1110
thresholds:
1211
max_distance_deviation: 1.0
12+
max_reverse_velocity: 0.2
13+
max_over_velocity_ratio: 0.1

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,11 @@
5353

5454
# stopped state
5555
stopped_vel: 0.0
56-
stopped_acc: -3.4
57-
stopped_jerk: -5.0
56+
stopped_acc: -3.4 # denotes pedal position
5857

5958
# emergency state
6059
emergency_vel: 0.0
61-
emergency_acc: -5.0
60+
emergency_acc: -5.0 # denotes acceleration
6261
emergency_jerk: -3.0
6362

6463
# acceleration limit
@@ -68,6 +67,7 @@
6867
# jerk limit
6968
max_jerk: 2.0
7069
min_jerk: -5.0
70+
max_acc_cmd_diff: 50.0 # [m/s^2 * s^-1]
7171

7272
# slope compensation
7373
lpf_pitch_gain: 0.95

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
ros__parameters:
33
update_rate: 10.0
44
system_emergency_heartbeat_timeout: 0.5
5-
use_emergency_handling: false
5+
use_emergency_handling: true
66
check_external_emergency_heartbeat: $(var check_external_emergency_heartbeat)
77
use_start_request: false
88
enable_cmd_limit_filter: true
@@ -16,14 +16,14 @@
1616
stop_check_duration: 1.0
1717
nominal:
1818
vel_lim: 25.0
19-
reference_speed_points: [20.0, 30.0]
20-
steer_lim: [1.0, 0.8]
21-
steer_rate_lim: [1.0, 0.8]
22-
lon_acc_lim: [5.0, 4.0]
23-
lon_jerk_lim: [5.0, 4.0]
24-
lat_acc_lim: [5.0, 4.0]
25-
lat_jerk_lim: [7.0, 6.0]
26-
actual_steer_diff_lim: [1.0, 0.8]
19+
reference_speed_points: [0.1, 0.3, 20.0, 30.0]
20+
steer_lim: [1.0, 1.0, 1.0, 0.8]
21+
steer_rate_lim: [1.0, 1.0, 1.0, 0.8]
22+
lon_acc_lim: [5.0, 5.0, 5.0, 4.0]
23+
lon_jerk_lim: [80.0, 5.0, 5.0, 4.0] # The first element is required for quick pedal changes when stopping and starting.
24+
lat_acc_lim: [5.0, 5.0, 5.0, 4.0]
25+
lat_jerk_lim: [7.0, 7.0, 7.0, 6.0]
26+
actual_steer_diff_lim: [1.0, 1.0, 1.0, 0.8]
2727
on_transition:
2828
vel_lim: 50.0
2929
reference_speed_points: [20.0, 30.0]

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,10 @@
117117
initial_pose_offset_model_y: [0.5, -0.5, 0.0, 0.0, 0.0, 0.0]
118118

119119
# In MULTI_NDT_SCORE, the parameter that adjusts the estimated 2D covariance
120-
temperature: 0.1
120+
temperature: 0.05
121+
122+
# Scale value for adjusting the estimated covariance by a constant multiplication
123+
scale_factor: 1.0
121124

122125

123126
dynamic_map_loading:

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
@@ -7,7 +7,7 @@
77
activate_by_scenario: False
88
grid_min_value: 0.0
99
grid_max_value: 1.0
10-
grid_resolution: 0.2
10+
grid_resolution: 0.3
1111
grid_length_x: 70.0
1212
grid_length_y: 70.0
1313
grid_position_x: 0.0

autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/autoware_behavior_path_dynamic_obstacle_avoidance_module/dynamic_obstacle_avoidance.param.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
lat_offset_from_obstacle: 1.0 # [m]
5959
margin_distance_around_pedestrian: 2.0 # [m]
6060
predicted_path:
61-
end_time_to_consider: 3.0 # [s]
61+
end_time_to_consider: 2.0 # [s]
6262
threshold_confidence: 0.0 # [] not probability
6363
max_lat_offset_to_avoid: 0.5 # [m]
6464
max_time_for_object_lat_shift: 0.0 # [s]

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: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,8 @@
243243
# For cancel maneuver
244244
cancel:
245245
enable: true # [-]
246+
force:
247+
duration_time: 2.0 # [s]
246248

247249
# For yield maneuver
248250
yield:

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
enabled: true
1111
print_runtime: false
1212
max_expansion_distance: 0.0 # [m] maximum distance by which the drivable area can be expended (0.0 means no limit)
13+
min_bound_interval: 1.0 # [m] minimum interval between two consecutive bound points (before expansion)
1314
smoothing:
1415
curvature_average_window: 3 # window size used for smoothing the curvatures using a moving window average
1516
max_bound_rate: 1.0 # [m/m] maximum rate of change of the bound lateral distance over its arc length

0 commit comments

Comments
 (0)