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.

Sign up for GitHub

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

Jump to bottom

refactor(autoware_launch): clean up component launch #207

Merged
merged 3 commits into from
Feb 16, 2023
Merged

refactor(autoware_launch): clean up component launch #207

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c38b5d5
refactor(autoware_launch): clean up component launch
takayuki5168 Feb 15, 2023
22b1f8c
fix
takayuki5168 Feb 16, 2023
53b45e8
Update autoware_launch/launch/components/tier4_map_component.launch.xml
takayuki5168 Feb 16, 2023
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
33 changes: 5 additions & 28 deletions autoware_launch/launch/autoware.launch.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,50 +63,27 @@

<!-- System -->
<group if="$(var launch_system)">
<include file="$(find-pkg-share autoware_launch)/launch/components/tier4_system_component.launch.xml">
<arg name="run_mode" value="$(var system_run_mode)"/>
<arg name="launch_system_monitor" value="$(var launch_system_monitor)"/>
<arg name="sensor_model" value="$(var sensor_model)"/>
</include>
<include file="$(find-pkg-share autoware_launch)/launch/components/tier4_system_component.launch.xml"/>
</group>

<!-- Map -->
<group if="$(var launch_map)">
<include file="$(find-pkg-share autoware_launch)/launch/components/tier4_map_component.launch.xml">
<arg name="lanelet2_map_path" value="$(var map_path)/$(var lanelet2_map_file)"/>
<arg name="pointcloud_map_path" value="$(var map_path)/$(var pointcloud_map_file)"/>
</include>
<include file="$(find-pkg-share autoware_launch)/launch/components/tier4_map_component.launch.xml"/>
</group>

<!-- Sensing -->
<group if="$(var launch_sensing)">
<include file="$(find-pkg-share tier4_sensing_launch)/launch/sensing.launch.xml">
<arg name="launch_driver" value="$(var launch_sensing_driver)"/>
miursh marked this conversation as resolved.
Show resolved Hide resolved
<arg name="sensor_model" value="$(var sensor_model)"/>
<arg name="vehicle_param_file" value="$(find-pkg-share $(var vehicle_model)_description)/config/vehicle_info.param.yaml"/>
<arg name="vehicle_mirror_param_file" value="$(find-pkg-share $(var vehicle_model)_description)/config/mirror.param.yaml"/>
<arg name="use_pointcloud_container" value="$(var use_pointcloud_container)"/>
<arg name="pointcloud_container_name" value="$(var pointcloud_container_name)"/>
</include>
<include file="$(find-pkg-share tier4_sensing_launch)/launch/sensing.launch.xml"/>
</group>

<!-- Localization -->
<group if="$(var launch_localization)">
<include file="$(find-pkg-share autoware_launch)/launch/components/tier4_localization_component.launch.xml">
<arg name="use_pointcloud_container" value="$(var use_pointcloud_container)"/>
<arg name="pointcloud_container_name" value="$(var pointcloud_container_name)"/>
</include>
<include file="$(find-pkg-share autoware_launch)/launch/components/tier4_localization_component.launch.xml"/>
</group>

<!-- Perception -->
<group if="$(var launch_perception)">
<include file="$(find-pkg-share autoware_launch)/launch/components/tier4_perception_component.launch.xml">
<arg name="mode" value="lidar"/>
<arg name="vehicle_param_file" value="$(find-pkg-share $(var vehicle_model)_description)/config/vehicle_info.param.yaml"/>
<arg name="use_pointcloud_container" value="$(var use_pointcloud_container)"/>
<arg name="pointcloud_container_name" value="$(var pointcloud_container_name)"/>
<arg name="enable_fine_detection" value="$(var traffic_light_recognition/enable_fine_detection)"/>
</include>
<include file="$(find-pkg-share autoware_launch)/launch/components/tier4_perception_component.launch.xml"/>
</group>

<!-- Planning -->
Expand Down
3 changes: 0 additions & 3 deletions autoware_launch/launch/components/tier4_localization_component.launch.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
<?xml version="1.0"?>
<launch>
<arg name="use_pointcloud_container"/>
<arg name="pointcloud_container_name"/>

