From 761bbf08a54cfd5702ec3dc5140f86d0578d690f Mon Sep 17 00:00:00 2001 From: kminoda <44218668+kminoda@users.noreply.github.com> Date: Wed, 18 Jan 2023 11:55:13 +0900 Subject: [PATCH] feat(simulator_launch): replace with tier4_simulator_launch (#698) * fix(simulator_launch): use tier4_perception_launch Signed-off-by: kminoda * feat(simulator_launch): replace with tier4_simulator_launch Signed-off-by: kminoda * remove simulator_launch Signed-off-by: kminoda * fix dependency Signed-off-by: kminoda Signed-off-by: kminoda --- .../simulator}/fault_injection.param.yaml | 0 .../tier4_simulator_component.launch.xml | 34 +++++++++++++++++++ .../launch/planning_simulator.launch.xml | 3 +- autoware_launch/package.xml | 2 +- simulator_launch/CMakeLists.txt | 15 -------- simulator_launch/README.md | 15 -------- simulator_launch/package.xml | 23 ------------- simulator_launch/simulator_launch.drawio.svg | 4 --- 8 files changed, 37 insertions(+), 59 deletions(-) rename {simulator_launch/config => autoware_launch/config/simulator}/fault_injection.param.yaml (100%) create mode 100644 autoware_launch/launch/components/tier4_simulator_component.launch.xml delete mode 100644 simulator_launch/CMakeLists.txt delete mode 100644 simulator_launch/README.md delete mode 100644 simulator_launch/package.xml delete mode 100644 simulator_launch/simulator_launch.drawio.svg diff --git a/simulator_launch/config/fault_injection.param.yaml b/autoware_launch/config/simulator/fault_injection.param.yaml similarity index 100% rename from simulator_launch/config/fault_injection.param.yaml rename to autoware_launch/config/simulator/fault_injection.param.yaml diff --git a/autoware_launch/launch/components/tier4_simulator_component.launch.xml b/autoware_launch/launch/components/tier4_simulator_component.launch.xml new file mode 100644 index 0000000000..34b7258fbc --- /dev/null +++ b/autoware_launch/launch/components/tier4_simulator_component.launch.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/autoware_launch/launch/planning_simulator.launch.xml b/autoware_launch/launch/planning_simulator.launch.xml index ea118ff8ed..77e13311cc 100644 --- a/autoware_launch/launch/planning_simulator.launch.xml +++ b/autoware_launch/launch/planning_simulator.launch.xml @@ -60,7 +60,7 @@ - + @@ -69,6 +69,7 @@ + diff --git a/autoware_launch/package.xml b/autoware_launch/package.xml index 76260f859c..07eb1b22e2 100644 --- a/autoware_launch/package.xml +++ b/autoware_launch/package.xml @@ -17,12 +17,12 @@ python3-bson python3-tornado rviz2 - simulator_launch system_launch tier4_localization_launch tier4_map_launch tier4_perception_launch tier4_sensing_launch + tier4_simulator_launch tier4_vehicle_launch ament_lint_auto diff --git a/simulator_launch/CMakeLists.txt b/simulator_launch/CMakeLists.txt deleted file mode 100644 index 05e5c27e2b..0000000000 --- a/simulator_launch/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -cmake_minimum_required(VERSION 3.5) -project(simulator_launch) - -find_package(ament_cmake_auto REQUIRED) -ament_auto_find_build_dependencies() - -if(BUILD_TESTING) - find_package(ament_lint_auto REQUIRED) - ament_lint_auto_find_test_dependencies() -endif() - -ament_auto_package(INSTALL_TO_SHARE - launch - config -) diff --git a/simulator_launch/README.md b/simulator_launch/README.md deleted file mode 100644 index d52b6c16a6..0000000000 --- a/simulator_launch/README.md +++ /dev/null @@ -1,15 +0,0 @@ -# simulator_launch - -## Structure - -![simulator_launch](./simulator_launch.drawio.svg) - -## Package Dependencies - -Please see `` in `package.xml`. - -## Usage - -```xml - -``` diff --git a/simulator_launch/package.xml b/simulator_launch/package.xml deleted file mode 100644 index 03d415a7a8..0000000000 --- a/simulator_launch/package.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - simulator_launch - 0.1.0 - The simulator_launch package - - Keisuke Shima - Apache License 2.0 - - ament_cmake_auto - - dummy_perception_publisher - fault_injection - simple_planning_simulator - - ament_lint_auto - autoware_lint_common - - - ament_cmake - - diff --git a/simulator_launch/simulator_launch.drawio.svg b/simulator_launch/simulator_launch.drawio.svg deleted file mode 100644 index d86b068066..0000000000 --- a/simulator_launch/simulator_launch.drawio.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - -
simulator.launch.xml

package: simulator_launch
simulator.launch.xml...
fault_injection.launch.xml

package: fault_injection
fault_injection.launch.xm...
simple_planning_simulator.launch.xml

package: simple_planning_simulator
simple_planning_simulator.launch.xml...
True
True
$(var vehicle_simulation)
$(var vehicle_simulation)
launch name

package: package name
launch name...
ex:
ex:
node name

package: package name
node name...
$(var scenario_simulation)
$(var scenario_simulation)
False
False
other name

package: package name
other name...
True
True
$(var scenario_simulation)
$(var scenario_simulation)
False
False
dummy_perception_publisher.launch.xml

package: dummy_perception_publisher
dummy_perception_publisher.launch.xml...Viewer does not support full SVG 1.1 \ No newline at end of file