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

feat(control): use preset.yaml to control which modules to launch for control modules #1237

Merged
merged 2 commits into from
Nov 19, 2024
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
39 changes: 39 additions & 0 deletions autoware_launch/config/control/preset/default_preset.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
launch:
# controller
- arg:
name: trajectory_follower_mode
default: trajectory_follower_node
# option: trajectory_follower_node
# smart_mpc_trajectory_follower
# none

# external_cmd selector/converter
- arg:
name: launch_external_cmd_selector
default: "true"
- arg:
name: launch_external_cmd_converter
default: "true"

# optional control checkers
- arg:
name: launch_lane_departure_checker
default: "true"
- arg:
name: launch_control_validator
default: "true"
- arg:
name: launch_autonomous_emergency_braking
default: "true"
- arg:
name: launch_collision_detector
default: "true"
- arg:
name: launch_obstacle_collision_checker
default: "false"
- arg:
name: launch_predicted_path_checker
default: "false"
- arg:
name: launch_control_evaluator
default: "true"
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
launch:
# controller
- arg:
name: trajectory_follower_mode
default: none
# option: trajectory_follower_node
# smart_mpc_trajectory_follower
# none

# external_cmd selector/converter
- arg:
name: launch_external_cmd_selector
default: "false"
- arg:
name: launch_external_cmd_converter
default: "false"

# optional control checkers
- arg:
name: launch_lane_departure_checker
default: "false"
- arg:
name: launch_control_validator
default: "true"
- arg:
name: launch_autonomous_emergency_braking
default: "false"
- arg:
name: launch_collision_detector
default: "false"
- arg:
name: launch_obstacle_collision_checker
default: "false"
- arg:
name: launch_predicted_path_checker
default: "false"
- arg:
name: launch_control_evaluator
default: "false"
5 changes: 4 additions & 1 deletion autoware_launch/launch/autoware.launch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

<!-- launch module preset -->
<arg name="planning_module_preset" default="default" description="planning module preset"/>
<arg name="control_module_preset" default="default" description="control module preset"/>

<!-- Optional parameters -->
<!-- Modules to be launched -->
Expand Down Expand Up @@ -113,7 +114,9 @@

<!-- Control -->
<group if="$(var launch_control)">
<include file="$(find-pkg-share autoware_launch)/launch/components/tier4_control_component.launch.xml"/>
<include file="$(find-pkg-share autoware_launch)/launch/components/tier4_control_component.launch.xml">
<arg name="module_preset" value="$(var control_module_preset)"/>
</include>
</group>

<!-- API -->
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0"?>
<launch>
<!-- optional parameters are written here -->
<arg name="module_preset" default="default"/>
<include file="$(find-pkg-share autoware_launch)/config/control/preset/$(var module_preset)_preset.yaml"/>

<arg name="lateral_controller_mode" default="mpc"/>
<arg name="longitudinal_controller_mode" default="pid"/>
<arg name="use_individual_control_param" default="false"/>
<arg name="use_aeb_autoware_state_check" default="true"/>
<arg name="enable_autonomous_emergency_braking" default="true"/>
<arg name="enable_predicted_path_checker" default="false"/>
<arg name="enable_collision_detector" default="false"/>

<let name="latlon_controller_param_path_dir" value="$(var vehicle_id)" if="$(var use_individual_control_param)"/>
<let name="latlon_controller_param_path_dir" value="" unless="$(var use_individual_control_param)"/>
Expand Down Expand Up @@ -43,10 +43,7 @@
<arg name="external_cmd_selector_param_path" value="$(find-pkg-share autoware_launch)/config/control/external_cmd_selector/external_cmd_selector.param.yaml"/>
<arg name="aeb_param_path" value="$(find-pkg-share autoware_launch)/config/control/autoware_autonomous_emergency_braking/autonomous_emergency_braking.param.yaml"/>
<arg name="collision_detector_param_path" value="$(find-pkg-share autoware_launch)/config/control/autoware_collision_detector/collision_detector.param.yaml"/>
<arg name="enable_autonomous_emergency_braking" value="$(var enable_autonomous_emergency_braking)"/>
<arg name="use_aeb_autoware_state_check" value="$(var use_aeb_autoware_state_check)"/>
<arg name="enable_predicted_path_checker" value="$(var enable_predicted_path_checker)"/>
<arg name="enable_collision_detector" value="$(var enable_collision_detector)"/>
<arg name="predicted_path_checker_param_path" value="$(find-pkg-share autoware_launch)/config/control/predicted_path_checker/predicted_path_checker.param.yaml"/>
</include>
</launch>
2 changes: 2 additions & 0 deletions autoware_launch/launch/e2e_simulator.launch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

<!-- launch module preset -->
<arg name="planning_module_preset" default="default" description="planning module preset"/>
<arg name="control_module_preset" default="default" description="control module preset"/>

<!-- Optional parameters -->
<!-- Modules to be launched -->
Expand Down Expand Up @@ -51,6 +52,7 @@
<arg name="data_path" value="$(var data_path)"/>
<!-- launch module preset -->
<arg name="planning_module_preset" value="$(var planning_module_preset)"/>
<arg name="control_module_preset" value="$(var control_module_preset)"/>
<!-- Modules to be launched -->
<arg name="launch_vehicle" value="$(var vehicle)"/>
<arg name="launch_map" value="$(var map)"/>
Expand Down
2 changes: 2 additions & 0 deletions autoware_launch/launch/logging_simulator.launch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

<!-- launch module preset -->
<arg name="planning_module_preset" default="default" description="planning module preset"/>
<arg name="control_module_preset" value="$(var control_module_preset)"/>

<!-- Optional parameters -->
<!-- Modules to be launched -->
Expand Down Expand Up @@ -43,6 +44,7 @@
<arg name="sensor_model" value="$(var sensor_model)"/>
<!-- launch module preset -->
<arg name="planning_module_preset" value="$(var planning_module_preset)"/>
<arg name="control_module_preset" value="$(var control_module_preset)"/>
<!-- Modules to be launched -->
<arg name="launch_vehicle" value="$(var vehicle)"/>
<arg name="launch_map" value="$(var map)"/>
Expand Down
2 changes: 2 additions & 0 deletions autoware_launch/launch/planning_simulator.launch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

<!-- launch module preset -->
<arg name="planning_module_preset" default="default" description="planning module preset"/>
<arg name="control_module_preset" value="$(var control_module_preset)"/>

<!-- Optional parameters -->
<!-- Map -->
Expand Down Expand Up @@ -58,6 +59,7 @@
<arg name="data_path" value="$(var data_path)"/>
<!-- launch module preset -->
<arg name="planning_module_preset" value="$(var planning_module_preset)"/>
<arg name="control_module_preset" value="$(var control_module_preset)"/>
<!-- Modules to be launched -->
<arg name="launch_sensing" value="false"/>
<arg name="launch_localization" value="false"/>
Expand Down
Loading