Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: sync awf/autoware_launch #180

Merged
merged 4 commits into from
Jun 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<Action ID="GoalPlanner_Plan" output="{output}"/>
</ReactiveSequence>
<ReactiveSequence>
<Condition ID="PullOut_Request"/>
<Action ID="PullOut_Plan" output="{output}"/>
<Condition ID="StartPlanner_Request"/>
<Action ID="StartPlanner_Plan" output="{output}"/>
</ReactiveSequence>
<ReactiveSequence>
<Condition ID="SideShift_Request"/>
Expand Down Expand Up @@ -70,10 +70,10 @@
<output_port name="output_candidate" type="boost::optional&lt;tier4_planning_msgs::PathWithLaneId_&lt;std::allocator&lt;void&gt; &gt; &gt;">desc</output_port>
</Action>
<Condition ID="LaneFollowing_Request"/>
<Action ID="PullOut_Plan">
<Action ID="StartPlanner_Plan">
<output_port name="output"/>
</Action>
<Condition ID="PullOut_Request"/>
<Condition ID="StartPlanner_Request"/>
<Action ID="GoalPlanner_Plan">
<output_port name="output" type="behavior_path_planner::BehaviorModuleOutput">desc</output_port>
</Action>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<Action ID="GoalPlanner_Plan" output="{output}"/>
</ReactiveSequence>
<ReactiveSequence>
<Condition ID="PullOut_Request"/>
<Action ID="PullOut_Plan" output="{output}"/>
<Condition ID="StartPlanner_Request"/>
<Action ID="StartPlanner_Plan" output="{output}"/>
</ReactiveSequence>
<ReactiveSequence>
<Condition ID="LaneChange_Request"/>
Expand Down Expand Up @@ -62,10 +62,10 @@
<output_port name="output_candidate" type="boost::optional&lt;tier4_planning_msgs::PathWithLaneId_&lt;std::allocator&lt;void&gt; &gt; &gt;">desc</output_port>
</Action>
<Condition ID="LaneFollowing_Request"/>
<Action ID="PullOut_Plan">
<Action ID="StartPlanner_Plan">
<output_port name="output"/>
</Action>
<Condition ID="PullOut_Request"/>
<Condition ID="StartPlanner_Request"/>
<Action ID="GoalPlanner_Plan">
<output_port name="output" type="behavior_path_planner::BehaviorModuleOutput">desc</output_port>
</Action>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
<Action ID="GoalPlanner_Plan" output="{output}"/>
</ReactiveSequence>
<ReactiveSequence>
<Condition ID="PullOut_Request"/>
<Condition ID="PullOut_Ready"/>
<Action ID="PullOut_Plan" output="{output}"/>
<Condition ID="StartPlanner_Request"/>
<Condition ID="StartPlanner_Ready"/>
<Action ID="StartPlanner_Plan" output="{output}"/>
</ReactiveSequence>
<ReactiveSequence>
<Condition ID="LaneChange_Request"/>
Expand Down Expand Up @@ -73,11 +73,11 @@
</Action>
<Condition ID="LaneFollowing_Ready"/>
<Condition ID="LaneFollowing_Request"/>
<Action ID="PullOut_Plan">
<Action ID="StartPlanner_Plan">
<output_port name="output"/>
</Action>
<Condition ID="PullOut_Ready"/>
<Condition ID="PullOut_Request"/>
<Condition ID="StartPlanner_Ready"/>
<Condition ID="StartPlanner_Request"/>
<Action ID="GoalPlanner_Plan">
<output_port name="output" type="behavior_path_planner::BehaviorModuleOutput">desc</output_port>
</Action>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<Action ID="GoalPlanner_Plan" output="{output}"/>
</ReactiveSequence>
<ReactiveSequence>
<Condition ID="PullOut_Request"/>
<Action ID="PullOut_Plan" output="{output}"/>
<Condition ID="StartPlanner_Request"/>
<Action ID="StartPlanner_Plan" output="{output}"/>
</ReactiveSequence>
<ReactiveSequence>
<Condition ID="SideShift_Request"/>
Expand Down Expand Up @@ -57,10 +57,10 @@
<output_port name="output" type="boost::optional&lt;tier4_planning_msgs::PathWithLaneId_&lt;std::allocator&lt;void&gt; &gt; &gt;">desc</output_port>
</Action>
<Condition ID="LaneFollowing_Request"/>
<Action ID="PullOut_Plan">
<Action ID="StartPlanner_Plan">
<output_port name="output"/>
</Action>
<Condition ID="PullOut_Request"/>
<Condition ID="StartPlanner_Request"/>
<Action ID="GoalPlanner_Plan">
<output_port name="output" type="behavior_path_planner::BehaviorModuleOutput">desc</output_port>
</Action>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,55 +5,63 @@
ros__parameters:
external_request_lane_change_left:
enable_module: false
enable_rtc: true
enable_simultaneous_execution_as_approved_module: false
enable_simultaneous_execution_as_candidate_module: true
priority: 7
max_module_size: 1

