From ff2fbd658e2a20b0f7aa30402ee7d432dcb4d0dd Mon Sep 17 00:00:00 2001 From: Satoshi OTA <44889564+satoshi-ota@users.noreply.github.com> Date: Thu, 6 Jun 2024 18:59:28 +0900 Subject: [PATCH] chore(autoware_external_velocity_limit_selector): add prefix `autoware_` (#7295) chore(autoware_external_velocity_limit_selector): rename Signed-off-by: satoshi-ota --- .github/CODEOWNERS | 2 +- .../scenario_planning/scenario_planning.launch.xml | 2 +- launch/tier4_planning_launch/package.xml | 2 +- planning/.pages | 2 +- .../CMakeLists.txt | 4 ++-- .../README.md | 0 .../config/default.param.yaml | 0 .../config/default_common.param.yaml | 0 .../image/external_velocity_limit_selector.png | Bin .../external_velocity_limit_selector_node.hpp | 10 +++++++--- .../external_velocity_limit_selector.launch.xml | 6 +++--- .../package.xml | 4 ++-- .../src/external_velocity_limit_selector_node.cpp | 9 +++++++-- 13 files changed, 25 insertions(+), 16 deletions(-) rename planning/{external_velocity_limit_selector => autoware_external_velocity_limit_selector}/CMakeLists.txt (73%) rename planning/{external_velocity_limit_selector => autoware_external_velocity_limit_selector}/README.md (100%) rename planning/{external_velocity_limit_selector => autoware_external_velocity_limit_selector}/config/default.param.yaml (100%) rename planning/{external_velocity_limit_selector => autoware_external_velocity_limit_selector}/config/default_common.param.yaml (100%) rename planning/{external_velocity_limit_selector => autoware_external_velocity_limit_selector}/image/external_velocity_limit_selector.png (100%) rename planning/{external_velocity_limit_selector/include/external_velocity_limit_selector => autoware_external_velocity_limit_selector/include/autoware_external_velocity_limit_selector}/external_velocity_limit_selector_node.hpp (87%) rename planning/{external_velocity_limit_selector => autoware_external_velocity_limit_selector}/launch/external_velocity_limit_selector.launch.xml (74%) rename planning/{external_velocity_limit_selector => autoware_external_velocity_limit_selector}/package.xml (88%) rename planning/{external_velocity_limit_selector => autoware_external_velocity_limit_selector}/src/external_velocity_limit_selector_node.cpp (96%) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index ac3fc7c7c955e..efdd2121bf369 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -177,7 +177,7 @@ planning/behavior_velocity_stop_line_module/** fumiya.watanabe@tier4.jp shumpei. planning/behavior_velocity_traffic_light_module/** mamoru.sobue@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp tomoya.kimura@tier4.jp planning/behavior_velocity_walkway_module/** satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp takayuki.murooka@tier4.jp tomoya.kimura@tier4.jp planning/costmap_generator/** kosuke.takeuchi@tier4.jp takamasa.horibe@tier4.jp takayuki.murooka@tier4.jp -planning/external_velocity_limit_selector/** satoshi.ota@tier4.jp shinnosuke.hirakawa@tier4.jp shumpei.wakabayashi@tier4.jp tomohito.ando@tier4.jp tomoya.kimura@tier4.jp +planning/autoware_external_velocity_limit_selector/** satoshi.ota@tier4.jp shinnosuke.hirakawa@tier4.jp shumpei.wakabayashi@tier4.jp tomohito.ando@tier4.jp tomoya.kimura@tier4.jp planning/freespace_planner/** kosuke.takeuchi@tier4.jp takamasa.horibe@tier4.jp takayuki.murooka@tier4.jp planning/freespace_planning_algorithms/** kosuke.takeuchi@tier4.jp takamasa.horibe@tier4.jp takayuki.murooka@tier4.jp planning/mission_planner/** isamu.takagi@tier4.jp kosuke.takeuchi@tier4.jp mamoru.sobue@tier4.jp ryohsuke.mitsudome@tier4.jp takamasa.horibe@tier4.jp takayuki.murooka@tier4.jp diff --git a/launch/tier4_planning_launch/launch/scenario_planning/scenario_planning.launch.xml b/launch/tier4_planning_launch/launch/scenario_planning/scenario_planning.launch.xml index be85ee704ff95..6a7e00154256a 100644 --- a/launch/tier4_planning_launch/launch/scenario_planning/scenario_planning.launch.xml +++ b/launch/tier4_planning_launch/launch/scenario_planning/scenario_planning.launch.xml @@ -19,7 +19,7 @@ - + diff --git a/launch/tier4_planning_launch/package.xml b/launch/tier4_planning_launch/package.xml index cf96cd39043ce..d07fc67b33751 100644 --- a/launch/tier4_planning_launch/package.xml +++ b/launch/tier4_planning_launch/package.xml @@ -58,13 +58,13 @@ autoware_cmake autoware_behavior_velocity_planner + autoware_external_velocity_limit_selector autoware_path_optimizer autoware_remaining_distance_time_calculator autoware_velocity_smoother behavior_path_planner costmap_generator external_cmd_selector - external_velocity_limit_selector freespace_planner glog_component mission_planner diff --git a/planning/.pages b/planning/.pages index 48dc8f32edf71..07643e854b0ca 100644 --- a/planning/.pages +++ b/planning/.pages @@ -74,7 +74,7 @@ nav: - 'Static Centerline Generator': planning/autoware_static_centerline_generator - 'API and Library': - 'Costmap Generator': planning/costmap_generator - - 'External Velocity Limit Selector': planning/external_velocity_limit_selector + - 'External Velocity Limit Selector': planning/autoware_external_velocity_limit_selector - 'Objects of Interest Marker Interface': planning/objects_of_interest_marker_interface - 'Route Handler': planning/route_handler - 'RTC Interface': planning/rtc_interface diff --git a/planning/external_velocity_limit_selector/CMakeLists.txt b/planning/autoware_external_velocity_limit_selector/CMakeLists.txt similarity index 73% rename from planning/external_velocity_limit_selector/CMakeLists.txt rename to planning/autoware_external_velocity_limit_selector/CMakeLists.txt index db83dcf3cad4a..40f0ebb2a3eba 100644 --- a/planning/external_velocity_limit_selector/CMakeLists.txt +++ b/planning/autoware_external_velocity_limit_selector/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.14) -project(external_velocity_limit_selector) +project(autoware_external_velocity_limit_selector) find_package(autoware_cmake REQUIRED) autoware_package() @@ -9,7 +9,7 @@ ament_auto_add_library(external_velocity_limit_selector_node SHARED ) rclcpp_components_register_node(external_velocity_limit_selector_node - PLUGIN "ExternalVelocityLimitSelectorNode" + PLUGIN "autoware::external_velocity_limit_selector::ExternalVelocityLimitSelectorNode" EXECUTABLE external_velocity_limit_selector ) diff --git a/planning/external_velocity_limit_selector/README.md b/planning/autoware_external_velocity_limit_selector/README.md similarity index 100% rename from planning/external_velocity_limit_selector/README.md rename to planning/autoware_external_velocity_limit_selector/README.md diff --git a/planning/external_velocity_limit_selector/config/default.param.yaml b/planning/autoware_external_velocity_limit_selector/config/default.param.yaml similarity index 100% rename from planning/external_velocity_limit_selector/config/default.param.yaml rename to planning/autoware_external_velocity_limit_selector/config/default.param.yaml diff --git a/planning/external_velocity_limit_selector/config/default_common.param.yaml b/planning/autoware_external_velocity_limit_selector/config/default_common.param.yaml similarity index 100% rename from planning/external_velocity_limit_selector/config/default_common.param.yaml rename to planning/autoware_external_velocity_limit_selector/config/default_common.param.yaml diff --git a/planning/external_velocity_limit_selector/image/external_velocity_limit_selector.png b/planning/autoware_external_velocity_limit_selector/image/external_velocity_limit_selector.png similarity index 100% rename from planning/external_velocity_limit_selector/image/external_velocity_limit_selector.png rename to planning/autoware_external_velocity_limit_selector/image/external_velocity_limit_selector.png diff --git a/planning/external_velocity_limit_selector/include/external_velocity_limit_selector/external_velocity_limit_selector_node.hpp b/planning/autoware_external_velocity_limit_selector/include/autoware_external_velocity_limit_selector/external_velocity_limit_selector_node.hpp similarity index 87% rename from planning/external_velocity_limit_selector/include/external_velocity_limit_selector/external_velocity_limit_selector_node.hpp rename to planning/autoware_external_velocity_limit_selector/include/autoware_external_velocity_limit_selector/external_velocity_limit_selector_node.hpp index 93fad135ac678..e4043f1aeb986 100644 --- a/planning/external_velocity_limit_selector/include/external_velocity_limit_selector/external_velocity_limit_selector_node.hpp +++ b/planning/autoware_external_velocity_limit_selector/include/autoware_external_velocity_limit_selector/external_velocity_limit_selector_node.hpp @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef EXTERNAL_VELOCITY_LIMIT_SELECTOR__EXTERNAL_VELOCITY_LIMIT_SELECTOR_NODE_HPP_ -#define EXTERNAL_VELOCITY_LIMIT_SELECTOR__EXTERNAL_VELOCITY_LIMIT_SELECTOR_NODE_HPP_ +#ifndef AUTOWARE_EXTERNAL_VELOCITY_LIMIT_SELECTOR__EXTERNAL_VELOCITY_LIMIT_SELECTOR_NODE_HPP_ +#define AUTOWARE_EXTERNAL_VELOCITY_LIMIT_SELECTOR__EXTERNAL_VELOCITY_LIMIT_SELECTOR_NODE_HPP_ #include @@ -26,6 +26,9 @@ #include #include +namespace autoware::external_velocity_limit_selector +{ + using tier4_debug_msgs::msg::StringStamped; using tier4_planning_msgs::msg::VelocityLimit; using tier4_planning_msgs::msg::VelocityLimitClearCommand; @@ -77,5 +80,6 @@ class ExternalVelocityLimitSelectorNode : public rclcpp::Node VelocityLimit hardest_limit_{}; VelocityLimitTable velocity_limit_table_; }; +} // namespace autoware::external_velocity_limit_selector -#endif // EXTERNAL_VELOCITY_LIMIT_SELECTOR__EXTERNAL_VELOCITY_LIMIT_SELECTOR_NODE_HPP_ +#endif // AUTOWARE_EXTERNAL_VELOCITY_LIMIT_SELECTOR__EXTERNAL_VELOCITY_LIMIT_SELECTOR_NODE_HPP_ diff --git a/planning/external_velocity_limit_selector/launch/external_velocity_limit_selector.launch.xml b/planning/autoware_external_velocity_limit_selector/launch/external_velocity_limit_selector.launch.xml similarity index 74% rename from planning/external_velocity_limit_selector/launch/external_velocity_limit_selector.launch.xml rename to planning/autoware_external_velocity_limit_selector/launch/external_velocity_limit_selector.launch.xml index 5ef089f3d3ee7..42c8709b6663a 100644 --- a/planning/external_velocity_limit_selector/launch/external_velocity_limit_selector.launch.xml +++ b/planning/autoware_external_velocity_limit_selector/launch/external_velocity_limit_selector.launch.xml @@ -1,7 +1,7 @@ - - + + @@ -10,7 +10,7 @@ - + diff --git a/planning/external_velocity_limit_selector/package.xml b/planning/autoware_external_velocity_limit_selector/package.xml similarity index 88% rename from planning/external_velocity_limit_selector/package.xml rename to planning/autoware_external_velocity_limit_selector/package.xml index e83966c7b876d..803e32237e938 100644 --- a/planning/external_velocity_limit_selector/package.xml +++ b/planning/autoware_external_velocity_limit_selector/package.xml @@ -1,9 +1,9 @@ - external_velocity_limit_selector + autoware_external_velocity_limit_selector 0.1.0 - The external_velocity_limit_selector ROS 2 package + The autoware_external_velocity_limit_selector ROS 2 package Satoshi Ota Shinnosuke Hirakawa Shumpei Wakabayashi diff --git a/planning/external_velocity_limit_selector/src/external_velocity_limit_selector_node.cpp b/planning/autoware_external_velocity_limit_selector/src/external_velocity_limit_selector_node.cpp similarity index 96% rename from planning/external_velocity_limit_selector/src/external_velocity_limit_selector_node.cpp rename to planning/autoware_external_velocity_limit_selector/src/external_velocity_limit_selector_node.cpp index 5e557167ac3e1..008b58df303b1 100644 --- a/planning/external_velocity_limit_selector/src/external_velocity_limit_selector_node.cpp +++ b/planning/autoware_external_velocity_limit_selector/src/external_velocity_limit_selector_node.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "external_velocity_limit_selector/external_velocity_limit_selector_node.hpp" +#include "autoware_external_velocity_limit_selector/external_velocity_limit_selector_node.hpp" #include #include @@ -21,6 +21,9 @@ #include #include +namespace autoware::external_velocity_limit_selector +{ + namespace { VelocityLimit getHardestLimit( @@ -236,6 +239,8 @@ void ExternalVelocityLimitSelectorNode::updateVelocityLimit() hardest_limit_ = getHardestLimit(velocity_limit_table_, node_param_); } +} // namespace autoware::external_velocity_limit_selector #include -RCLCPP_COMPONENTS_REGISTER_NODE(ExternalVelocityLimitSelectorNode) +RCLCPP_COMPONENTS_REGISTER_NODE( + autoware::external_velocity_limit_selector::ExternalVelocityLimitSelectorNode)