Skip to content

Commit f93e5b3

Browse files
authored
refactor(rtc_interface)!: prefix package and namespace with autoware (#7321)
refactor(rtc_interface): add autoware prefix Signed-off-by: Fumiya Watanabe <rej55.g@gmail.com>
1 parent b1749af commit f93e5b3

File tree

17 files changed

+35
-35
lines changed

17 files changed

+35
-35
lines changed

planning/.pages

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ nav:
7777
- 'External Velocity Limit Selector': planning/autoware_external_velocity_limit_selector
7878
- 'Objects of Interest Marker Interface': planning/objects_of_interest_marker_interface
7979
- 'Route Handler': planning/route_handler
80-
- 'RTC Interface': planning/rtc_interface
80+
- 'RTC Interface': planning/autoware_rtc_interface
8181
- 'Additional Tools':
8282
- 'Remaining Distance Time Calculator': planning/autoware_remaining_distance_time_calculator
8383
- 'RTC Replayer': planning/rtc_replayer

planning/autoware_behavior_path_external_request_lane_change_module/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
<buildtool_depend>eigen3_cmake_module</buildtool_depend>
2020

2121
<depend>autoware_behavior_path_planner_common</depend>
22+
<depend>autoware_rtc_interface</depend>
2223
<depend>behavior_path_lane_change_module</depend>
2324
<depend>behavior_path_planner</depend>
2425
<depend>motion_utils</depend>
2526
<depend>pluginlib</depend>
2627
<depend>rclcpp</depend>
27-
<depend>rtc_interface</depend>
2828
<depend>tier4_autoware_utils</depend>
2929
<depend>tier4_planning_msgs</depend>
3030
<depend>visualization_msgs</depend>

planning/autoware_behavior_path_planner_common/include/autoware_behavior_path_planner_common/interface/scene_module_interface.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@
2222

2323
#include <autoware_behavior_path_planner_common/interface/steering_factor_interface.hpp>
2424
#include <autoware_behavior_path_planner_common/turn_signal_decider.hpp>
25+
#include <autoware_rtc_interface/rtc_interface.hpp>
2526
#include <magic_enum.hpp>
2627
#include <motion_utils/marker/marker_helper.hpp>
2728
#include <motion_utils/trajectory/path_with_lane_id.hpp>
2829
#include <motion_utils/trajectory/trajectory.hpp>
2930
#include <objects_of_interest_marker_interface/objects_of_interest_marker_interface.hpp>
3031
#include <rclcpp/rclcpp.hpp>
3132
#include <route_handler/route_handler.hpp>
32-
#include <rtc_interface/rtc_interface.hpp>
3333
#include <tier4_autoware_utils/geometry/geometry.hpp>
3434
#include <tier4_autoware_utils/ros/marker_helper.hpp>
3535
#include <tier4_autoware_utils/ros/uuid_helper.hpp>
@@ -56,11 +56,11 @@
5656

5757
namespace behavior_path_planner
5858
{
59+
using autoware::rtc_interface::RTCInterface;
5960
using autoware_adapi_v1_msgs::msg::PlanningBehavior;
6061
using autoware_adapi_v1_msgs::msg::SteeringFactor;
6162
using objects_of_interest_marker_interface::ColorName;
6263
using objects_of_interest_marker_interface::ObjectsOfInterestMarkerInterface;
63-
using rtc_interface::RTCInterface;
6464
using steering_factor_interface::SteeringFactorInterface;
6565
using tier4_autoware_utils::calcOffsetPose;
6666
using tier4_autoware_utils::generateUUID;

planning/autoware_behavior_path_planner_common/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
<depend>autoware_lane_departure_checker</depend>
4747
<depend>autoware_perception_msgs</depend>
4848
<depend>autoware_planning_msgs</depend>
49+
<depend>autoware_rtc_interface</depend>
4950
<depend>freespace_planning_algorithms</depend>
5051
<depend>geometry_msgs</depend>
5152
<depend>interpolation</depend>
@@ -56,7 +57,6 @@
5657
<depend>objects_of_interest_marker_interface</depend>
5758
<depend>rclcpp</depend>
5859
<depend>route_handler</depend>
59-
<depend>rtc_interface</depend>
6060
<depend>tf2</depend>
6161
<depend>tier4_autoware_utils</depend>
6262
<depend>tier4_planning_msgs</depend>

planning/autoware_behavior_path_start_planner_module/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
<buildtool_depend>eigen3_cmake_module</buildtool_depend>
2222

2323
<depend>autoware_behavior_path_planner_common</depend>
24+
<depend>autoware_rtc_interface</depend>
2425
<depend>behavior_path_planner</depend>
2526
<depend>motion_utils</depend>
2627
<depend>pluginlib</depend>
2728
<depend>rclcpp</depend>
28-
<depend>rtc_interface</depend>
2929
<depend>tier4_autoware_utils</depend>
3030
<depend>tier4_planning_msgs</depend>
3131
<depend>visualization_msgs</depend>

planning/autoware_behavior_path_static_obstacle_avoidance_module/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
<depend>autoware_behavior_path_planner_common</depend>
2525
<depend>autoware_perception_msgs</depend>
26+
<depend>autoware_rtc_interface</depend>
2627
<depend>behavior_path_planner</depend>
2728
<depend>geometry_msgs</depend>
2829
<depend>lanelet2_extension</depend>
@@ -32,7 +33,6 @@
3233
<depend>pluginlib</depend>
3334
<depend>rclcpp</depend>
3435
<depend>route_handler</depend>
35-
<depend>rtc_interface</depend>
3636
<depend>sensor_msgs</depend>
3737
<depend>signal_processing</depend>
3838
<depend>tf2</depend>

planning/autoware_behavior_velocity_intersection_module/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<depend>autoware_behavior_velocity_planner_common</depend>
2222
<depend>autoware_perception_msgs</depend>
2323
<depend>autoware_planning_msgs</depend>
24+
<depend>autoware_rtc_interface</depend>
2425
<depend>fmt</depend>
2526
<depend>geometry_msgs</depend>
2627
<depend>interpolation</depend>
@@ -32,7 +33,6 @@
3233
<depend>pluginlib</depend>
3334
<depend>rclcpp</depend>
3435
<depend>route_handler</depend>
35-
<depend>rtc_interface</depend>
3636
<depend>tf2_geometry_msgs</depend>
3737
<depend>tier4_autoware_utils</depend>
3838
<depend>tier4_planning_msgs</depend>

planning/autoware_behavior_velocity_planner_common/include/autoware_behavior_velocity_planner_common/scene_module_interface.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
#define AUTOWARE_BEHAVIOR_VELOCITY_PLANNER_COMMON__SCENE_MODULE_INTERFACE_HPP_
1717

1818
#include <autoware_behavior_velocity_planner_common/planner_data.hpp>
19+
#include <autoware_rtc_interface/rtc_interface.hpp>
1920
#include <builtin_interfaces/msg/time.hpp>
2021
#include <motion_utils/factor/velocity_factor_interface.hpp>
2122
#include <motion_utils/marker/virtual_wall_marker_creator.hpp>
2223
#include <objects_of_interest_marker_interface/objects_of_interest_marker_interface.hpp>
23-
#include <rtc_interface/rtc_interface.hpp>
2424
#include <tier4_autoware_utils/ros/debug_publisher.hpp>
2525
#include <tier4_autoware_utils/ros/parameter.hpp>
2626

@@ -48,12 +48,12 @@
4848
namespace autoware::behavior_velocity_planner
4949
{
5050

51+
using autoware::rtc_interface::RTCInterface;
5152
using builtin_interfaces::msg::Time;
5253
using motion_utils::PlanningBehavior;
5354
using motion_utils::VelocityFactor;
5455
using objects_of_interest_marker_interface::ColorName;
5556
using objects_of_interest_marker_interface::ObjectsOfInterestMarkerInterface;
56-
using rtc_interface::RTCInterface;
5757
using tier4_autoware_utils::DebugPublisher;
5858
using tier4_autoware_utils::getOrDeclareParameter;
5959
using tier4_debug_msgs::msg::Float64Stamped;

planning/autoware_behavior_velocity_planner_common/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<depend>autoware_map_msgs</depend>
2424
<depend>autoware_perception_msgs</depend>
2525
<depend>autoware_planning_msgs</depend>
26+
<depend>autoware_rtc_interface</depend>
2627
<depend>autoware_velocity_smoother</depend>
2728
<depend>diagnostic_msgs</depend>
2829
<depend>eigen</depend>
@@ -36,7 +37,6 @@
3637
<depend>rclcpp</depend>
3738
<depend>rclcpp_components</depend>
3839
<depend>route_handler</depend>
39-
<depend>rtc_interface</depend>
4040
<depend>sensor_msgs</depend>
4141
<depend>tf2</depend>
4242
<depend>tf2_eigen</depend>

planning/rtc_interface/CMakeLists.txt planning/autoware_rtc_interface/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.5)
2-
project(rtc_interface)
2+
project(autoware_rtc_interface)
33

44
### Compile options
55
if(NOT CMAKE_CXX_STANDARD)
@@ -12,7 +12,7 @@ endif()
1212
find_package(ament_cmake_auto REQUIRED)
1313
ament_auto_find_build_dependencies()
1414

15-
ament_auto_add_library(rtc_interface SHARED
15+
ament_auto_add_library(autoware_rtc_interface SHARED
1616
src/rtc_interface.cpp
1717
)
1818

planning/rtc_interface/README.md planning/autoware_rtc_interface/README.md

+9-9
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ RTC Interface is an interface to publish the decision status of behavior plannin
1010

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

1515
// Generate UUID
1616
const unique_identifier_msgs::msg::UUID uuid = generateUUID(getModuleId());
@@ -51,12 +51,12 @@ rtc_interface.removeCooperateStatus(uuid);
5151
### RTCInterface (Constructor)
5252
5353
```c++
54-
rtc_interface::RTCInterface(rclcpp::Node & node, const std::string & name);
54+
autoware::rtc_interface::RTCInterface(rclcpp::Node & node, const std::string & name);
5555
```
5656

5757
#### Description
5858

59-
A constructor for `rtc_interface::RTCInterface`.
59+
A constructor for `autoware::rtc_interface::RTCInterface`.
6060

6161
#### Input
6262

@@ -72,7 +72,7 @@ An instance of `RTCInterface`
7272
### publishCooperateStatus
7373

7474
```c++
75-
rtc_interface::publishCooperateStatus(const rclcpp::Time & stamp)
75+
autoware::rtc_interface::publishCooperateStatus(const rclcpp::Time & stamp)
7676
```
7777
7878
#### Description
@@ -90,7 +90,7 @@ Nothing
9090
### updateCooperateStatus
9191
9292
```c++
93-
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)
93+
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)
9494
```
9595

9696
#### Description
@@ -113,7 +113,7 @@ Nothing
113113
### removeCooperateStatus
114114

115115
```c++
116-
rtc_interface::removeCooperateStatus(const unique_identifier_msgs::msg::UUID & uuid)
116+
autoware::rtc_interface::removeCooperateStatus(const unique_identifier_msgs::msg::UUID & uuid)
117117
```
118118
119119
#### Description
@@ -131,7 +131,7 @@ Nothing
131131
### clearCooperateStatus
132132
133133
```c++
134-
rtc_interface::clearCooperateStatus()
134+
autoware::rtc_interface::clearCooperateStatus()
135135
```
136136

137137
#### Description
@@ -149,7 +149,7 @@ Nothing
149149
### isActivated
150150

151151
```c++
152-
rtc_interface::isActivated(const unique_identifier_msgs::msg::UUID & uuid)
152+
autoware::rtc_interface::isActivated(const unique_identifier_msgs::msg::UUID & uuid)
153153
```
154154
155155
#### Description
@@ -169,7 +169,7 @@ If not, return `false`.
169169
### isRegistered
170170
171171
```c++
172-
rtc_interface::isRegistered(const unique_identifier_msgs::msg::UUID & uuid)
172+
autoware::rtc_interface::isRegistered(const unique_identifier_msgs::msg::UUID & uuid)
173173
```
174174

175175
#### Description

planning/rtc_interface/include/rtc_interface/rtc_interface.hpp planning/autoware_rtc_interface/include/autoware_rtc_interface/rtc_interface.hpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef RTC_INTERFACE__RTC_INTERFACE_HPP_
16-
#define RTC_INTERFACE__RTC_INTERFACE_HPP_
15+
#ifndef AUTOWARE_RTC_INTERFACE__RTC_INTERFACE_HPP_
16+
#define AUTOWARE_RTC_INTERFACE__RTC_INTERFACE_HPP_
1717

1818
#include "rclcpp/rclcpp.hpp"
1919

@@ -33,7 +33,7 @@
3333
#include <string>
3434
#include <vector>
3535

36-
namespace rtc_interface
36+
namespace autoware::rtc_interface
3737
{
3838
using tier4_rtc_msgs::msg::AutoModeStatus;
3939
using tier4_rtc_msgs::msg::Command;
@@ -101,6 +101,6 @@ class RTCInterface
101101
mutable std::mutex mutex_;
102102
};
103103

104-
} // namespace rtc_interface
104+
} // namespace autoware::rtc_interface
105105

106-
#endif // RTC_INTERFACE__RTC_INTERFACE_HPP_
106+
#endif // AUTOWARE_RTC_INTERFACE__RTC_INTERFACE_HPP_

planning/rtc_interface/package.xml planning/autoware_rtc_interface/package.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0"?>
22
<package format="3">
3-
<name>rtc_interface</name>
3+
<name>autoware_rtc_interface</name>
44
<version>0.1.0</version>
5-
<description>The rtc_interface package</description>
5+
<description>The autoware_rtc_interface package</description>
66

77
<maintainer email="fumiya.watanabe@tier4.jp">Fumiya Watanabe</maintainer>
88
<maintainer email="taiki.tanaka@tier4.jp">Taiki Tanaka</maintainer>

planning/rtc_interface/src/rtc_interface.cpp planning/autoware_rtc_interface/src/rtc_interface.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include "rtc_interface/rtc_interface.hpp"
15+
#include "autoware_rtc_interface/rtc_interface.hpp"
1616

1717
#include <chrono>
1818

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

7979
} // namespace
8080