external_request_lane_change_right:
enable_module: false
enable_rtc: true
enable_simultaneous_execution_as_approved_module: false
enable_simultaneous_execution_as_candidate_module: true
priority: 7
max_module_size: 1

lane_change_left:
enable_module: true
enable_rtc: true
enable_simultaneous_execution_as_approved_module: true
enable_simultaneous_execution_as_candidate_module: true
priority: 6
max_module_size: 1

lane_change_right:
enable_module: true
enable_rtc: true
enable_simultaneous_execution_as_approved_module: true
enable_simultaneous_execution_as_candidate_module: true
priority: 6
max_module_size: 1

pull_out:
start_planner:
enable_module: true
enable_rtc: true
enable_simultaneous_execution_as_approved_module: true
enable_simultaneous_execution_as_candidate_module: false
priority: 0
max_module_size: 1

side_shift:
enable_module: true
enable_rtc: true
enable_simultaneous_execution_as_approved_module: false
enable_simultaneous_execution_as_candidate_module: false
priority: 2
max_module_size: 1

goal_planner:
enable_module: true
enable_rtc: true
enable_simultaneous_execution_as_approved_module: false
enable_simultaneous_execution_as_candidate_module: false
priority: 1
max_module_size: 1

avoidance:
enable_module: true
enable_rtc: true
enable_simultaneous_execution_as_approved_module: true
enable_simultaneous_execution_as_candidate_module: false
priority: 5
Expand All @@ -62,13 +70,15 @@
# NOTE: This module is unstable. Deprecated for now.
avoidance_by_lc:
enable_module: false
enable_rtc: true
enable_simultaneous_execution_as_approved_module: false
enable_simultaneous_execution_as_candidate_module: false
priority: 4
max_module_size: 1

