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

refactor(rtc_interface)!: prefix package and namespace with autoware #7321

Merged
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 planning/.pages
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ nav:
- '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
- 'RTC Interface': planning/autoware_rtc_interface
- 'Additional Tools':
- 'Remaining Distance Time Calculator': planning/autoware_remaining_distance_time_calculator
- 'RTC Replayer': planning/rtc_replayer
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
<buildtool_depend>eigen3_cmake_module</buildtool_depend>

<depend>autoware_behavior_path_planner_common</depend>
<depend>autoware_rtc_interface</depend>
<depend>behavior_path_lane_change_module</depend>
<depend>behavior_path_planner</depend>
<depend>motion_utils</depend>
<depend>pluginlib</depend>
<depend>rclcpp</depend>
<depend>rtc_interface</depend>
<depend>tier4_autoware_utils</depend>
<depend>tier4_planning_msgs</depend>
<depend>visualization_msgs</depend>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@

#include <autoware_behavior_path_planner_common/interface/steering_factor_interface.hpp>
#include <autoware_behavior_path_planner_common/turn_signal_decider.hpp>
#include <autoware_rtc_interface/rtc_interface.hpp>
#include <magic_enum.hpp>
#include <motion_utils/marker/marker_helper.hpp>
#include <motion_utils/trajectory/path_with_lane_id.hpp>
#include <motion_utils/trajectory/trajectory.hpp>
#include <objects_of_interest_marker_interface/objects_of_interest_marker_interface.hpp>
#include <rclcpp/rclcpp.hpp>
#include <route_handler/route_handler.hpp>
#include <rtc_interface/rtc_interface.hpp>
#include <tier4_autoware_utils/geometry/geometry.hpp>
#include <tier4_autoware_utils/ros/marker_helper.hpp>
#include <tier4_autoware_utils/ros/uuid_helper.hpp>
Expand All @@ -56,11 +56,11 @@

