Skip to content

Commit

Permalink
feat: change launch package name (autowarefoundation#186)
Browse files Browse the repository at this point in the history
* rename launch folder

Signed-off-by: tomoya.kimura <[email protected]>

* autoware_launch -> tier4_autoware_launch

Signed-off-by: tomoya.kimura <[email protected]>

* integration_launch -> tier4_integration_launch

Signed-off-by: tomoya.kimura <[email protected]>

* map_launch -> tier4_map_launch

Signed-off-by: tomoya.kimura <[email protected]>

* fix

Signed-off-by: tomoya.kimura <[email protected]>

* planning_launch -> tier4_planning_launch

Signed-off-by: tomoya.kimura <[email protected]>

* simulator_launch -> tier4_simulator_launch

Signed-off-by: tomoya.kimura <[email protected]>

* control_launch -> tier4_control_launch

Signed-off-by: tomoya.kimura <[email protected]>

* localization_launch -> tier4_localization_launch

Signed-off-by: tomoya.kimura <[email protected]>

* perception_launch -> tier4_perception_launch

Signed-off-by: tomoya.kimura <[email protected]>

* sensing_launch -> tier4_sensing_launch

Signed-off-by: tomoya.kimura <[email protected]>

* system_launch -> tier4_system_launch

Signed-off-by: tomoya.kimura <[email protected]>

* ci(pre-commit): autofix

* vehicle_launch -> tier4_vehicle_launch

Signed-off-by: tanaka3 <[email protected]>

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: tanaka3 <[email protected]>
Co-authored-by: taikitanaka3 <[email protected]>
  • Loading branch information
4 people authored Dec 15, 2021
1 parent c152f57 commit 740cce2
Show file tree
Hide file tree
Showing 135 changed files with 247 additions and 248 deletions.
4 changes: 0 additions & 4 deletions launch/autoware_launch/autoware_launch.drawio.svg

This file was deleted.

13 changes: 0 additions & 13 deletions launch/integration_launch/README.md

This file was deleted.

16 changes: 0 additions & 16 deletions launch/planning_launch/README.md

This file was deleted.

4 changes: 0 additions & 4 deletions launch/simulator_launch/simulator_launch.drawio.svg

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.5)
project(autoware_launch)
project(tier4_autoware_launch)

find_package(ament_cmake_auto REQUIRED)
ament_auto_find_build_dependencies()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# autoware_launch
# tier4_autoware_launch

## Structure

![autoware_launch](./autoware_launch.drawio.svg)
![tier4_autoware_launch](./autoware_launch.drawio.svg)

## Package Dependencies

Expand All @@ -13,5 +13,5 @@ Please see `<exec_depend>` in `package.xml`.
You can use the command as follows at shell script to launch `*.launch.xml` in `launch` directory.

```bash
ros2 launch autoware_launch autoware.launch.xml map_path:=/path/to/map_folder vehicle_model:=lexus sensor_model:=aip_xx1
ros2 launch tier4_autoware_launch autoware.launch.xml map_path:=/path/to/map_folder vehicle_model:=lexus sensor_model:=aip_xx1
```
4 changes: 4 additions & 0 deletions launch/tier4_autoware_launch/autoware_launch.drawio.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -17,31 +17,31 @@
</include>

<!-- Pointcloud container -->
<include file="$(find-pkg-share autoware_launch)/launch/pointcloud_container.launch.py" if="$(var use_pointcloud_container)">
<include file="$(find-pkg-share tier4_autoware_launch)/launch/pointcloud_container.launch.py" if="$(var use_pointcloud_container)">
<arg name="use_multithread" value="true" />
<arg name="container_name" value="$(var pointcloud_container_name)"/>
</include>

<!-- Vehicle -->
<include file="$(find-pkg-share vehicle_launch)/launch/vehicle.launch.xml">
<include file="$(find-pkg-share tier4_vehicle_launch)/launch/vehicle.launch.xml">
<arg name="vehicle_model" value="$(var vehicle_model)"/>
<arg name="sensor_model" value="$(var sensor_model)"/>
</include>

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

<!-- Map -->
<include file="$(find-pkg-share map_launch)/launch/map.launch.py">
<include file="$(find-pkg-share tier4_map_launch)/launch/map.launch.py">
<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>

<!-- Sensing -->
<include file="$(find-pkg-share sensing_launch)/launch/sensing.launch.xml">
<include file="$(find-pkg-share tier4_sensing_launch)/launch/sensing.launch.xml">
<arg name="launch_driver" value="true"/>
<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"/>
Expand All @@ -51,11 +51,11 @@
</include>

<!-- Localization -->
<include file="$(find-pkg-share localization_launch)/launch/localization.launch.xml">
<include file="$(find-pkg-share tier4_localization_launch)/launch/localization.launch.xml">
</include>