dynamic_avoidance:
enable_module: false
enable_rtc: true
enable_simultaneous_execution_as_approved_module: true
enable_simultaneous_execution_as_candidate_module: true
priority: 3
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**:
ros__parameters:
pull_out:
start_planner:
th_arrived_distance: 1.0
th_stopped_velocity: 0.01
th_stopped_time: 1.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,5 @@
/**:
ros__parameters:
launch_stop_line: true
launch_crosswalk: true
launch_traffic_light: true
launch_intersection: true
launch_blind_spot: true
launch_detection_area: true
launch_virtual_traffic_light: false # disabled by default to not confuse newcomers
launch_occlusion_spot: false
launch_no_stopping_area: true
launch_run_out: false
launch_speed_bump: false
launch_out_of_lane: true
launch_no_drivable_lane: false
forward_path_length: 1000.0
backward_path_length: 5.0
stop_line_extend_length: 5.0
Expand All @@ -21,3 +8,19 @@
system_delay: 0.5
delay_response_time: 0.5
is_publish_debug_path: false # publish all debug path with lane id in each module
launch_modules:
- behavior_velocity_planner::CrosswalkModulePlugin
- behavior_velocity_planner::WalkwayModulePlugin
- behavior_velocity_planner::TrafficLightModulePlugin
- behavior_velocity_planner::IntersectionModulePlugin # Intersection module should be before merge from private to declare intersection parameters.
- behavior_velocity_planner::MergeFromPrivateModulePlugin
- behavior_velocity_planner::BlindSpotModulePlugin
- behavior_velocity_planner::DetectionAreaModulePlugin
# behavior_velocity_planner::VirtualTrafficLightModulePlugin
- behavior_velocity_planner::NoStoppingAreaModulePlugin # No stopping area module requires all the stop line. Therefore this modules should be placed at the bottom.
- behavior_velocity_planner::StopLineModulePlugin # Permanent stop line module should be after no stopping area
# behavior_velocity_planner::OcclusionSpotModulePlugin
# behavior_velocity_planner::RunOutModulePlugin
# behavior_velocity_planner::SpeedBumpModulePlugin
- behavior_velocity_planner::OutOfLaneModulePlugin
# behavior_velocity_planner::NoDrivableLaneModulePlugin
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
- "avoidance_left"
- "avoidance_right"
- "goal_planner"
- "pull_out"
- "start_planner"
- "intersection_occlusion"

default_enable_list:
Expand All @@ -27,5 +27,5 @@
- "avoidance_left"
- "avoidance_right"
- "goal_planner"
- "pull_out"
- "start_planner"
- "intersection_occlusion"
Original file line number Diff line number Diff line change
Expand Up @@ -38,28 +38,31 @@
<arg name="dynamic_avoidance_param_path" value="$(var behavior_path_config_path)/dynamic_avoidance/dynamic_avoidance.param.yaml"/>
<arg name="lane_change_param_path" value="$(var behavior_path_config_path)/lane_change/lane_change.param.yaml"/>
<arg name="goal_planner_param_path" value="$(var behavior_path_config_path)/goal_planner/goal_planner.param.yaml"/>
<arg name="pull_out_param_path" value="$(var behavior_path_config_path)/pull_out/pull_out.param.yaml"/>
<arg name="start_planner_param_path" value="$(var behavior_path_config_path)/start_planner/start_planner.param.yaml"/>
<arg name="drivable_area_expansion_param_path" value="$(var behavior_path_config_path)/drivable_area_expansion.param.yaml"/>
<arg name="scene_module_manager_param_path" value="$(var behavior_path_config_path)/scene_module_manager.param.yaml"/>
<arg name="behavior_path_planner_tree_param_path" value="$(var behavior_path_config_path)/behavior_path_planner_tree.xml"/>
<arg name="behavior_path_planner_param_path" value="$(var behavior_path_config_path)/behavior_path_planner.param.yaml"/>

<!-- behavior velocity planner -->
<arg name="behavior_velocity_smoother_type_param_path" value="$(var common_config_path)/motion_velocity_smoother/Analytical.param.yaml"/>
<arg name="blind_spot_param_path" value="$(var behavior_velocity_config_path)/blind_spot.param.yaml"/>
<arg name="crosswalk_param_path" value="$(var behavior_velocity_config_path)/crosswalk.param.yaml"/>
<arg name="detection_area_param_path" value="$(var behavior_velocity_config_path)/detection_area.param.yaml"/>
<arg name="intersection_param_path" value="$(var behavior_velocity_config_path)/intersection.param.yaml"/>
<arg name="stop_line_param_path" value="$(var behavior_velocity_config_path)/stop_line.param.yaml"/>
<arg name="traffic_light_param_path" value="$(var behavior_velocity_config_path)/traffic_light.param.yaml"/>
<arg name="virtual_traffic_light_param_path" value="$(var behavior_velocity_config_path)/virtual_traffic_light.param.yaml"/>
<arg name="occlusion_spot_param_path" value="$(var behavior_velocity_config_path)/occlusion_spot.param.yaml"/>
<arg name="no_stopping_area_param_path" value="$(var behavior_velocity_config_path)/no_stopping_area.param.yaml"/>
<arg name="run_out_param_path" value="$(var behavior_velocity_config_path)/run_out.param.yaml"/>
<arg name="speed_bump_param_path" value="$(var behavior_velocity_config_path)/speed_bump.param.yaml"/>
<arg name="out_of_lane_param_path" value="$(var behavior_velocity_config_path)/out_of_lane.param.yaml"/>
<arg name="no_drivable_lane_param_path" value="$(var behavior_velocity_config_path)/no_drivable_lane.param.yaml"/>
<arg name="behavior_velocity_planner_param_path" value="$(var behavior_velocity_config_path)/behavior_velocity_planner.param.yaml"/>
<arg name="behavior_velocity_smoother_type_param_path" value="$(find-pkg-share autoware_launch)/config/planning/scenario_planning/common/motion_velocity_smoother/Analytical.param.yaml"/>
<arg name="behavior_velocity_planner_common_param_path" value="$(var behavior_velocity_config_path)/behavior_velocity_planner.param.yaml"/>
<arg
name="behavior_velocity_planner_module_param_paths"
value="[$(var behavior_velocity_config_path)/blind_spot.param.yaml,
$(var behavior_velocity_config_path)/crosswalk.param.yaml,
$(var behavior_velocity_config_path)/detection_area.param.yaml,
$(var behavior_velocity_config_path)/intersection.param.yaml,
$(var behavior_velocity_config_path)/stop_line.param.yaml,
$(var behavior_velocity_config_path)/traffic_light.param.yaml,
$(var behavior_velocity_config_path)/virtual_traffic_light.param.yaml,
$(var behavior_velocity_config_path)/occlusion_spot.param.yaml,
$(var behavior_velocity_config_path)/no_stopping_area.param.yaml,
$(var behavior_velocity_config_path)/run_out.param.yaml,
$(var behavior_velocity_config_path)/speed_bump.param.yaml,
$(var behavior_velocity_config_path)/out_of_lane.param.yaml,
$(var behavior_velocity_config_path)/no_drivable_lane.param.yaml]"
/>

<!-- parking -->
<arg name="freespace_planner_param_path" value="$(find-pkg-share autoware_launch)/config/planning/scenario_planning/parking/freespace_planner/freespace_planner.param.yaml"/>
Expand Down
20 changes: 10 additions & 10 deletions autoware_launch/rviz/autoware.rviz
Original file line number Diff line number Diff line change
Expand Up @@ -1131,13 +1131,13 @@ Visualization Manager:
- Class: rviz_plugins/Path
Color Border Vel Max: 3
Enabled: false
Name: PathReference_PullOut
Name: PathReference_StartPlanner
Topic:
Depth: 5
Durability Policy: Volatile
History Policy: Keep Last
Reliability Policy: Reliable
Value: /planning/path_reference/pull_out
Value: /planning/path_reference/start_planner
Value: true
View Path:
Alpha: 0.3
Expand Down Expand Up @@ -1315,13 +1315,13 @@ Visualization Manager:
- Class: rviz_plugins/Path
Color Border Vel Max: 3
Enabled: true
Name: PathChangeCandidate_PullOut
Name: PathChangeCandidate_StartPlanner
Topic:
Depth: 5
Durability Policy: Volatile
History Policy: Keep Last
Reliability Policy: Reliable
Value: /planning/path_candidate/pull_out
Value: /planning/path_candidate/start_planner
Value: true
View Path:
Alpha: 0.30000001192092896
Expand Down Expand Up @@ -1460,15 +1460,15 @@ Visualization Manager:
Value: true
- Class: rviz_default_plugins/MarkerArray
Enabled: true
Name: VirtualWall (PullOut)
Name: VirtualWall (StartPlanner)
Namespaces:
{}
Topic:
Depth: 5
Durability Policy: Volatile
History Policy: Keep Last
Reliability Policy: Reliable
Value: /planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/virtual_wall/pull_out
Value: /planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/virtual_wall/start_planner
Value: true
- Class: rviz_default_plugins/MarkerArray
Enabled: true
Expand Down Expand Up @@ -1863,15 +1863,15 @@ Visualization Manager:
Value: false
- Class: rviz_default_plugins/MarkerArray
Enabled: false
Name: PullOut
Name: StartPlanner
Namespaces:
{}
Topic:
Depth: 5
Durability Policy: Volatile
History Policy: Keep Last
Reliability Policy: Reliable
Value: /planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/debug/pull_out
Value: /planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/debug/start_planner
Value: false
- Class: rviz_default_plugins/MarkerArray
Enabled: false
Expand Down Expand Up @@ -2028,15 +2028,15 @@ Visualization Manager:
Value: false
- Class: rviz_default_plugins/MarkerArray
Enabled: false
Name: Info (PullOut)
Name: Info (StartPlanner)
Namespaces:
{}
Topic:
Depth: 5
Durability Policy: Volatile
History Policy: Keep Last
Reliability Policy: Reliable
Value: /planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/info/pull_out
Value: /planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/info/start_planner
Value: false
- Class: rviz_default_plugins/MarkerArray
Enabled: false
Expand Down