Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(autoware_external_velocity_limit_selector): add prefix autoware_ #7295

Merged
merged 1 commit into from
Jun 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<group>
<!-- external velocity limit selector -->
<group>
<include file="$(find-pkg-share external_velocity_limit_selector)/launch/external_velocity_limit_selector.launch.xml">
<include file="$(find-pkg-share autoware_external_velocity_limit_selector)/launch/external_velocity_limit_selector.launch.xml">
<arg name="common_param_path" value="$(var common_param_path)"/>
<arg name="param_path" value="$(var velocity_smoother_param_path)"/>
</include>
Expand Down
2 changes: 1 addition & 1 deletion launch/tier4_planning_launch/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,13 @@
<buildtool_depend>autoware_cmake</buildtool_depend>

<exec_depend>autoware_behavior_velocity_planner</exec_depend>
<exec_depend>autoware_external_velocity_limit_selector</exec_depend>
<exec_depend>autoware_path_optimizer</exec_depend>
<exec_depend>autoware_remaining_distance_time_calculator</exec_depend>
<exec_depend>autoware_velocity_smoother</exec_depend>
<exec_depend>behavior_path_planner</exec_depend>
<exec_depend>costmap_generator</exec_depend>
<exec_depend>external_cmd_selector</exec_depend>
<exec_depend>external_velocity_limit_selector</exec_depend>
<exec_depend>freespace_planner</exec_depend>
<exec_depend>glog_component</exec_depend>
<exec_depend>mission_planner</exec_depend>
Expand Down
2 changes: 1 addition & 1 deletion planning/.pages
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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()
Expand All @@ -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
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 <rclcpp/rclcpp.hpp>

Expand All @@ -26,6 +26,9 @@
#include <string>
#include <unordered_map>

namespace autoware::external_velocity_limit_selector
{

using tier4_debug_msgs::msg::StringStamped;
using tier4_planning_msgs::msg::VelocityLimit;
using tier4_planning_msgs::msg::VelocityLimitClearCommand;
Expand Down Expand Up @@ -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_
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<launch>
<!-- common param -->
<arg name="common_param_path" default="$(find-pkg-share external_velocity_limit_selector)/config/default_common.param.yaml"/>
<arg name="param_path" default="$(find-pkg-share external_velocity_limit_selector)/config/default.param.yaml"/>
<arg name="common_param_path" default="$(find-pkg-share autoware_external_velocity_limit_selector)/config/default_common.param.yaml"/>
<arg name="param_path" default="$(find-pkg-share autoware_external_velocity_limit_selector)/config/default.param.yaml"/>

<!-- input/output -->
<arg name="input_velocity_limit_from_api" default="/planning/scenario_planning/max_velocity_default"/>
Expand All @@ -10,7 +10,7 @@
<arg name="output_velocity_limit_from_selector" default="/planning/scenario_planning/max_velocity"/>
<arg name="output_debug_string" default="/planning/scenario_planning/external_velocity_limit_selector/debug"/>

<node pkg="external_velocity_limit_selector" exec="external_velocity_limit_selector" name="external_velocity_limit_selector" output="screen">
<node pkg="autoware_external_velocity_limit_selector" exec="external_velocity_limit_selector" name="external_velocity_limit_selector" output="screen">
<param from="$(var common_param_path)"/>
<param from="$(var param_path)"/>
<remap from="input/velocity_limit_from_api" to="$(var input_velocity_limit_from_api)"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0"?>
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>external_velocity_limit_selector</name>
<name>autoware_external_velocity_limit_selector</name>
<version>0.1.0</version>
<description>The external_velocity_limit_selector ROS 2 package</description>
<description>The autoware_external_velocity_limit_selector ROS 2 package</description>
<maintainer email="satoshi.ota@tier4.jp">Satoshi Ota</maintainer>
<maintainer email="shinnosuke.hirakawa@tier4.jp">Shinnosuke Hirakawa</maintainer>
<maintainer email="shumpei.wakabayashi@tier4.jp">Shumpei Wakabayashi</maintainer>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 <deque>
#include <memory>
Expand All @@ -21,6 +21,9 @@
#include <utility>
#include <vector>

namespace autoware::external_velocity_limit_selector
{

namespace
{
VelocityLimit getHardestLimit(
Expand Down Expand Up @@ -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_macro.hpp>
RCLCPP_COMPONENTS_REGISTER_NODE(ExternalVelocityLimitSelectorNode)
RCLCPP_COMPONENTS_REGISTER_NODE(
autoware::external_velocity_limit_selector::ExternalVelocityLimitSelectorNode)
Loading