<!-- Perception -->
<include file="$(find-pkg-share perception_launch)/launch/perception.launch.xml">
<include file="$(find-pkg-share tier4_perception_launch)/launch/perception.launch.xml">
<!-- options for mode: camera_lidar_fusion, lidar, camera -->
<arg name="mode" value="camera_lidar_fusion" />
<arg name="vehicle_param_file" value="$(find-pkg-share $(var vehicle_model)_description)/config/vehicle_info.param.yaml"/>
Expand All @@ -64,19 +64,19 @@
</include>

<!-- Planning -->
<include file="$(find-pkg-share planning_launch)/launch/planning.launch.xml">
<include file="$(find-pkg-share tier4_planning_launch)/launch/planning.launch.xml">
<arg name="vehicle_info_param_file" value="$(find-pkg-share $(var vehicle_model)_description)/config/vehicle_info.param.yaml"/>
</include>

<!-- Control -->
<include file="$(find-pkg-share control_launch)/launch/control.launch.py">
<include file="$(find-pkg-share tier4_control_launch)/launch/control.launch.py">
<!-- options for lateral_controller_mode: mpc_follower, pure_pursuit -->
<arg name="lateral_controller_mode" value="mpc_follower" />
<arg name="vehicle_info_param_file" value="$(find-pkg-share $(var vehicle_model)_description)/config/vehicle_info.param.yaml"/>
</include>

<!-- Rviz -->
<node pkg="rviz2" exec="rviz2" name="rviz2" output="screen" args="-d $(find-pkg-share autoware_launch)/rviz/autoware.rviz -s $(find-pkg-share autoware_launch)/rviz/image/autoware.png" if="$(var rviz)">
<node pkg="rviz2" exec="rviz2" name="rviz2" output="screen" args="-d $(find-pkg-share tier4_autoware_launch)/rviz/autoware.rviz -s $(find-pkg-share tier4_autoware_launch)/rviz/image/autoware.png" if="$(var rviz)">
</node>

<!-- Web Controller -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@
</include>

<!-- Pointcloud container -->
<include file="$(find-pkg-share autoware_launch)/launch/pointcloud_container.launch.py" if="$(var use_pointcloud_container)">
<include file="$(find-pkg-share tier4_autoware_launch)/launch/pointcloud_container.launch.py" if="$(var use_pointcloud_container)">
<arg name="use_multithread" value="true" />
<arg name="container_name" value="$(var pointcloud_container_name)"/>
</include>

<!-- Vehicle -->
<group>
<include file="$(find-pkg-share vehicle_launch)/launch/vehicle.launch.xml" if="$(var vehicle)">
<include file="$(find-pkg-share tier4_vehicle_launch)/launch/vehicle.launch.xml" if="$(var vehicle)">
<arg name="vehicle_model" value="$(var vehicle_model)"/>
<arg name="sensor_model" value="$(var sensor_model)"/>
<arg name="vehicle_id" value="$(var vehicle_id)"/>
Expand All @@ -49,23 +49,23 @@

<!-- System -->
<group>
<include file="$(find-pkg-share system_launch)/launch/system.launch.xml" if="$(var system)">
<include file="$(find-pkg-share tier4_system_launch)/launch/system.launch.xml" if="$(var system)">
<arg name="run_mode" value="online"/>
<arg name="sensor_model" value="$(var sensor_model)"/>
</include>
</group>

<!-- Map -->
<group>
<include file="$(find-pkg-share map_launch)/launch/map.launch.py" if="$(var map)">
<include file="$(find-pkg-share tier4_map_launch)/launch/map.launch.py" if="$(var map)">
<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>
</group>

<!-- Sensing -->
<group>
<include file="$(find-pkg-share sensing_launch)/launch/sensing.launch.xml" if="$(var sensing)">
<include file="$(find-pkg-share tier4_sensing_launch)/launch/sensing.launch.xml" if="$(var sensing)">
<arg name="launch_driver" value="false"/>
<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"/>
Expand All @@ -77,13 +77,13 @@

<!-- Localization -->
<group>
<include file="$(find-pkg-share localization_launch)/launch/localization.launch.xml" if="$(var localization)">
<include file="$(find-pkg-share tier4_localization_launch)/launch/localization.launch.xml" if="$(var localization)">
</include>
</group>

<!-- Perception -->
<group>
<include file="$(find-pkg-share perception_launch)/launch/perception.launch.xml" if="$(var perception)">
<include file="$(find-pkg-share tier4_perception_launch)/launch/perception.launch.xml" if="$(var perception)">
<!-- options for mode: camera_lidar_fusion, lidar, camera -->
<arg name="mode" value="camera_lidar_fusion" />
<arg name="vehicle_param_file" value="$(find-pkg-share $(var vehicle_model)_description)/config/vehicle_info.param.yaml"/>
Expand All @@ -94,22 +94,22 @@

