Skip to content
This repository has been archived by the owner on Mar 27, 2023. It is now read-only.

chore: sync awf-latest-xx1 #686

Merged
merged 3 commits into from
Jan 16, 2023
Merged

chore: sync awf-latest-xx1 #686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b36fb9
feat(planning_launch): add new param for yield maneuver in avoidance.…
satoshi-ota Jan 12, 2023
3ef3d29
feat(behavior_path_planner): add types to skip in drivable_area_expan…
maxime-clem Jan 13, 2023
90f7743
feat: remove overlap with tier4_autoware_api_launch (#589)
isamu-takagi Jan 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 5 additions & 34 deletions autoware_api_launch/launch/autoware_api.launch.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,9 @@
<launch>

<arg name="respawn" default="true" />
<arg name="launch_default_ad_api" default="true"/>
<arg name="max_message_size" default="1000000000" />

<!-- AD API -->
<group if="$(var launch_default_ad_api)">
<include file="$(find-pkg-share default_ad_api)/launch/default_ad_api.launch.py"/>
</group>

<!-- awapi (deprecated) -->
<group>
<include file="$(find-pkg-share awapi_awiv_adapter)/launch/awapi_awiv_adapter.launch.xml"/>
</group>

<!-- autoware api adaptor -->
<group>
<push-ros-namespace namespace="autoware_api"/>
<include file="$(find-pkg-share autoware_api_launch)/launch/include/external_api_adaptor.launch.py"/>
<include file="$(find-pkg-share autoware_api_launch)/launch/include/internal_api_adaptor.launch.py"/>
<include file="$(find-pkg-share autoware_api_launch)/launch/include/internal_api_relay.launch.xml"/>
</group>

<!-- autoware api utils -->
<!-- forwarding options -->
<arg name="launch_deprecated_api" default="true"/>
<arg name="rosbridge_enabled" default="true"/>
<arg name="rosbridge_max_message_size" default="1000000000"/>
<group>
<push-ros-namespace namespace="autoware_api/utils"/>
<include file="$(find-pkg-share path_distance_calculator)/launch/path_distance_calculator.launch.xml"/>
<include file="$(find-pkg-share tier4_autoware_api_launch)/launch/autoware_api.launch.xml"/>
</group>

<!-- rosbridge -->
<!-- TODO: respawn will work once https://github.com/ros2/launch/pull/569 is released. I'll delete this comment when it's done. -->
<include file="$(find-pkg-share rosbridge_server)/launch/rosbridge_websocket_launch.xml">
<arg name="respawn" value="$(var respawn)"/>
<arg name="max_message_size" value="$(var max_message_size)"/>
</include>

</launch>
60 changes: 0 additions & 60 deletions autoware_api_launch/launch/include/external_api_adaptor.launch.py
View file
Open in desktop

This file was deleted.

44 changes: 0 additions & 44 deletions autoware_api_launch/launch/include/internal_api_adaptor.launch.py
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions autoware_api_launch/launch/include/internal_api_relay.launch.xml
View file
Open in desktop

This file was deleted.

15 changes: 3 additions & 12 deletions autoware_launch/launch/autoware.launch.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,17 +134,8 @@
<include file="$(find-pkg-share autoware_api_launch)/launch/autoware_api.launch.xml"/>
</group>

<!-- Tools -->
<group>
<!-- Rviz -->
<node
pkg="rviz2"
exec="rviz2"
name="rviz2"
output="screen"
args="-d $(var rviz_config) -s $(find-pkg-share autoware_launch)/rviz/image/autoware.png"
if="$(var rviz)"
/>
<include file="$(find-pkg-share ad_api_adaptors)/launch/rviz_adaptors.launch.xml" if="$(var rviz)"/>
<!-- Rviz -->
<group if="$(var rviz)">
<node pkg="rviz2" exec="rviz2" name="rviz2" output="screen" args="-d $(var rviz_config) -s $(find-pkg-share autoware_launch)/rviz/image/autoware.png"/>
</group>
</launch>
150 changes: 85 additions & 65 deletions ...nning/lane_driving/behavior_planning/behavior_path_planner/avoidance/avoidance.param.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,75 +2,26 @@
/**:
ros__parameters:
avoidance:
resample_interval_for_planning: 0.3
resample_interval_for_output: 4.0
detection_area_right_expand_dist: 0.0
detection_area_left_expand_dist: 1.0

resample_interval_for_planning: 0.3 # [m]
resample_interval_for_output: 4.0 # [m]
detection_area_right_expand_dist: 0.0 # [m]
detection_area_left_expand_dist: 1.0 # [m]
drivable_area_right_bound_offset: 0.0 # [m]
drivable_area_left_bound_offset: 0.0 # [m]
object_envelope_buffer: 0.3 # [m]

# avoidance module common setting
enable_bound_clipping: false
enable_avoidance_over_same_direction: true
enable_avoidance_over_opposite_direction: true
enable_update_path_when_object_is_gone: false
enable_safety_check: false

# For target object filtering
threshold_speed_object_is_stopped: 1.0 # [m/s]
threshold_time_object_is_moving: 1.0 # [s]

object_check_forward_distance: 150.0 # [m]
object_check_backward_distance: 2.0 # [m]
object_check_goal_distance: 20.0 # [m]

threshold_distance_object_is_on_center: 1.0 # [m]

object_check_shiftable_ratio: 0.6 # [-]
object_check_min_road_shoulder_width: 0.5 # [m]

# For safety check
safety_check_backward_distance: 50.0 # [m]
safety_check_time_horizon: 10.0 # [s]
safety_check_idling_time: 1.5 # [s]
safety_check_accel_for_rss: 2.5 # [m/ss]

# For lateral margin
object_envelope_buffer: 0.3 # [m]
lateral_collision_margin: 1.0 # [m]
lateral_collision_safety_buffer: 0.7 # [m]

# For longitudinal margin
longitudinal_collision_margin_buffer: 0.0 # [m]

prepare_time: 2.0 # [s]
min_prepare_distance: 1.0 # [m]
min_avoidance_distance: 10.0 # [m]

min_nominal_avoidance_speed: 7.0 # [m/s]
min_sharp_avoidance_speed: 1.0 # [m/s]

road_shoulder_safety_margin: 0.0 # [m]

max_right_shift_length: 5.0
max_left_shift_length: 5.0

nominal_lateral_jerk: 0.2 # [m/s3]
max_lateral_jerk: 1.0 # [m/s3]

object_last_seen_threshold: 2.0

# For prevention of large acceleration while avoidance
min_avoidance_speed_for_acc_prevention: 3.0 # [m/s]
max_avoidance_acceleration: 0.5 # [m/ss]

# bound clipping for objects
enable_bound_clipping: false
enable_yield_maneuver: false

# for debug
publish_debug_marker: false
print_debug_info: false

# not enabled yet
longitudinal_collision_margin_min_distance: 0.0 # [m]
longitudinal_collision_margin_time: 0.0

# avoidance is performed for the object type with true
target_object:
car: true
Expand All @@ -82,11 +33,80 @@
motorcycle: false
pedestrian: false

# ---------- advanced parameters ----------
avoidance_execution_lateral_threshold: 0.499
# For target object filtering
target_filtering:
# filtering moving objects
threshold_speed_object_is_stopped: 1.0 # [m/s]
threshold_time_object_is_moving: 1.0 # [s]
# detection range
object_check_forward_distance: 150.0 # [m]
object_check_backward_distance: 2.0 # [m]
object_check_goal_distance: 20.0 # [m]
# filtering parking objects
threshold_distance_object_is_on_center: 1.0 # [m]
object_check_shiftable_ratio: 0.6 # [-]
object_check_min_road_shoulder_width: 0.5 # [m]
# lost object compensation
object_last_seen_threshold: 2.0

# For safety check
safety_check:
safety_check_backward_distance: 50.0 # [m]
safety_check_time_horizon: 10.0 # [s]
safety_check_idling_time: 1.5 # [s]
safety_check_accel_for_rss: 2.5 # [m/ss]
safety_check_hysteresis_factor: 2.0 # [-]

# For avoidance maneuver
avoidance:
# avoidance lateral parameters
lateral:
lateral_collision_margin: 1.0 # [m]
lateral_collision_safety_buffer: 0.7 # [m]
lateral_passable_safety_buffer: 0.0 # [m]
road_shoulder_safety_margin: 0.0 # [m]
avoidance_execution_lateral_threshold: 0.499
max_right_shift_length: 5.0
max_left_shift_length: 5.0
# avoidance distance parameters
longitudinal:
prepare_time: 2.0 # [s]
longitudinal_collision_safety_buffer: 0.0 # [m]
min_prepare_distance: 1.0 # [m]
min_avoidance_distance: 10.0 # [m]
min_nominal_avoidance_speed: 7.0 # [m/s]
min_sharp_avoidance_speed: 1.0 # [m/s]

# For yield maneuver
yield:
yield_velocity: 2.78 # [m/s]

# For stop maneuver
stop:
min_distance: 10.0 # [m]
max_distance: 20.0 # [m]

constraints:
# vehicle slows down under longitudinal constraints
use_constraints_for_decel: false # [-]

# lateral constraints
lateral:
nominal_lateral_jerk: 0.2 # [m/s3]
max_lateral_jerk: 1.0 # [m/s3]

# longitudinal constraints
longitudinal:
nominal_deceleration: -1.0 # [m/ss]
nominal_jerk: 0.5 # [m/sss]
max_deceleration: -2.0 # [m/ss]
max_jerk: 1.0
# For prevention of large acceleration while avoidance
min_avoidance_speed_for_acc_prevention: 3.0 # [m/s]
max_avoidance_acceleration: 0.5 # [m/ss]

target_velocity_matrix:
col_size: 4
col_size: 2
matrix:
[2.78, 5.56, 11.1, 13.9, # velocity [m/s]
0.20, 0.90, 1.10, 1.20] # margin [m]
[2.78, 13.9, # velocity [m/s]
0.50, 1.00] # margin [m]
6 changes: 6 additions & 0 deletions ...g/lane_driving/behavior_planning/behavior_path_planner/drivable_area_expansion.param.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,24 @@
avoidance:
drivable_area_right_bound_offset: 0.0
drivable_area_left_bound_offset: 0.0
drivable_area_types_to_skip: [road_border]
lane_change:
drivable_area_right_bound_offset: 0.0
drivable_area_left_bound_offset: 0.0
drivable_area_types_to_skip: [road_border]
lane_following:
drivable_area_right_bound_offset: 0.0
drivable_area_left_bound_offset: 0.0
drivable_area_types_to_skip: [road_border]
pull_out:
drivable_area_right_bound_offset: 0.0
drivable_area_left_bound_offset: 0.0
drivable_area_types_to_skip: [road_border]
pull_over:
drivable_area_right_bound_offset: 0.0
drivable_area_left_bound_offset: 0.0
drivable_area_types_to_skip: [road_border]
side_shift:
drivable_area_right_bound_offset: 0.0
drivable_area_left_bound_offset: 0.0
drivable_area_types_to_skip: [road_border]