From 1ca39a8613ca73459707ae744c24ac2c1f71cb2e Mon Sep 17 00:00:00 2001 From: a-maumau Date: Thu, 26 Sep 2024 18:04:09 +0900 Subject: [PATCH 1/2] add autoware prefix Signed-off-by: a-maumau --- .github/CODEOWNERS | 2 +- .../tier4_simulator_launch/launch/simulator.launch.xml | 4 ++-- .../CMakeLists.txt | 4 ++-- .../README.md | 2 +- .../config/vehicle_velocity_converter.param.yaml | 0 .../launch/vehicle_velocity_converter.launch.xml | 4 ++-- .../package.xml | 4 ++-- .../schema/vehicle_velocity_converter.json | 0 .../src/vehicle_velocity_converter.cpp | 7 +++++-- .../src}/vehicle_velocity_converter.hpp | 9 ++++++--- 10 files changed, 21 insertions(+), 15 deletions(-) rename sensing/{vehicle_velocity_converter => autoware_vehicle_velocity_converter}/CMakeLists.txt (75%) rename sensing/{vehicle_velocity_converter => autoware_vehicle_velocity_converter}/README.md (97%) rename sensing/{vehicle_velocity_converter => autoware_vehicle_velocity_converter}/config/vehicle_velocity_converter.param.yaml (100%) rename sensing/{vehicle_velocity_converter => autoware_vehicle_velocity_converter}/launch/vehicle_velocity_converter.launch.xml (60%) rename sensing/{vehicle_velocity_converter => autoware_vehicle_velocity_converter}/package.xml (84%) rename sensing/{vehicle_velocity_converter => autoware_vehicle_velocity_converter}/schema/vehicle_velocity_converter.json (100%) rename sensing/{vehicle_velocity_converter => autoware_vehicle_velocity_converter}/src/vehicle_velocity_converter.cpp (91%) rename sensing/{vehicle_velocity_converter/include/vehicle_velocity_converter => autoware_vehicle_velocity_converter/src}/vehicle_velocity_converter.hpp (86%) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 205f6c7fb4438..e411e95805efb 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -210,7 +210,7 @@ sensing/autoware_radar_threshold_filter/** satoshi.tanaka@tier4.jp shunsuke.miur sensing/autoware_radar_tracks_noise_filter/** satoshi.tanaka@tier4.jp shunsuke.miura@tier4.jp taekjin.lee@tier4.jp yoshi.ri@tier4.jp sensing/cuda_utils/** daisuke.nishimatsu@tier4.jp manato.hirabayashi@tier4.jp sensing/livox/autoware_livox_tag_filter/** kenzo.lobos@tier4.jp ryohsuke.mitsudome@tier4.jp -sensing/vehicle_velocity_converter/** ryu.yamamoto@tier4.jp +sensing/autoware_vehicle_velocity_converter/** ryu.yamamoto@tier4.jp simulator/autoware_carla_interface/** maxime.clement@tier4.jp mradityagio@gmail.com simulator/dummy_perception_publisher/** yukihiro.saito@tier4.jp simulator/fault_injection/** keisuke.shima@tier4.jp diff --git a/launch/tier4_simulator_launch/launch/simulator.launch.xml b/launch/tier4_simulator_launch/launch/simulator.launch.xml index 330abaee3c839..a5d6d842491a1 100644 --- a/launch/tier4_simulator_launch/launch/simulator.launch.xml +++ b/launch/tier4_simulator_launch/launch/simulator.launch.xml @@ -187,9 +187,9 @@ - + - + diff --git a/sensing/vehicle_velocity_converter/CMakeLists.txt b/sensing/autoware_vehicle_velocity_converter/CMakeLists.txt similarity index 75% rename from sensing/vehicle_velocity_converter/CMakeLists.txt rename to sensing/autoware_vehicle_velocity_converter/CMakeLists.txt index bb50fbff90c4b..9ff990b928f91 100644 --- a/sensing/vehicle_velocity_converter/CMakeLists.txt +++ b/sensing/autoware_vehicle_velocity_converter/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.14) -project(vehicle_velocity_converter) +project(autoware_vehicle_velocity_converter) find_package(autoware_cmake REQUIRED) autoware_package() @@ -9,7 +9,7 @@ ament_auto_add_library(${PROJECT_NAME} SHARED ) rclcpp_components_register_node(${PROJECT_NAME} - PLUGIN "VehicleVelocityConverter" + PLUGIN "autoware::vehicle_velocity_converter::VehicleVelocityConverter" EXECUTABLE ${PROJECT_NAME}_node EXECUTOR SingleThreadedExecutor ) diff --git a/sensing/vehicle_velocity_converter/README.md b/sensing/autoware_vehicle_velocity_converter/README.md similarity index 97% rename from sensing/vehicle_velocity_converter/README.md rename to sensing/autoware_vehicle_velocity_converter/README.md index 3c7292f3fcdc4..f398a72ea824d 100644 --- a/sensing/vehicle_velocity_converter/README.md +++ b/sensing/autoware_vehicle_velocity_converter/README.md @@ -1,4 +1,4 @@ -# vehicle_velocity_converter +# autoware_vehicle_velocity_converter ## Purpose diff --git a/sensing/vehicle_velocity_converter/config/vehicle_velocity_converter.param.yaml b/sensing/autoware_vehicle_velocity_converter/config/vehicle_velocity_converter.param.yaml similarity index 100% rename from sensing/vehicle_velocity_converter/config/vehicle_velocity_converter.param.yaml rename to sensing/autoware_vehicle_velocity_converter/config/vehicle_velocity_converter.param.yaml diff --git a/sensing/vehicle_velocity_converter/launch/vehicle_velocity_converter.launch.xml b/sensing/autoware_vehicle_velocity_converter/launch/vehicle_velocity_converter.launch.xml similarity index 60% rename from sensing/vehicle_velocity_converter/launch/vehicle_velocity_converter.launch.xml rename to sensing/autoware_vehicle_velocity_converter/launch/vehicle_velocity_converter.launch.xml index 84e1838dc89eb..d8386e3b80820 100644 --- a/sensing/vehicle_velocity_converter/launch/vehicle_velocity_converter.launch.xml +++ b/sensing/autoware_vehicle_velocity_converter/launch/vehicle_velocity_converter.launch.xml @@ -1,9 +1,9 @@ - + - + diff --git a/sensing/vehicle_velocity_converter/package.xml b/sensing/autoware_vehicle_velocity_converter/package.xml similarity index 84% rename from sensing/vehicle_velocity_converter/package.xml rename to sensing/autoware_vehicle_velocity_converter/package.xml index b32b51bc52e10..f8fd91d19ed14 100644 --- a/sensing/vehicle_velocity_converter/package.xml +++ b/sensing/autoware_vehicle_velocity_converter/package.xml @@ -1,9 +1,9 @@ - vehicle_velocity_converter + autoware_vehicle_velocity_converter 0.0.0 - The vehicle_velocity_converter package + The autoware_vehicle_velocity_converter package Ryu Yamamoto Apache License 2.0 diff --git a/sensing/vehicle_velocity_converter/schema/vehicle_velocity_converter.json b/sensing/autoware_vehicle_velocity_converter/schema/vehicle_velocity_converter.json similarity index 100% rename from sensing/vehicle_velocity_converter/schema/vehicle_velocity_converter.json rename to sensing/autoware_vehicle_velocity_converter/schema/vehicle_velocity_converter.json diff --git a/sensing/vehicle_velocity_converter/src/vehicle_velocity_converter.cpp b/sensing/autoware_vehicle_velocity_converter/src/vehicle_velocity_converter.cpp similarity index 91% rename from sensing/vehicle_velocity_converter/src/vehicle_velocity_converter.cpp rename to sensing/autoware_vehicle_velocity_converter/src/vehicle_velocity_converter.cpp index c382f0f16f6e5..e1dc2e8403b62 100644 --- a/sensing/vehicle_velocity_converter/src/vehicle_velocity_converter.cpp +++ b/sensing/autoware_vehicle_velocity_converter/src/vehicle_velocity_converter.cpp @@ -12,8 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "vehicle_velocity_converter/vehicle_velocity_converter.hpp" +#include "vehicle_velocity_converter.hpp" +namespace autoware::vehicle_velocity_converter +{ VehicleVelocityConverter::VehicleVelocityConverter(const rclcpp::NodeOptions & options) : rclcpp::Node("vehicle_velocity_converter", options) { @@ -53,6 +55,7 @@ void VehicleVelocityConverter::callback_velocity_report( twist_with_covariance_pub_->publish(twist_with_covariance_msg); } +} // namespace autoware::vehicle_velocity_converter #include -RCLCPP_COMPONENTS_REGISTER_NODE(VehicleVelocityConverter) +RCLCPP_COMPONENTS_REGISTER_NODE(autoware::vehicle_velocity_converter::VehicleVelocityConverter) diff --git a/sensing/vehicle_velocity_converter/include/vehicle_velocity_converter/vehicle_velocity_converter.hpp b/sensing/autoware_vehicle_velocity_converter/src/vehicle_velocity_converter.hpp similarity index 86% rename from sensing/vehicle_velocity_converter/include/vehicle_velocity_converter/vehicle_velocity_converter.hpp rename to sensing/autoware_vehicle_velocity_converter/src/vehicle_velocity_converter.hpp index 5f7b1c044d7e3..9d65e34c4457c 100644 --- a/sensing/vehicle_velocity_converter/include/vehicle_velocity_converter/vehicle_velocity_converter.hpp +++ b/sensing/autoware_vehicle_velocity_converter/src/vehicle_velocity_converter.hpp @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef VEHICLE_VELOCITY_CONVERTER__VEHICLE_VELOCITY_CONVERTER_HPP_ -#define VEHICLE_VELOCITY_CONVERTER__VEHICLE_VELOCITY_CONVERTER_HPP_ +#ifndef VEHICLE_VELOCITY_CONVERTER_HPP_ +#define VEHICLE_VELOCITY_CONVERTER_HPP_ #include @@ -25,6 +25,8 @@ #include #include +namespace autoware::vehicle_velocity_converter +{ class VehicleVelocityConverter : public rclcpp::Node { public: @@ -43,5 +45,6 @@ class VehicleVelocityConverter : public rclcpp::Node double stddev_wz_; double speed_scale_factor_; }; +} // namespace autoware::vehicle_velocity_converter -#endif // VEHICLE_VELOCITY_CONVERTER__VEHICLE_VELOCITY_CONVERTER_HPP_ +#endif // VEHICLE_VELOCITY_CONVERTER_HPP_ From eae1f995d28b7f9c3b6b469000d96997af56bf9f Mon Sep 17 00:00:00 2001 From: a-maumau Date: Fri, 15 Nov 2024 10:28:22 +0900 Subject: [PATCH 2/2] fix conflict Signed-off-by: a-maumau --- sensing/autoware_vehicle_velocity_converter/package.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sensing/autoware_vehicle_velocity_converter/package.xml b/sensing/autoware_vehicle_velocity_converter/package.xml index f8fd91d19ed14..323002396c841 100644 --- a/sensing/autoware_vehicle_velocity_converter/package.xml +++ b/sensing/autoware_vehicle_velocity_converter/package.xml @@ -2,7 +2,7 @@ autoware_vehicle_velocity_converter - 0.0.0 + 0.38.0 The autoware_vehicle_velocity_converter package Ryu Yamamoto Apache License 2.0