<!-- Planning -->
<group>
<include file="$(find-pkg-share planning_launch)/launch/planning.launch.xml" if="$(var planning)">
<include file="$(find-pkg-share tier4_planning_launch)/launch/planning.launch.xml" if="$(var planning)">
<arg name="vehicle_info_param_file" value="$(find-pkg-share $(var vehicle_model)_description)/config/vehicle_info.param.yaml"/>
</include>
</group>

<!-- Control -->
<group>
<include file="$(find-pkg-share control_launch)/launch/control.launch.py" if="$(var control)">
<include file="$(find-pkg-share tier4_control_launch)/launch/control.launch.py" if="$(var control)">
<!-- options for lateral_controller_mode: mpc_follower, pure_pursuit -->
<arg name="lateral_controller_mode" value="mpc_follower" />
<arg name="vehicle_info_param_file" value="$(find-pkg-share $(var vehicle_model)_description)/config/vehicle_info.param.yaml"/>
</include>
</group>

<!-- Rviz -->
<node pkg="rviz2" exec="rviz2" name="rviz2" output="screen" args="-d $(find-pkg-share autoware_launch)/rviz/autoware.rviz -s $(find-pkg-share autoware_launch)/rviz/image/autoware.png" if="$(var rviz)">
<node pkg="rviz2" exec="rviz2" name="rviz2" output="screen" args="-d $(find-pkg-share tier4_autoware_launch)/rviz/autoware.rviz -s $(find-pkg-share tier4_autoware_launch)/rviz/image/autoware.png" if="$(var rviz)">
</node>

<!-- Web Controller -->
Expand All @@ -118,7 +118,7 @@
</group>

<!-- Simulator -->
<include file="$(find-pkg-share simulator_launch)/launch/simulator.launch.xml">
<include file="$(find-pkg-share tier4_simulator_launch)/launch/simulator.launch.xml">
<arg name="scenario_simulation" value="$(var scenario_simulation)"/>
<arg name="vehicle_simulation" value="false"/>
<arg name="vehicle_model" value="$(var vehicle_model)"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<arg name="sensor_model" description="sensor model name"/>
<!-- Optional parameters -->
<arg name="rviz" default="true" description="launch rviz"/>
<arg name="rviz_config" default="$(find-pkg-share autoware_launch)/rviz/autoware.rviz" description="rviz config"/>
<arg name="rviz_config" default="$(find-pkg-share tier4_autoware_launch)/rviz/autoware.rviz" description="rviz config"/>
<arg name="lanelet2_map_file" default="lanelet2_map.osm" description="lanelet2 map file name"/>
<arg name="pointcloud_map_file" default="pointcloud_map.pcd" description="pointcloud map file name"/>
<!-- Optional parameters for scenario simulation -->
Expand All @@ -24,31 +24,31 @@
</include>

<!-- Vehicle -->
<include file="$(find-pkg-share vehicle_launch)/launch/vehicle.launch.xml">
<include file="$(find-pkg-share tier4_vehicle_launch)/launch/vehicle.launch.xml">
<arg name="vehicle_model" value="$(var vehicle_model)"/>
<arg name="sensor_model" value="$(var sensor_model)"/>
<arg name="simulation" value="$(var vehicle_simulation)"/>
</include>

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

<!-- Map -->
<include file="$(find-pkg-share map_launch)/launch/map.launch.py">
<include file="$(find-pkg-share tier4_map_launch)/launch/map.launch.py">
<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>

<!-- Planning -->
<include file="$(find-pkg-share planning_launch)/launch/planning.launch.xml">
<include file="$(find-pkg-share tier4_planning_launch)/launch/planning.launch.xml">
<arg name="vehicle_info_param_file" value="$(find-pkg-share $(var vehicle_model)_description)/config/vehicle_info.param.yaml"/>
</include>

<!-- Control -->
<include file="$(find-pkg-share control_launch)/launch/control.launch.py">
<include file="$(find-pkg-share tier4_control_launch)/launch/control.launch.py">
<!-- options for lateral_controller_mode: mpc_follower, pure_pursuit -->
<arg name="lateral_controller_mode" value="mpc_follower" />
<arg name="vehicle_info_param_file" value="$(find-pkg-share $(var vehicle_model)_description)/config/vehicle_info.param.yaml"/>
Expand All @@ -62,13 +62,13 @@
</node>