namespace behavior_path_planner
{
using autoware::rtc_interface::RTCInterface;
using autoware_adapi_v1_msgs::msg::PlanningBehavior;
using autoware_adapi_v1_msgs::msg::SteeringFactor;
using objects_of_interest_marker_interface::ColorName;
using objects_of_interest_marker_interface::ObjectsOfInterestMarkerInterface;
using rtc_interface::RTCInterface;
using steering_factor_interface::SteeringFactorInterface;
using tier4_autoware_utils::calcOffsetPose;
using tier4_autoware_utils::generateUUID;
Expand Down
2 changes: 1 addition & 1 deletion planning/autoware_behavior_path_planner_common/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
<depend>autoware_adapi_v1_msgs</depend>
<depend>autoware_perception_msgs</depend>
<depend>autoware_planning_msgs</depend>
<depend>autoware_rtc_interface</depend>
<depend>freespace_planning_algorithms</depend>
<depend>geometry_msgs</depend>
<depend>interpolation</depend>
Expand All @@ -56,7 +57,6 @@
<depend>objects_of_interest_marker_interface</depend>
<depend>rclcpp</depend>
<depend>route_handler</depend>
<depend>rtc_interface</depend>
<depend>tf2</depend>
<depend>tier4_autoware_utils</depend>
<depend>tier4_planning_msgs</depend>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@
<buildtool_depend>eigen3_cmake_module</buildtool_depend>

<depend>autoware_behavior_path_planner_common</depend>
<depend>autoware_rtc_interface</depend>
<depend>behavior_path_planner</depend>
<depend>motion_utils</depend>
<depend>pluginlib</depend>
<depend>rclcpp</depend>
<depend>rtc_interface</depend>
<depend>tier4_autoware_utils</depend>
<depend>tier4_planning_msgs</depend>
<depend>visualization_msgs</depend>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

<depend>autoware_behavior_path_planner_common</depend>
<depend>autoware_perception_msgs</depend>
<depend>autoware_rtc_interface</depend>
<depend>behavior_path_planner</depend>
<depend>geometry_msgs</depend>
<depend>lanelet2_extension</depend>
Expand All @@ -32,7 +33,6 @@
<depend>pluginlib</depend>
<depend>rclcpp</depend>
<depend>route_handler</depend>
<depend>rtc_interface</depend>
<depend>sensor_msgs</depend>
<depend>signal_processing</depend>
<depend>tf2</depend>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<depend>autoware_behavior_velocity_planner_common</depend>
<depend>autoware_perception_msgs</depend>
<depend>autoware_planning_msgs</depend>
<depend>autoware_rtc_interface</depend>
<depend>fmt</depend>
<depend>geometry_msgs</depend>
<depend>interpolation</depend>
Expand All @@ -32,7 +33,6 @@
<depend>pluginlib</depend>
<depend>rclcpp</depend>
<depend>route_handler</depend>
<depend>rtc_interface</depend>
<depend>tf2_geometry_msgs</depend>
<depend>tier4_autoware_utils</depend>
<depend>tier4_planning_msgs</depend>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
#define AUTOWARE_BEHAVIOR_VELOCITY_PLANNER_COMMON__SCENE_MODULE_INTERFACE_HPP_

#include <autoware_behavior_velocity_planner_common/planner_data.hpp>
#include <autoware_rtc_interface/rtc_interface.hpp>
#include <builtin_interfaces/msg/time.hpp>
#include <motion_utils/factor/velocity_factor_interface.hpp>
#include <motion_utils/marker/virtual_wall_marker_creator.hpp>
#include <objects_of_interest_marker_interface/objects_of_interest_marker_interface.hpp>
#include <rtc_interface/rtc_interface.hpp>
#include <tier4_autoware_utils/ros/debug_publisher.hpp>
#include <tier4_autoware_utils/ros/parameter.hpp>

Expand Down Expand Up @@ -48,12 +48,12 @@
namespace autoware::behavior_velocity_planner
{

using autoware::rtc_interface::RTCInterface;
using builtin_interfaces::msg::Time;
using motion_utils::PlanningBehavior;
using motion_utils::VelocityFactor;
using objects_of_interest_marker_interface::ColorName;
using objects_of_interest_marker_interface::ObjectsOfInterestMarkerInterface;
using rtc_interface::RTCInterface;
using tier4_autoware_utils::DebugPublisher;
using tier4_autoware_utils::getOrDeclareParameter;
using tier4_debug_msgs::msg::Float64Stamped;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
<depend>autoware_map_msgs</depend>
<depend>autoware_perception_msgs</depend>
<depend>autoware_planning_msgs</depend>
<depend>autoware_rtc_interface</depend>
<depend>autoware_velocity_smoother</depend>
<depend>diagnostic_msgs</depend>
<depend>eigen</depend>
Expand All @@ -36,7 +37,6 @@
<depend>rclcpp</depend>
<depend>rclcpp_components</depend>
<depend>route_handler</depend>
<depend>rtc_interface</depend>
<depend>sensor_msgs</depend>
<depend>tf2</depend>
<depend>tf2_eigen</depend>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.5)
project(rtc_interface)
project(autoware_rtc_interface)

### Compile options
if(NOT CMAKE_CXX_STANDARD)
Expand All @@ -12,7 +12,7 @@ endif()
find_package(ament_cmake_auto REQUIRED)
ament_auto_find_build_dependencies()

ament_auto_add_library(rtc_interface SHARED
ament_auto_add_library(autoware_rtc_interface SHARED
src/rtc_interface.cpp
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ RTC Interface is an interface to publish the decision status of behavior plannin

```c++
// Generate instance (in this example, "intersection" is selected)
rtc_interface::RTCInterface rtc_interface(node, "intersection");
autoware::rtc_interface::RTCInterface rtc_interface(node, "intersection");

// Generate UUID
const unique_identifier_msgs::msg::UUID uuid = generateUUID(getModuleId());
Expand Down Expand Up @@ -51,12 +51,12 @@ rtc_interface.removeCooperateStatus(uuid);
### RTCInterface (Constructor)

```c++
rtc_interface::RTCInterface(rclcpp::Node & node, const std::string & name);
autoware::rtc_interface::RTCInterface(rclcpp::Node & node, const std::string & name);
```

#### Description

A constructor for `rtc_interface::RTCInterface`.
A constructor for `autoware::rtc_interface::RTCInterface`.

#### Input

Expand All @@ -72,7 +72,7 @@ An instance of `RTCInterface`
### publishCooperateStatus

```c++
rtc_interface::publishCooperateStatus(const rclcpp::Time & stamp)
autoware::rtc_interface::publishCooperateStatus(const rclcpp::Time & stamp)
```

#### Description
Expand All @@ -90,7 +90,7 @@ Nothing
### updateCooperateStatus

```c++
rtc_interface::updateCooperateStatus(const unique_identifier_msgs::msg::UUID & uuid, const bool safe, const double start_distance, const double finish_distance, const rclcpp::Time & stamp)
autoware::rtc_interface::updateCooperateStatus(const unique_identifier_msgs::msg::UUID & uuid, const bool safe, const double start_distance, const double finish_distance, const rclcpp::Time & stamp)
```

#### Description
Expand All @@ -113,7 +113,7 @@ Nothing
### removeCooperateStatus

```c++
rtc_interface::removeCooperateStatus(const unique_identifier_msgs::msg::UUID & uuid)
autoware::rtc_interface::removeCooperateStatus(const unique_identifier_msgs::msg::UUID & uuid)
```

#### Description
Expand All @@ -131,7 +131,7 @@ Nothing
### clearCooperateStatus

```c++
rtc_interface::clearCooperateStatus()
autoware::rtc_interface::clearCooperateStatus()
```

#### Description
Expand All @@ -149,7 +149,7 @@ Nothing
### isActivated

```c++
rtc_interface::isActivated(const unique_identifier_msgs::msg::UUID & uuid)
autoware::rtc_interface::isActivated(const unique_identifier_msgs::msg::UUID & uuid)
```

#### Description
Expand All @@ -169,7 +169,7 @@ If not, return `false`.
### isRegistered

```c++
rtc_interface::isRegistered(const unique_identifier_msgs::msg::UUID & uuid)
autoware::rtc_interface::isRegistered(const unique_identifier_msgs::msg::UUID & uuid)
```

#### Description
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 RTC_INTERFACE__RTC_INTERFACE_HPP_
#define RTC_INTERFACE__RTC_INTERFACE_HPP_
#ifndef AUTOWARE_RTC_INTERFACE__RTC_INTERFACE_HPP_
#define AUTOWARE_RTC_INTERFACE__RTC_INTERFACE_HPP_

#include "rclcpp/rclcpp.hpp"

Expand All @@ -33,7 +33,7 @@
#include <string>
#include <vector>

namespace rtc_interface
namespace autoware::rtc_interface
{
using tier4_rtc_msgs::msg::AutoModeStatus;
using tier4_rtc_msgs::msg::Command;
Expand Down Expand Up @@ -101,6 +101,6 @@ class RTCInterface
mutable std::mutex mutex_;
};

} // namespace rtc_interface
} // namespace autoware::rtc_interface

#endif // RTC_INTERFACE__RTC_INTERFACE_HPP_
#endif // AUTOWARE_RTC_INTERFACE__RTC_INTERFACE_HPP_
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<package format="3">
<name>rtc_interface</name>
<name>autoware_rtc_interface</name>
<version>0.1.0</version>
<description>The rtc_interface package</description>
<description>The autoware_rtc_interface package</description>

<maintainer email="[email protected]">Fumiya Watanabe</maintainer>
<maintainer email="[email protected]">Taiki Tanaka</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 "rtc_interface/rtc_interface.hpp"
#include "autoware_rtc_interface/rtc_interface.hpp"

#include <chrono>

Expand Down Expand Up @@ -78,7 +78,7 @@ Module getModuleType(const std::string & module_name)

} // namespace

namespace rtc_interface
namespace autoware::rtc_interface
{
RTCInterface::RTCInterface(rclcpp::Node * node, const std::string & name, const bool enable_rtc)
: clock_{node->get_clock()},
Expand Down Expand Up @@ -363,4 +363,4 @@ bool RTCInterface::isLocked() const
return is_locked_;
}

} // namespace rtc_interface
} // namespace autoware::rtc_interface
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@

<depend>autoware_behavior_path_planner_common</depend>
<depend>autoware_behavior_path_static_obstacle_avoidance_module</depend>
<depend>autoware_rtc_interface</depend>
<depend>behavior_path_lane_change_module</depend>
<depend>behavior_path_planner</depend>
<depend>lanelet2_extension</depend>
<depend>motion_utils</depend>
<depend>pluginlib</depend>
<depend>rclcpp</depend>
<depend>rtc_interface</depend>
<depend>tier4_autoware_utils</depend>
<depend>tier4_planning_msgs</depend>
<depend>visualization_msgs</depend>
Expand Down
2 changes: 1 addition & 1 deletion planning/behavior_path_goal_planner_module/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@
<buildtool_depend>eigen3_cmake_module</buildtool_depend>

<depend>autoware_behavior_path_planner_common</depend>
<depend>autoware_rtc_interface</depend>
<depend>behavior_path_planner</depend>
<depend>motion_utils</depend>
<depend>pluginlib</depend>
<depend>rclcpp</depend>
<depend>rtc_interface</depend>
<depend>tier4_autoware_utils</depend>
<depend>tier4_planning_msgs</depend>
<depend>visualization_msgs</depend>
Expand Down
2 changes: 1 addition & 1 deletion planning/behavior_path_lane_change_module/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
<buildtool_depend>eigen3_cmake_module</buildtool_depend>

<depend>autoware_behavior_path_planner_common</depend>
<depend>autoware_rtc_interface</depend>
<depend>behavior_path_planner</depend>
<depend>motion_utils</depend>
<depend>pluginlib</depend>
<depend>rclcpp</depend>
<depend>rtc_interface</depend>
<depend>tier4_autoware_utils</depend>
<depend>tier4_planning_msgs</depend>
<depend>visualization_msgs</depend>
Expand Down
Loading