81-
namespace rtc_interface
81+
namespace autoware::rtc_interface
8282
{
8383
RTCInterface::RTCInterface(rclcpp::Node * node, const std::string & name, const bool enable_rtc)
8484
: clock_{node->get_clock()},
@@ -363,4 +363,4 @@ bool RTCInterface::isLocked() const
363363
return is_locked_;
364364
}
365365

366-
} // namespace rtc_interface
366+
} // namespace autoware::rtc_interface

planning/behavior_path_avoidance_by_lane_change_module/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020

2121
<depend>autoware_behavior_path_planner_common</depend>
2222
<depend>autoware_behavior_path_static_obstacle_avoidance_module</depend>
23+
<depend>autoware_rtc_interface</depend>
2324
<depend>behavior_path_lane_change_module</depend>
2425
<depend>behavior_path_planner</depend>
2526
<depend>lanelet2_extension</depend>
2627
<depend>motion_utils</depend>
2728
<depend>pluginlib</depend>
2829
<depend>rclcpp</depend>
29-
<depend>rtc_interface</depend>
3030
<depend>tier4_autoware_utils</depend>
3131
<depend>tier4_planning_msgs</depend>
3232
<depend>visualization_msgs</depend>

planning/behavior_path_goal_planner_module/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
<buildtool_depend>eigen3_cmake_module</buildtool_depend>
2222

2323
<depend>autoware_behavior_path_planner_common</depend>
24+
<depend>autoware_rtc_interface</depend>
2425
<depend>behavior_path_planner</depend>
2526
<depend>motion_utils</depend>
2627
<depend>pluginlib</depend>
2728
<depend>rclcpp</depend>
28-
<depend>rtc_interface</depend>
2929
<depend>tier4_autoware_utils</depend>
3030
<depend>tier4_planning_msgs</depend>
3131
<depend>visualization_msgs</depend>

planning/behavior_path_lane_change_module/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
<buildtool_depend>eigen3_cmake_module</buildtool_depend>
2121

2222
<depend>autoware_behavior_path_planner_common</depend>
23+
<depend>autoware_rtc_interface</depend>
2324
<depend>behavior_path_planner</depend>
2425
<depend>motion_utils</depend>
2526
<depend>pluginlib</depend>
2627
<depend>rclcpp</depend>
27-
<depend>rtc_interface</depend>
2828
<depend>tier4_autoware_utils</depend>
2929
<depend>tier4_planning_msgs</depend>
3030
<depend>visualization_msgs</depend>

0 commit comments

Comments
 (0)