<!-- Rviz -->
<node pkg="rviz2" exec="rviz2" name="rviz2" output="screen" args="-d $(var rviz_config) -s $(find-pkg-share autoware_launch)/rviz/image/autoware.png" if="$(var rviz)"/>
<node pkg="rviz2" exec="rviz2" name="rviz2" output="screen" args="-d $(var rviz_config) -s $(find-pkg-share tier4_autoware_launch)/rviz/image/autoware.png" if="$(var rviz)"/>

<!-- Web Controller -->
<include file="$(find-pkg-share web_controller)/launch/web_controller.launch.xml" unless="$(var scenario_simulation)"/>

<!-- Simulator -->
<include file="$(find-pkg-share simulator_launch)/launch/simulator.launch.xml">
<include file="$(find-pkg-share tier4_simulator_launch)/launch/simulator.launch.xml">
<arg name="scenario_simulation" value="$(var scenario_simulation)"/>
<arg name="perception/enable_detection_failure" value="$(var perception/enable_detection_failure)"/>
<arg name="perception/enable_object_recognition" value="$(var perception/enable_object_recognition)"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
<?xml version="1.0"?>
<package format="3">
<name>autoware_launch</name>
<name>tier4_autoware_launch</name>
<version>0.1.0</version>
<description>The autoware_launch package</description>
<description>The tier4_autoware_launch package</description>

<maintainer email="[email protected]">Yukihiro Saito</maintainer>
<license>Apache License 2.0</license>

<buildtool_depend>ament_cmake_auto</buildtool_depend>

<exec_depend>control_launch</exec_depend>
<exec_depend>global_parameter_loader</exec_depend>
<exec_depend>localization_launch</exec_depend>
<exec_depend>map_launch</exec_depend>
<exec_depend>perception_launch</exec_depend>
<exec_depend>planning_launch</exec_depend>
<exec_depend>python3-bson</exec_depend>
<exec_depend>python3-tornado</exec_depend>
<exec_depend>rviz2</exec_depend>
<exec_depend>sensing_launch</exec_depend>
<exec_depend>simulator_launch</exec_depend>
<exec_depend>system_launch</exec_depend>
<exec_depend>vehicle_launch</exec_depend>
<exec_depend>tier4_control_launch</exec_depend>
<exec_depend>tier4_localization_launch</exec_depend>
<exec_depend>tier4_map_launch</exec_depend>
<exec_depend>tier4_perception_launch</exec_depend>
<exec_depend>tier4_planning_launch</exec_depend>
<exec_depend>tier4_sensing_launch</exec_depend>
<exec_depend>tier4_simulator_launch</exec_depend>
<exec_depend>tier4_system_launch</exec_depend>
<exec_depend>tier4_vehicle_launch</exec_depend>
<exec_depend>web_controller</exec_depend>

<test_depend>ament_lint_auto</test_depend>
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.5)
project(control_launch)
project(tier4_control_launch)

if(NOT CMAKE_CXX_STANDARD)
set(CMAKE_CXX_STANDARD 14)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# control_launch
# tier4_control_launch

## Structure

![control_launch](./control_launch.drawio.svg)
![tier4_control_launch](./control_launch.drawio.svg)

## Package Dependencies

Expand All @@ -13,7 +13,7 @@ Please see `<exec_depend>` in `package.xml`.
You can include as follows in `*.launch.xml` to use `control.launch.py`.

```xml
<include file="$(find-pkg-share control_launch)/launch/control.launch.py">
<include file="$(find-pkg-share tier4_control_launch)/launch/control.launch.py">
<!-- options for lateral_controller_mode: mpc_follower, pure_pursuit -->
<arg name="lateral_controller_mode" value="mpc_follower" />
</include>
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -283,31 +283,31 @@ def add_launch_arg(name: str, default_value=None, description=None):
add_launch_arg(
"lat_controller_param_path",
[
FindPackageShare("control_launch"),
FindPackageShare("tier4_control_launch"),
"/config/trajectory_follower/lateral_controller.param.yaml",
],
"path to the parameter file of lateral controller",
)
add_launch_arg(
"lon_controller_param_path",
[
FindPackageShare("control_launch"),
FindPackageShare("tier4_control_launch"),
"/config/trajectory_follower/longitudinal_controller.param.yaml",
],
"path to the parameter file of longitudinal controller",
)
add_launch_arg(
"latlon_muxer_param_path",
[
FindPackageShare("control_launch"),
FindPackageShare("tier4_control_launch"),
"/config/trajectory_follower/latlon_muxer.param.yaml",
],
"path to the parameter file of latlon muxer",
)
add_launch_arg(
"vehicle_cmd_gate_param_path",
[
FindPackageShare("control_launch"),
FindPackageShare("tier4_control_launch"),
"/config/vehicle_cmd_gate/vehicle_cmd_gate.param.yaml",
],
"path to the parameter file of vehicle_cmd_gate",
Expand Down
Loading

0 comments on commit 740cce2

Please sign in to comment.