Skip to content

Commit c018edd

Browse files
committed
Merge remote-tracking branch 'origin/beta/v3.1.0' into sync-beta/v3.1.0
2 parents dcad244 + 90a66ac commit c018edd

File tree

9 files changed

+30
-40
lines changed

9 files changed

+30
-40
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
stop_check_duration: 1.0
1717
nominal:
1818
vel_lim: 25.0
19-
reference_speed_points: [0.1, 0.2, 20.0, 30.0]
19+
reference_speed_points: [0.1, 0.3, 20.0, 30.0]
2020
steer_lim: [1.0, 1.0, 1.0, 0.8]
2121
steer_rate_lim: [1.0, 1.0, 1.0, 0.8]
2222
lon_acc_lim: [5.0, 5.0, 5.0, 4.0]
23-
lon_jerk_lim: [5.0, 5.0, 5.0, 4.0]
23+
lon_jerk_lim: [80.0, 5.0, 5.0, 4.0]
2424
lat_acc_lim: [5.0, 5.0, 5.0, 4.0]
2525
lat_jerk_lim: [7.0, 7.0, 7.0, 6.0]
2626
actual_steer_diff_lim: [1.0, 1.0, 1.0, 0.8]

autoware_launch/config/localization/ekf_localizer.param.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,5 @@
4242

4343
misc:
4444
# for velocity measurement limitation (Set 0.0 if you want to ignore)
45-
threshold_observable_velocity_mps: 0.5 # [m/s]
45+
threshold_observable_velocity_mps: 0.0 # [m/s]
4646
pose_frame_id: "map"

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: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
th_moving_time: 2.0 # [s]
2424
longitudinal_margin: 0.0 # [m]
2525
lateral_margin:
26-
soft_margin: 0.2 # [m]
26+
soft_margin: 0.7 # [m]
2727
hard_margin: 0.2 # [m]
28-
hard_margin_for_parked_vehicle: 0.7 # [m]
28+
hard_margin_for_parked_vehicle: 0.2 # [m]
2929
max_expand_ratio: 0.0 # [-] FOR DEVELOPER
3030
envelope_buffer_margin: 0.1 # [m] FOR DEVELOPER
3131
th_error_eclipse_long_radius : 0.6 # [m]
@@ -34,9 +34,9 @@
3434
th_moving_time: 2.0
3535
longitudinal_margin: 0.0
3636
lateral_margin:
37-
soft_margin: 0.2
37+
soft_margin: 0.7
3838
hard_margin: 0.2
39-
hard_margin_for_parked_vehicle: 0.7
39+
hard_margin_for_parked_vehicle: 0.2
4040
max_expand_ratio: 0.0
4141
envelope_buffer_margin: 0.1
4242
th_error_eclipse_long_radius : 0.6
@@ -45,9 +45,9 @@
4545
th_moving_time: 2.0
4646
longitudinal_margin: 0.0
4747
lateral_margin:
48-
soft_margin: 0.2
48+
soft_margin: 0.7
4949
hard_margin: 0.2
50-
hard_margin_for_parked_vehicle: 0.7
50+
hard_margin_for_parked_vehicle: 0.2
5151
max_expand_ratio: 0.0
5252
envelope_buffer_margin: 0.1
5353
th_error_eclipse_long_radius : 0.6
@@ -56,9 +56,9 @@
5656
th_moving_time: 2.0
5757
longitudinal_margin: 0.0
5858
lateral_margin:
59-
soft_margin: 0.2
59+
soft_margin: 0.7
6060
hard_margin: 0.2
61-
hard_margin_for_parked_vehicle: 0.7
61+
hard_margin_for_parked_vehicle: 0.2
6262
max_expand_ratio: 0.0
6363
envelope_buffer_margin: 0.1
6464
th_error_eclipse_long_radius : 0.6
@@ -261,7 +261,7 @@
261261

262262
# For stop maneuver
263263
stop:
264-
max_distance: 20.0 # [m]
264+
max_distance: 30.0 # [m]
265265
stop_buffer: 1.0 # [m] FOR DEVELOPER
266266

