diff --git a/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/avoidance/avoidance.param.yaml b/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/avoidance/avoidance.param.yaml index a42dc79dc4..c217979dfd 100644 --- a/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/avoidance/avoidance.param.yaml +++ b/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/avoidance/avoidance.param.yaml @@ -17,6 +17,7 @@ enable_force_avoidance_for_stopped_vehicle: true enable_safety_check: true enable_yield_maneuver: true + enable_yield_maneuver_during_shifting: false disable_path_update: false use_hatched_road_markings: false diff --git a/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/behavior_path_planner.param.yaml b/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/behavior_path_planner.param.yaml index f6c3d3a7ae..aa56edee2f 100644 --- a/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/behavior_path_planner.param.yaml +++ b/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/behavior_path_planner.param.yaml @@ -31,6 +31,7 @@ lateral_distance_max_threshold: 1.7 longitudinal_distance_min_threshold: 3.0 + longitudinal_velocity_delta_time: 0.8 expected_front_deceleration: -1.0 expected_rear_deceleration: -1.0 diff --git a/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/behavior_path_planner_tree.xml b/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/behavior_path_planner_tree.xml index 4d8f1af9fa..e6c7f6cc24 100644 --- a/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/behavior_path_planner_tree.xml +++ b/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/behavior_path_planner_tree.xml @@ -8,8 +8,8 @@ - - + + @@ -70,10 +70,10 @@ desc - + - + desc diff --git a/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/behavior_path_planner_tree_lane_change_only.xml b/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/behavior_path_planner_tree_lane_change_only.xml index 65c600d246..8988dd41b5 100644 --- a/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/behavior_path_planner_tree_lane_change_only.xml +++ b/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/behavior_path_planner_tree_lane_change_only.xml @@ -8,8 +8,8 @@ - - + + @@ -62,10 +62,10 @@ desc - + - + desc diff --git a/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/behavior_path_planner_tree_pull_out.xml b/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/behavior_path_planner_tree_pull_out.xml index 70d6b37cb6..32f30af69a 100644 --- a/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/behavior_path_planner_tree_pull_out.xml +++ b/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/behavior_path_planner_tree_pull_out.xml @@ -9,9 +9,9 @@ - - - + + + @@ -73,11 +73,11 @@ - + - - + + desc diff --git a/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/behavior_path_planner_tree_with_external_request_LC.xml b/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/behavior_path_planner_tree_with_external_request_LC.xml index 80fe7ea8da..0410f775f7 100644 --- a/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/behavior_path_planner_tree_with_external_request_LC.xml +++ b/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/behavior_path_planner_tree_with_external_request_LC.xml @@ -8,8 +8,8 @@ - - + + @@ -57,10 +57,10 @@ desc - + - + desc diff --git a/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/scene_module_manager.param.yaml b/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/scene_module_manager.param.yaml index 76ae718c01..e52aebec9d 100644 --- a/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/scene_module_manager.param.yaml +++ b/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/scene_module_manager.param.yaml @@ -31,7 +31,7 @@ priority: 6 max_module_size: 1 - pull_out: + start_planner: enable_module: true enable_simultaneous_execution_as_approved_module: true enable_simultaneous_execution_as_candidate_module: false diff --git a/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/scene_module_manager_foa.param.yaml b/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/scene_module_manager_foa.param.yaml index 8eac141080..29b58aabf5 100644 --- a/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/scene_module_manager_foa.param.yaml +++ b/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/scene_module_manager_foa.param.yaml @@ -31,7 +31,7 @@ priority: 6 max_module_size: 1 - pull_out: + start_planner: enable_module: true enable_simultaneous_execution_as_approved_module: true enable_simultaneous_execution_as_candidate_module: false diff --git a/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/pull_out/pull_out.param.yaml b/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/start_planner/start_planner.param.yaml similarity index 98% rename from autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/pull_out/pull_out.param.yaml rename to autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/start_planner/start_planner.param.yaml index bd1ccd2065..0d8782cb50 100644 --- a/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/pull_out/pull_out.param.yaml +++ b/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/start_planner/start_planner.param.yaml @@ -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 diff --git a/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_velocity_planner/behavior_velocity_planner.param.yaml b/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_velocity_planner/behavior_velocity_planner.param.yaml index ba55882578..0ce5b9e519 100644 --- a/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_velocity_planner/behavior_velocity_planner.param.yaml +++ b/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_velocity_planner/behavior_velocity_planner.param.yaml @@ -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: false - launch_run_out: false - launch_speed_bump: false - launch_out_of_lane: false - launch_no_drivable_lane: false forward_path_length: 1000.0 backward_path_length: 5.0 stop_line_extend_length: 5.0 @@ -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 diff --git a/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/rtc_auto_mode_manager/rtc_auto_mode_manager.param.yaml b/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/rtc_auto_mode_manager/rtc_auto_mode_manager.param.yaml index d44559bd25..4eef8f6d56 100644 --- a/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/rtc_auto_mode_manager/rtc_auto_mode_manager.param.yaml +++ b/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/rtc_auto_mode_manager/rtc_auto_mode_manager.param.yaml @@ -11,7 +11,7 @@ - "avoidance_left" - "avoidance_right" - "goal_planner" - - "pull_out" + - "start_planner" - "intersection_occlusion" default_enable_list: @@ -25,5 +25,5 @@ - "avoidance_left" - "avoidance_right" - "goal_planner" - - "pull_out" + - "start_planner" - "intersection_occlusion" diff --git a/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/rtc_auto_mode_manager/rtc_auto_mode_manager_foa.param.yaml b/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/rtc_auto_mode_manager/rtc_auto_mode_manager_foa.param.yaml index 04f9042cdd..3c3aff7d88 100644 --- a/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/rtc_auto_mode_manager/rtc_auto_mode_manager_foa.param.yaml +++ b/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/rtc_auto_mode_manager/rtc_auto_mode_manager_foa.param.yaml @@ -13,7 +13,7 @@ - "avoidance_left" - "avoidance_right" - "goal_planner" - - "pull_out" + - "start_planner" - "intersection_occlusion" default_enable_list: diff --git a/autoware_launch/launch/components/tier4_planning_component.launch.xml b/autoware_launch/launch/components/tier4_planning_component.launch.xml index 3c127d21e4..7c6bf9be58 100644 --- a/autoware_launch/launch/components/tier4_planning_component.launch.xml +++ b/autoware_launch/launch/components/tier4_planning_component.launch.xml @@ -40,28 +40,31 @@ - + - - - - - - - - - - - - - - - + + + diff --git a/autoware_launch/rviz/autoware.rviz b/autoware_launch/rviz/autoware.rviz index bbe2dacfb0..1a4fa25a20 100644 --- a/autoware_launch/rviz/autoware.rviz +++ b/autoware_launch/rviz/autoware.rviz @@ -1133,13 +1133,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 @@ -1317,13 +1317,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 @@ -1462,7 +1462,7 @@ Visualization Manager: Value: true - Class: rviz_default_plugins/MarkerArray Enabled: true - Name: VirtualWall (PullOut) + Name: VirtualWall (StartPlanner) Namespaces: {} Topic: @@ -1470,7 +1470,7 @@ Visualization Manager: 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 @@ -1865,7 +1865,7 @@ Visualization Manager: Value: false - Class: rviz_default_plugins/MarkerArray Enabled: false - Name: PullOut + Name: StartPlanner Namespaces: {} Topic: @@ -1873,7 +1873,7 @@ Visualization Manager: 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 @@ -2030,7 +2030,7 @@ Visualization Manager: Value: false - Class: rviz_default_plugins/MarkerArray Enabled: false - Name: Info (PullOut) + Name: Info (StartPlanner) Namespaces: {} Topic: @@ -2038,7 +2038,7 @@ Visualization Manager: 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