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_planning_topic_converter): add prefix autoware_ #7296

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
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ planning/obstacle_stop_planner/** berkay@leodrive.ai bnk@leodrive.ai satoshi.ota
planning/obstacle_velocity_limiter/** maxime.clement@tier4.jp
planning/path_smoother/** maxime.clement@tier4.jp takayuki.murooka@tier4.jp
planning/planning_test_utils/** kyoichi.sugahara@tier4.jp mamoru.sobue@tier4.jp takamasa.horibe@tier4.jp zulfaqar.azmi@tier4.jp
planning/planning_topic_converter/** kosuke.takeuchi@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp
planning/autoware_planning_topic_converter/** kosuke.takeuchi@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp
planning/planning_validator/** kosuke.takeuchi@tier4.jp takamasa.horibe@tier4.jp
planning/route_handler/** fumiya.watanabe@tier4.jp go.sakayori@tier4.jp kosuke.takeuchi@tier4.jp mamoru.sobue@tier4.jp takayuki.murooka@tier4.jp zulfaqar.azmi@tier4.jp
planning/rtc_interface/** fumiya.watanabe@tier4.jp kyoichi.sugahara@tier4.jp satoshi.ota@tier4.jp taiki.tanaka@tier4.jp
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@

<group if="$(eval &quot;'$(var motion_path_planner_type)' == 'none'&quot;)">
<load_composable_node target="/planning/scenario_planning/lane_driving/motion_planning/motion_planning_container">
<composable_node pkg="planning_topic_converter" plugin="planning_topic_converter::PathToTrajectory" name="path_to_trajectory_converter" namespace="">
<composable_node pkg="autoware_planning_topic_converter" plugin="autoware::planning_topic_converter::PathToTrajectory" name="path_to_trajectory_converter" namespace="">
<!-- params -->
<param name="input_topic" value="path_smoother/path"/>
<param name="output_topic" value="path_optimizer/trajectory"/>
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 @@ -59,6 +59,7 @@

<exec_depend>autoware_behavior_velocity_planner</exec_depend>
<exec_depend>autoware_path_optimizer</exec_depend>
<exec_depend>autoware_planning_topic_converter</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>
Expand All @@ -71,7 +72,6 @@
<exec_depend>obstacle_cruise_planner</exec_depend>
<exec_depend>obstacle_stop_planner</exec_depend>
<exec_depend>planning_evaluator</exec_depend>
<exec_depend>planning_topic_converter</exec_depend>
<exec_depend>planning_validator</exec_depend>
<exec_depend>scenario_selector</exec_depend>
<exec_depend>surround_obstacle_checker</exec_depend>
Expand Down
2 changes: 1 addition & 1 deletion planning/.pages
Original file line number Diff line number Diff line change
Expand Up @@ -86,5 +86,5 @@ nav:
- 'Stop Reason Visualizer': https://github.com/autowarefoundation/autoware_tools/blob/main/planning/planning_debug_tools/doc-stop-reason-visualizer.md
- 'Planning Test Utils': planning/planning_test_utils
- 'Planning Test Manager': planning/autoware_planning_test_manager
- 'Planning Topic Converter': planning/planning_topic_converter
- 'Planning Topic Converter': planning/autoware_planning_topic_converter
- 'Planning Validator': planning/planning_validator
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.5)
project(planning_topic_converter)
project(autoware_planning_topic_converter)

### Compile options
if(NOT CMAKE_CXX_STANDARD)
Expand All @@ -17,7 +17,7 @@ ament_auto_add_library(planning_topic_converter SHARED
)

rclcpp_components_register_node(planning_topic_converter
PLUGIN "planning_topic_converter::PathToTrajectory"
PLUGIN "autoware::planning_topic_converter::PathToTrajectory"
EXECUTABLE path_to_trajectory_converter
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ The tools in this package are provided as composable ROS 2 component nodes, so t

```xml
<load_composable_node target="container_name">
<composable_node pkg="planning_topic_converter" plugin="planning_topic_converter::PathToTrajectory" name="path_to_trajectory_converter" namespace="">
<composable_node pkg="planning_topic_converter" plugin="autoware::planning_topic_converter::PathToTrajectory" name="path_to_trajectory_converter" namespace="">
<!-- params -->
<param name="input_topic" value="foo"/>
<param name="output_topic" value="bar"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef PLANNING_TOPIC_CONVERTER__CONVERTER_BASE_HPP_
#define PLANNING_TOPIC_CONVERTER__CONVERTER_BASE_HPP_
#ifndef AUTOWARE_PLANNING_TOPIC_CONVERTER__CONVERTER_BASE_HPP_
#define AUTOWARE_PLANNING_TOPIC_CONVERTER__CONVERTER_BASE_HPP_

#include "rclcpp/rclcpp.hpp"

#include <memory>
#include <string>

namespace planning_topic_converter
namespace autoware::planning_topic_converter
{

template <typename InputType, typename OutputType>
Expand All @@ -46,6 +46,6 @@ class ConverterBase : public rclcpp::Node
private:
};

} // namespace planning_topic_converter
} // namespace autoware::planning_topic_converter

#endif // PLANNING_TOPIC_CONVERTER__CONVERTER_BASE_HPP_
#endif // AUTOWARE_PLANNING_TOPIC_CONVERTER__CONVERTER_BASE_HPP_
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef PLANNING_TOPIC_CONVERTER__PATH_TO_TRAJECTORY_HPP_
#define PLANNING_TOPIC_CONVERTER__PATH_TO_TRAJECTORY_HPP_
#ifndef AUTOWARE_PLANNING_TOPIC_CONVERTER__PATH_TO_TRAJECTORY_HPP_
#define AUTOWARE_PLANNING_TOPIC_CONVERTER__PATH_TO_TRAJECTORY_HPP_

#include "planning_topic_converter/converter_base.hpp"
#include "autoware_planning_topic_converter/converter_base.hpp"
#include "rclcpp/rclcpp.hpp"

#include <autoware_planning_msgs/msg/path.hpp>
#include <autoware_planning_msgs/msg/trajectory.hpp>

#include <string>

namespace planning_topic_converter
namespace autoware::planning_topic_converter
{

using autoware_planning_msgs::msg::Path;
Expand All @@ -40,6 +40,6 @@ class PathToTrajectory : public ConverterBase<Path, Trajectory>
void process(const Path::ConstSharedPtr msg) override;
};

} // namespace planning_topic_converter
} // namespace autoware::planning_topic_converter

#endif // PLANNING_TOPIC_CONVERTER__PATH_TO_TRAJECTORY_HPP_
#endif // AUTOWARE_PLANNING_TOPIC_CONVERTER__PATH_TO_TRAJECTORY_HPP_
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<package format="3">
<name>planning_topic_converter</name>
<name>autoware_planning_topic_converter</name>
<version>0.1.0</version>
<description>The planning_topic_converter package</description>
<description>The autoware_planning_topic_converter package</description>

<maintainer email="satoshi.ota@tier4.jp">Satoshi OTA</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,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "planning_topic_converter/path_to_trajectory.hpp"
#include "autoware_planning_topic_converter/path_to_trajectory.hpp"

#include <motion_utils/trajectory/conversion.hpp>
#include <tier4_autoware_utils/geometry/geometry.hpp>

namespace planning_topic_converter
namespace autoware::planning_topic_converter
{
namespace
{
Expand Down Expand Up @@ -54,7 +54,7 @@ void PathToTrajectory::process(const Path::ConstSharedPtr msg)
pub_->publish(output);
}

} // namespace planning_topic_converter
} // namespace autoware::planning_topic_converter

#include <rclcpp_components/register_node_macro.hpp>
RCLCPP_COMPONENTS_REGISTER_NODE(planning_topic_converter::PathToTrajectory)
RCLCPP_COMPONENTS_REGISTER_NODE(autoware::planning_topic_converter::PathToTrajectory)
Loading