From d8c20f6980f2dfacac1a3efc5833469b4c5eb087 Mon Sep 17 00:00:00 2001 From: "tier4-autoware-public-bot[bot]" <98652886+tier4-autoware-public-bot[bot]@users.noreply.github.com> Date: Tue, 15 Nov 2022 18:42:13 +0900 Subject: [PATCH] feat!: use tier4_vehicle_launch instead of vehicle_launch (backport #538) (#562) feat!: use tier4_vehicle_launch instead of vehicle_launch (#538) * feat: use tier4_vehicle_launch * feat: delete * fix package.xml (cherry picked from commit ca53ef8cb4165ff63704b6a926b74816f91694ab) Co-authored-by: Hiroki OTA --- autoware_launch/launch/autoware.launch.xml | 5 +- .../launch/logging_simulator.launch.xml | 3 +- .../launch/planning_simulator.launch.xml | 5 +- autoware_launch/package.xml | 2 +- vehicle_launch/CMakeLists.txt | 18 ----- vehicle_launch/README.md | 65 ------------------- vehicle_launch/launch/vehicle.launch.xml | 28 -------- .../launch/vehicle_description.launch.xml | 15 ----- vehicle_launch/package.xml | 25 ------- vehicle_launch/urdf/vehicle.xacro | 16 ----- vehicle_launch/vehicle_launch.drawio.svg | 4 -- 11 files changed, 11 insertions(+), 175 deletions(-) delete mode 100644 vehicle_launch/CMakeLists.txt delete mode 100644 vehicle_launch/README.md delete mode 100644 vehicle_launch/launch/vehicle.launch.xml delete mode 100644 vehicle_launch/launch/vehicle_description.launch.xml delete mode 100644 vehicle_launch/package.xml delete mode 100644 vehicle_launch/urdf/vehicle.xacro delete mode 100644 vehicle_launch/vehicle_launch.drawio.svg diff --git a/autoware_launch/launch/autoware.launch.xml b/autoware_launch/launch/autoware.launch.xml index 5b14dd9849..daee5d1f31 100644 --- a/autoware_launch/launch/autoware.launch.xml +++ b/autoware_launch/launch/autoware.launch.xml @@ -4,6 +4,8 @@ + + @@ -29,10 +31,11 @@ - + + diff --git a/autoware_launch/launch/logging_simulator.launch.xml b/autoware_launch/launch/logging_simulator.launch.xml index 1e06453a48..65c153c3d3 100644 --- a/autoware_launch/launch/logging_simulator.launch.xml +++ b/autoware_launch/launch/logging_simulator.launch.xml @@ -44,11 +44,12 @@ - + + diff --git a/autoware_launch/launch/planning_simulator.launch.xml b/autoware_launch/launch/planning_simulator.launch.xml index 2d0ca670d9..64d44edd76 100644 --- a/autoware_launch/launch/planning_simulator.launch.xml +++ b/autoware_launch/launch/planning_simulator.launch.xml @@ -4,6 +4,8 @@ + + @@ -30,10 +32,11 @@ - + + diff --git a/autoware_launch/package.xml b/autoware_launch/package.xml index 037f453faa..66defd0733 100644 --- a/autoware_launch/package.xml +++ b/autoware_launch/package.xml @@ -23,7 +23,7 @@ system_launch tier4_map_launch tier4_sensing_launch - vehicle_launch + tier4_vehicle_launch web_controller ament_lint_auto diff --git a/vehicle_launch/CMakeLists.txt b/vehicle_launch/CMakeLists.txt deleted file mode 100644 index f7f9c23733..0000000000 --- a/vehicle_launch/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -cmake_minimum_required(VERSION 3.5) -project(vehicle_launch) - -add_compile_options(-std=c++14) - -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 - urdf -) diff --git a/vehicle_launch/README.md b/vehicle_launch/README.md deleted file mode 100644 index 135e887a60..0000000000 --- a/vehicle_launch/README.md +++ /dev/null @@ -1,65 +0,0 @@ -# vehicle_launch - -## Structure - -![vehicle_launch](./vehicle_launch.drawio.svg) - -## Package Dependencies - -Please see `` in `package.xml`. - -## Usage - -You can include as follows in `*.launch.xml` to use `vehicle.launch.xml`. - -```xml - - - - - - - -``` - -## Notes - -This package finds some external packages and settings with variables and package names. - -ex.) - - - -```xml - -``` - - - -```xml - -``` - -## vehicle.xacro - -### Arguments - -| Name | Type | Description | Default | -| ------------- | ------ | ------------------ | ------- | -| sensor_model | String | sensor model name | "" | -| vehicle_model | String | vehicle model name | "" | - -### Usage - -You can write as follows in `*.launch.xml`. - -```xml - - - - - - - - -``` diff --git a/vehicle_launch/launch/vehicle.launch.xml b/vehicle_launch/launch/vehicle.launch.xml deleted file mode 100644 index 24a3a19d81..0000000000 --- a/vehicle_launch/launch/vehicle.launch.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vehicle_launch/launch/vehicle_description.launch.xml b/vehicle_launch/launch/vehicle_description.launch.xml deleted file mode 100644 index 5a2bd35382..0000000000 --- a/vehicle_launch/launch/vehicle_description.launch.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/vehicle_launch/package.xml b/vehicle_launch/package.xml deleted file mode 100644 index c598670ac7..0000000000 --- a/vehicle_launch/package.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - vehicle_launch - 0.1.0 - The vehicle_launch package - - Yukihiro Saito - Apache License 2.0 - - ament_cmake_auto - - camera_description - imu_description - livox_description - robot_state_publisher - velodyne_description - xacro - - ament_lint_auto - autoware_lint_common - - - ament_cmake - - diff --git a/vehicle_launch/urdf/vehicle.xacro b/vehicle_launch/urdf/vehicle.xacro deleted file mode 100644 index 30db9c6a7c..0000000000 --- a/vehicle_launch/urdf/vehicle.xacro +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/vehicle_launch/vehicle_launch.drawio.svg b/vehicle_launch/vehicle_launch.drawio.svg deleted file mode 100644 index 13acf18829..0000000000 --- a/vehicle_launch/vehicle_launch.drawio.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - -
vehicle.launch.xml

package: vehicle_launch
vehicle.launch.xml...
vehicle_description.launch.xml

package: vehicle_launch
vehicle_description.launch.xml...
vehicle_interface.launch.xml

package: $(var vehicle_model)_description
vehicle_interface.launch.xml...
False
False
$(var simulation)
$(var simulation)
vehicle.xacro

package: vehicle_launch
  
vehicle.xacro...
vehicle.xacro

package: $(var vehicle_model)_description
vehicle.xacro...
sensors.xacro

package: $(var sensor_model)_description
sensors.xacro...
launch name

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

package: package name
node name...
robot state_publisher

package: robot_state_publisher
robot state_publisher...
other name

package: package name
other name...Viewer does not support full SVG 1.1 \ No newline at end of file