Skip to content

Commit b860c62

Browse files
authored
feat(obstacle_velocity_limiter): move to motion_velocity_planner (#1023)
Signed-off-by: Maxime CLEMENT <maxime.clement@tier4.jp>
1 parent 84fe16d commit b860c62

File tree

4 files changed

+28
-1
lines changed

4 files changed

+28
-1
lines changed

autoware_launch/config/planning/preset/default_preset.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,9 @@ launch:
9999
- arg:
100100
name: launch_out_of_lane_module
101101
default: "true"
102+
- arg:
103+
name: launch_obstacle_velocity_limiter_module
104+
default: "true"
102105

103106
- arg:
104107
name: motion_stop_planner_type

autoware_launch/launch/components/tier4_planning_component.launch.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,13 @@
6969
<arg name="elastic_band_smoother_param_path" value="$(var motion_config_path)/path_smoother/elastic_band_smoother.param.yaml"/>
7070
<arg name="path_optimizer_param_path" value="$(var motion_config_path)/autoware_path_optimizer/path_optimizer.param.yaml"/>
7171
<arg name="path_sampler_param_path" value="$(var motion_config_path)/path_sampler/path_sampler.param.yaml"/>
72-
<arg name="obstacle_velocity_limiter_param_path" value="$(var motion_config_path)/obstacle_velocity_limiter/obstacle_velocity_limiter.param.yaml"/>
7372
<arg name="surround_obstacle_checker_param_path" value="$(var motion_config_path)/surround_obstacle_checker/surround_obstacle_checker.param.yaml"/>
7473
<arg name="obstacle_stop_planner_param_path" value="$(var motion_config_path)/obstacle_stop_planner/obstacle_stop_planner.param.yaml"/>
7574
<arg name="obstacle_stop_planner_acc_param_path" value="$(var motion_config_path)/obstacle_stop_planner/adaptive_cruise_control.param.yaml"/>
7675
<arg name="obstacle_cruise_planner_param_path" value="$(var motion_config_path)/obstacle_cruise_planner/obstacle_cruise_planner.param.yaml"/>
7776
<arg name="motion_velocity_planner_param_path" value="$(var motion_config_path)/motion_velocity_planner/motion_velocity_planner.param.yaml"/>
7877
<arg name="motion_velocity_planner_out_of_lane_module_param_path" value="$(var motion_config_path)/motion_velocity_planner/out_of_lane.param.yaml"/>
78+
<arg name="motion_velocity_planner_obstacle_velocity_limiter_param_path" value="$(var motion_config_path)/motion_velocity_planner/obstacle_velocity_limiter.param.yaml"/>
7979
<arg
8080
name="motion_velocity_planner_velocity_smoother_type_param_path"
8181
value="$(find-pkg-share autoware_launch)/config/planning/scenario_planning/common/autoware_velocity_smoother/Analytical.param.yaml"

autoware_launch/rviz/autoware.rviz

+24
Original file line numberDiff line numberDiff line change
@@ -2117,6 +2117,18 @@ Visualization Manager:
21172117
Reliability Policy: Reliable
21182118
Value: /planning/scenario_planning/lane_driving/motion_planning/motion_velocity_planner/out_of_lane/virtual_walls
21192119
Value: true
2120+
- Class: rviz_default_plugins/MarkerArray
2121+
Enabled: true
2122+
Name: VirtualWall (ObstacleVelocityLimiter)
2123+
Namespaces:
2124+
{}
2125+
Topic:
2126+
Depth: 5
2127+
Durability Policy: Volatile
2128+
History Policy: Keep Last
2129+
Reliability Policy: Reliable
2130+
Value: /planning/scenario_planning/lane_driving/motion_planning/motion_velocity_planner/obstacle_velocity_limiter/virtual_walls
2131+
Value: true
21202132
Enabled: true
21212133
Name: VirtualWall
21222134
- Class: rviz_common/Group
@@ -2254,6 +2266,18 @@ Visualization Manager:
22542266
Reliability Policy: Reliable
22552267
Value: /planning/scenario_planning/lane_driving/motion_planning/motion_velocity_planner/out_of_lane/debug_markers
22562268
Value: true
2269+
- Class: rviz_default_plugins/MarkerArray
2270+
Enabled: true
2271+
Name: ObstacleVelocityLimiter
2272+
Namespaces:
2273+
{}
2274+
Topic:
2275+
Depth: 5
2276+
Durability Policy: Volatile
2277+
History Policy: Keep Last
2278+
Reliability Policy: Reliable
2279+
Value: /planning/scenario_planning/lane_driving/motion_planning/motion_velocity_planner/obstacle_velocity_limiter/debug_markers
2280+
Value: true
22572281
Enabled: false
22582282
Name: MotionVelocityPlanner
22592283
Enabled: false

0 commit comments

Comments
 (0)