267267
policy:
@@ -274,7 +274,7 @@
274274
# but there is a possibility that the vehicle can't stop in front of the vehicle.
275275
# "reliable": insert stop or slow down point with ignoring decel/jerk constraints.
276276
# make it possible to increase chance to avoid but uncomfortable deceleration maybe happen.
277-
deceleration: "reliable" # [-]
277+
deceleration: "best_effort" # [-]
278278
# policy for avoidance lateral margin. select "best_effort" or "reliable".
279279
# "best_effort": output avoidance path with shorten lateral margin when there is no enough longitudinal
280280
# margin to avoid.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
arc_length_range: 2.0 # [m] arc length range where an expansion distance is initially applied
1717
ego:
1818
extra_wheelbase: 0.0 # [m] extra length to add to the wheelbase
19-
extra_front_overhang: 0.5 # [m] extra length to add to the front overhang
20-
extra_width: 1.0 # [m] extra length to add to the width
19+
extra_front_overhang: 0.0 # [m] extra length to add to the front overhang
20+
extra_width: 0.0 # [m] extra length to add to the width
2121
dynamic_objects:
2222
avoid: false # if true, the drivable area is not expanded in the predicted path of dynamic objects
2323
extra_footprint_offset:
Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,24 @@
11
/**:
22
ros__parameters:
33
out_of_lane: # module to stop or slowdown before overlapping another lane with other objects
4-
mode: ttc # mode used to consider a conflict with an object. "threshold", "intervals", or "ttc"
4+
mode: ttc # mode used to consider a conflict with an object. "threshold", or "ttc"
55
skip_if_already_overlapping: false # do not run this module when ego already overlaps another lane
66
ignore_overlaps_over_lane_changeable_lanelets: true # if true, overlaps on lane changeable lanelets are ignored
7+
max_arc_length: 100.0 # [m] maximum trajectory arc length that is checked for out_of_lane collisions
78

89
threshold:
910
time_threshold: 5.0 # [s] consider objects that will reach an overlap within this time
10-
intervals: # consider objects if their estimated time interval spent on the overlap intersect the estimated time interval of ego
11-
ego_time_buffer: 0.5 # [s] extend the ego time interval by this buffer
12-
objects_time_buffer: 0.5 # [s] extend the time intervals of objects by this buffer
1311
ttc:
14-
threshold: 3.0 # [s] consider objects with an estimated time to collision bellow this value while on the overlap
12+
threshold: 1.0 # [s] consider objects with an estimated time to collision bellow this value while on the overlap
1513

1614
objects:
1715
minimum_velocity: 0.5 # [m/s] objects lower than this velocity will be ignored
18-
use_predicted_paths: true # if true, use the predicted paths to estimate future positions.
19-
# if false, assume the object moves at constant velocity along *all* lanelets it currently is located in.
2016
predicted_path_min_confidence : 0.1 # when using predicted paths, ignore the ones whose confidence is lower than this value.
21-
distance_buffer: 1.0 # [m] distance buffer used to determine if a collision will occur in the other lane
2217
cut_predicted_paths_beyond_red_lights: true # if true, predicted paths are cut beyond the stop line of red traffic lights
2318
ignore_behind_ego: true # if true, objects behind the ego vehicle are ignored
2419

25-
overlap:
26-
minimum_distance: 0.0 # [m] minimum distance inside a lanelet for an overlap to be considered
27-
extra_length: 0.0 # [m] extra arc length to add to the front and back of an overlap (used to calculate enter/exit times)
28-
29-
action: # action to insert in the path if an object causes a conflict at an overlap
30-
skip_if_over_max_decel: true # if true, do not take an action that would cause more deceleration than the maximum allowed
31-
precision: 0.1 # [m] precision when inserting a stop pose in the path
20+
action: # action to insert in the trajectory if an object causes a conflict at an overlap
21+
precision: 0.1 # [m] precision when inserting a stop pose in the trajectory
3222
longitudinal_distance_buffer: 1.5 # [m] safety distance buffer to keep in front of the ego vehicle
3323
lateral_distance_buffer: 1.0 # [m] safety distance buffer to keep on the side of the ego vehicle
3424
min_duration: 1.0 # [s] minimum duration needed before a decision can be canceled
@@ -39,8 +29,8 @@
3929
distance_threshold: 15.0 # [m] insert a stop when closer than this distance from an overlap
4030

4131
ego:
42-
min_assumed_velocity: 2.0 # [m/s] minimum velocity used to calculate the enter and exit times of ego
43-
extra_front_offset: 0.0 # [m] extra front distance
44-
extra_rear_offset: 0.0 # [m] extra rear distance
45-
extra_right_offset: 0.0 # [m] extra right distance
46-
extra_left_offset: 0.0 # [m] extra left distance
32+
# extra footprint offsets to calculate out of lane collisions
33+
extra_front_offset: 0.0 # [m] extra footprint front distance
34+
extra_rear_offset: 0.0 # [m] extra footprint rear distance
35+
extra_right_offset: 0.0 # [m] extra footprint right distance
36+
extra_left_offset: 0.0 # [m] extra footprint left distance

autoware_launch/config/simulator/fault_injection.param.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,3 +191,4 @@
191191
OTHERS-005/left_upper: "dual_return_filter: /sensing/lidar/left_upper: visibility_validation"
192192
OTHERS-010: "emergency_vehicle_detector: emergency_vehicle"
193193
OTHERS-011: "daytime_monitor: daytime_status"
194+
OTHERS-012: "vehicle_stuck_checker: vehicle_stuck_check"

autoware_launch/config/system/system_diagnostic_monitor/sensing.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ units:
2929
- { type: link, link: /sensing/lidar/pndr/002-temperature-error }
3030
- { type: link, link: /sensing/lidar/pndr/003-ptp }
3131
- { type: link, link: /sensing/camera/001-connection }
32-
- { type: link, link: /sensing/radar/001-connection }
32+
# - { type: link, link: /sensing/radar/001-connection }
3333

3434
- path: /sensing/pull_over
3535
type: and
3636
list:
3737
- { type: link, link: /sensing/lidar/pndr/002-temperature }
38-
- { type: link, link: /sensing/gnss/001-connection-error }
38+
# - { type: link, link: /sensing/gnss/001-connection-error }
3939

4040
- path: /sensing/comfortable_stop
4141
type: and
@@ -126,7 +126,6 @@ units:
126126
type: diag
127127
node: imu_monitor
128128
name: yaw_rate_status
129-
type: diag
130129
timeout: 5.0
131130
- path: /sensing/imu/002-connection
132131
type: diag

autoware_launch/launch/autoware.launch.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<arg name="rviz_config" default="$(find-pkg-share autoware_launch)/rviz/autoware.rviz" description="rviz config"/>
4646
<arg name="rviz_respawn" default="true"/>
4747
<!-- Perception -->
48-
<arg name="perception_mode" default="camera_lidar_radar_fusion" description="select perception mode. camera_lidar_radar_fusion, camera_lidar_fusion, lidar_radar_fusion, lidar, radar"/>
48+
<arg name="perception_mode" default="camera_lidar_fusion" description="select perception mode. camera_lidar_radar_fusion, camera_lidar_fusion, lidar_radar_fusion, lidar, radar"/>
4949
<arg name="traffic_light_recognition/enable_fine_detection" default="true" description="enable traffic light fine detection"/>
5050
<arg name="centerpoint_model_path" default="/opt/autoware/mlmodels/centerpoint" description="path of centerpoint model file"/>
5151
<!-- Auto mode setting-->

autoware_launch/launch/autoware.main.launch.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<arg name="rviz_config" default="$(find-pkg-share autoware_launch)/rviz/autoware.rviz" description="rviz config"/>
4646
<arg name="rviz_respawn" default="true"/>
4747
<!-- Perception -->
48-
<arg name="perception_mode" default="camera_lidar_radar_fusion" description="select perception mode. camera_lidar_radar_fusion, camera_lidar_fusion, lidar_radar_fusion, lidar, radar"/>
48+
<arg name="perception_mode" default="camera_lidar_fusion" description="select perception mode. camera_lidar_radar_fusion, camera_lidar_fusion, lidar_radar_fusion, lidar, radar"/>
4949
<arg name="traffic_light_recognition/enable_fine_detection" default="true" description="enable traffic light fine detection"/>
5050
<arg name="centerpoint_model_path" default="/opt/autoware/mlmodels/centerpoint" description="path of centerpoint model file"/>
5151
<!-- Auto mode setting-->

0 commit comments

Comments
 (0)