Skip to content

Commit cf37437

Browse files
authored
chore(planning_launch): update motion module name (#1014)
Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com>
1 parent 728e5c9 commit cf37437

File tree

9 files changed

+12
-9
lines changed

9 files changed

+12
-9
lines changed

autoware_launch/config/planning/preset/default_preset.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ launch:
9393

9494
- arg:
9595
name: motion_path_planner_type
96-
default: obstacle_avoidance_planner
97-
# option: obstacle_avoidance_planner
96+
default: path_optimizer
97+
# option: path_optimizer
9898
# path_sampler
9999
# none
100100

@@ -111,7 +111,7 @@ launch:
111111
# none
112112

113113
- arg:
114-
name: motion_velocity_smoother_type
114+
name: velocity_smoother_type
115115
default: JerkFiltered
116116
# option: JerkFiltered
117117
# L2

autoware_launch/launch/components/tier4_planning_component.launch.xml

+8-5
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343

4444
<!-- behavior velocity planner -->
4545
<arg name="behavior_velocity_config_path" value="$(find-pkg-share autoware_launch)/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_velocity_planner"/>
46-
<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"/>
46+
<arg name="behavior_velocity_smoother_type_param_path" value="$(find-pkg-share autoware_launch)/config/planning/scenario_planning/common/autoware_velocity_smoother/Analytical.param.yaml"/>
4747
<arg name="behavior_velocity_planner_common_param_path" value="$(var behavior_velocity_config_path)/behavior_velocity_planner.param.yaml"/>
4848
<arg name="behavior_velocity_planner_blind_spot_module_param_path" value="$(var behavior_velocity_config_path)/blind_spot.param.yaml"/>
4949
<arg name="behavior_velocity_planner_crosswalk_module_param_path" value="$(var behavior_velocity_config_path)/crosswalk.param.yaml"/>
@@ -68,7 +68,7 @@
6868
<!-- motion -->
6969
<arg name="motion_config_path" value="$(find-pkg-share autoware_launch)/config/planning/scenario_planning/lane_driving/motion_planning"/>
7070
<arg name="elastic_band_smoother_param_path" value="$(var motion_config_path)/path_smoother/elastic_band_smoother.param.yaml"/>
71-
<arg name="obstacle_avoidance_planner_param_path" value="$(var motion_config_path)/obstacle_avoidance_planner/obstacle_avoidance_planner.param.yaml"/>
71+
<arg name="path_optimizer_param_path" value="$(var motion_config_path)/autoware_path_optimizer/path_optimizer.param.yaml"/>
7272
<arg name="path_sampler_param_path" value="$(var motion_config_path)/path_sampler/path_sampler.param.yaml"/>
7373
<arg name="obstacle_velocity_limiter_param_path" value="$(var motion_config_path)/obstacle_velocity_limiter/obstacle_velocity_limiter.param.yaml"/>
7474
<arg name="surround_obstacle_checker_param_path" value="$(var motion_config_path)/surround_obstacle_checker/surround_obstacle_checker.param.yaml"/>
@@ -77,11 +77,14 @@
7777
<arg name="obstacle_cruise_planner_param_path" value="$(var motion_config_path)/obstacle_cruise_planner/obstacle_cruise_planner.param.yaml"/>
7878
<arg name="motion_velocity_planner_param_path" value="$(var motion_config_path)/motion_velocity_planner/motion_velocity_planner.param.yaml"/>
7979
<arg name="motion_velocity_planner_out_of_lane_module_param_path" value="$(var motion_config_path)/motion_velocity_planner/out_of_lane.param.yaml"/>
80-
<arg name="motion_velocity_smoother_type_param_path" value="$(find-pkg-share autoware_launch)/config/planning/scenario_planning/common/motion_velocity_smoother/Analytical.param.yaml"/>
80+
<arg
81+
name="motion_velocity_planner_velocity_smoother_type_param_path"
82+
value="$(find-pkg-share autoware_launch)/config/planning/scenario_planning/common/autoware_velocity_smoother/Analytical.param.yaml"
83+
/>
8184

8285
<!-- motion velocity smoother -->
83-
<arg name="motion_velocity_smoother_param_path" value="$(var common_config_path)/motion_velocity_smoother/motion_velocity_smoother.param.yaml"/>
84-
<arg name="velocity_smoother_type_param_path" value="$(var common_config_path)/motion_velocity_smoother/$(var motion_velocity_smoother_type).param.yaml"/>
86+
<arg name="velocity_smoother_param_path" value="$(var common_config_path)/autoware_velocity_smoother/velocity_smoother.param.yaml"/>
87+
<arg name="velocity_smoother_type_param_path" value="$(var common_config_path)/autoware_velocity_smoother/$(var velocity_smoother_type).param.yaml"/>
8588

8689
<!-- planning validator -->
8790
<arg name="planning_validator_param_path" value="$(var common_config_path)/planning_validator/planning_validator.param.yaml"/>

autoware_launch/rviz/autoware.rviz

+1-1
Original file line numberDiff line numberDiff line change
@@ -2127,7 +2127,7 @@ Visualization Manager:
21272127
Durability Policy: Volatile
21282128
History Policy: Keep Last
21292129
Reliability Policy: Reliable
2130-
Value: /planning/scenario_planning/motion_velocity_smoother/virtual_wall
2130+
Value: /planning/scenario_planning/velocity_smoother/virtual_wall
21312131
Value: true
21322132
- Class: rviz_default_plugins/MarkerArray
21332133
Enabled: true

0 commit comments

Comments
 (0)