<include file="$(find-pkg-share tier4_localization_launch)/launch/localization.launch.xml">
<arg name="use_pointcloud_container" value="$(var use_pointcloud_container)"/>
<arg name="pointcloud_container_name" value="$(var pointcloud_container_name)"/>
Expand Down
7 changes: 2 additions & 5 deletions autoware_launch/launch/components/tier4_map_component.launch.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
<?xml version="1.0"?>
<launch>
<arg name="lanelet2_map_path"/>
<arg name="pointcloud_map_path"/>

<include file="$(find-pkg-share tier4_map_launch)/launch/map.launch.py">
<arg name="lanelet2_map_path" value="$(var lanelet2_map_path)"/>
<arg name="pointcloud_map_path" value="$(var pointcloud_map_path)"/>
<arg name="lanelet2_map_path" value="$(var map_path)/$(var lanelet2_map_file)"/>
<arg name="pointcloud_map_path" value="$$(var map_path)/(var pointcloud_map_file)"/>
takayuki5168 marked this conversation as resolved.
Show resolved Hide resolved

<arg name="pointcloud_map_loader_param_path" value="$(find-pkg-share autoware_launch)/config/map/pointcloud_map_loader.param.yaml"/>
<arg name="lanelet2_map_loader_param_path" value="$(find-pkg-share autoware_launch)/config/map/lanelet2_map_loader.param.yaml"/>
Expand Down
10 changes: 2 additions & 8 deletions autoware_launch/launch/components/tier4_perception_component.launch.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
<?xml version="1.0"?>
<launch>
<arg name="mode"/>
<arg name="vehicle_param_file"/>
<arg name="use_pointcloud_container"/>
<arg name="pointcloud_container_name"/>
<arg name="enable_fine_detection"/>

<include file="$(find-pkg-share tier4_perception_launch)/launch/perception.launch.xml">
<arg name="mode" value="$(var mode)"/>
<arg name="vehicle_param_file" value="$(var vehicle_param_file)"/>
<arg name="mode" value="lidar"/>
<arg name="vehicle_param_file" value="$(find-pkg-share $(var vehicle_model)_description)/config/vehicle_info.param.yaml"/>
<arg name="use_pointcloud_container" value="$(var use_pointcloud_container)"/>
<arg name="pointcloud_container_name" value="$(var pointcloud_container_name)"/>
<arg name="enable_fine_detection" value="$(var traffic_light_recognition/enable_fine_detection)"/>
Expand Down
11 changes: 11 additions & 0 deletions autoware_launch/launch/components/tier4_sensing_component.launch.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0"?>
<launch>
<include file="$(find-pkg-share tier4_sensing_launch)/launch/sensing.launch.xml">
<arg name="launch_driver" value="$(var launch_sensing_driver)"/>
<arg name="sensor_model" value="$(var sensor_model)"/>
<arg name="vehicle_param_file" value="$(find-pkg-share $(var vehicle_model)_description)/config/vehicle_info.param.yaml"/>
<arg name="vehicle_mirror_param_file" value="$(find-pkg-share $(var vehicle_model)_description)/config/mirror.param.yaml"/>
<arg name="use_pointcloud_container" value="$(var use_pointcloud_container)"/>
<arg name="pointcloud_container_name" value="$(var pointcloud_container_name)"/>
</include>
</launch>
6 changes: 1 addition & 5 deletions autoware_launch/launch/components/tier4_system_component.launch.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
<?xml version="1.0"?>
<launch>
<arg name="run_mode"/>
<arg name="launch_system_monitor"/>
<arg name="sensor_model"/>

<include file="$(find-pkg-share tier4_system_launch)/launch/system.launch.xml">
<arg name="run_mode" value="$(var run_mode)"/>
<arg name="run_mode" value="$(var system_run_mode)"/>
<arg name="launch_system_monitor" value="$(var launch_system_monitor)"/>
<arg name="sensor_model" value="$(var sensor_model)"/>

Expand Down