Skip to content

Commit ea448a9

Browse files
authored
feat!: replace VelocityLimit messages with autoware_internal_planning_msgs (#10273)
Signed-off-by: Ryohsuke Mitsudome <ryohsuke.mitsudome@tier4.jp>
1 parent 9c0877a commit ea448a9

File tree

52 files changed

+163
-153
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+163
-153
lines changed

planning/autoware_external_velocity_limit_selector/README.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,17 @@ Example:
3737

3838
## Inputs
3939

40-
| Name | Type | Description |
41-
| --------------------------------------------------- | ---------------------------------------------- | --------------------------------------------- |
42-
| `~input/velocity_limit_from_api` | tier4_planning_msgs::VelocityLimit | velocity limit from api |
43-
| `~input/velocity_limit_from_internal` | tier4_planning_msgs::VelocityLimit | velocity limit from autoware internal modules |
44-
| `~input/velocity_limit_clear_command_from_internal` | tier4_planning_msgs::VelocityLimitClearCommand | velocity limit clear command |
40+
| Name | Type | Description |
41+
| --------------------------------------------------- | --------------------------------------------------------------- | --------------------------------------------- |
42+
| `~input/velocity_limit_from_api` | autoware_internal_planning_msgs::msg::VelocityLimit | velocity limit from api |
43+
| `~input/velocity_limit_from_internal` | autoware_internal_planning_msgs::msg::VelocityLimit | velocity limit from autoware internal modules |
44+
| `~input/velocity_limit_clear_command_from_internal` | autoware_internal_planning_msgs::msg::VelocityLimitClearCommand | velocity limit clear command |
4545

4646
## Outputs
4747

48-
| Name | Type | Description |
49-
| ---------------------- | ---------------------------------- | ------------------------------------------------- |
50-
| `~output/max_velocity` | tier4_planning_msgs::VelocityLimit | current information of the hardest velocity limit |
48+
| Name | Type | Description |
49+
| ---------------------- | --------------------------------------------------- | ------------------------------------------------- |
50+
| `~output/max_velocity` | autoware_internal_planning_msgs::msg::VelocityLimit | current information of the hardest velocity limit |
5151

5252
## Parameters
5353

planning/autoware_external_velocity_limit_selector/include/autoware/external_velocity_limit_selector/external_velocity_limit_selector_node.hpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
#include <rclcpp/rclcpp.hpp>
2020

2121
#include <autoware_internal_debug_msgs/msg/string_stamped.hpp>
22-
#include <tier4_planning_msgs/msg/velocity_limit.hpp>
23-
#include <tier4_planning_msgs/msg/velocity_limit_clear_command.hpp>
22+
#include <autoware_internal_planning_msgs/msg/velocity_limit.hpp>
23+
#include <autoware_internal_planning_msgs/msg/velocity_limit_clear_command.hpp>
2424

2525
#include <memory>
2626
#include <string>
@@ -30,9 +30,9 @@ namespace autoware::external_velocity_limit_selector
3030
{
3131

3232
using autoware_internal_debug_msgs::msg::StringStamped;
33-
using tier4_planning_msgs::msg::VelocityLimit;
34-
using tier4_planning_msgs::msg::VelocityLimitClearCommand;
35-
using tier4_planning_msgs::msg::VelocityLimitConstraints;
33+
using autoware_internal_planning_msgs::msg::VelocityLimit;
34+
using autoware_internal_planning_msgs::msg::VelocityLimitClearCommand;
35+
using autoware_internal_planning_msgs::msg::VelocityLimitConstraints;
3636

3737
using VelocityLimitTable = std::unordered_map<std::string, VelocityLimit>;
3838

planning/autoware_external_velocity_limit_selector/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
<buildtool_depend>autoware_cmake</buildtool_depend>
1919

2020
<depend>autoware_internal_debug_msgs</depend>
21+
<depend>autoware_internal_planning_msgs</depend>
2122
<depend>generate_parameter_library</depend>
2223
<depend>rclcpp</depend>
2324
<depend>rclcpp_components</depend>
24-
<depend>tier4_planning_msgs</depend>
2525

2626
<exec_depend>ros2cli</exec_depend>
2727
<exec_depend>topic_tools</exec_depend>

planning/autoware_external_velocity_limit_selector/test/test_external_velocity_limit_selector_node_launch.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
import unittest
1919

2020
from ament_index_python import get_package_share_directory
21+
from autoware_internal_planning_msgs.msg import VelocityLimit
22+
from autoware_internal_planning_msgs.msg import VelocityLimitClearCommand
2123
import launch
2224
from launch.actions import IncludeLaunchDescription
2325
from launch.launch_description_sources import AnyLaunchDescriptionSource
@@ -30,8 +32,6 @@
3032
from rcl_interfaces.srv import SetParameters
3133
import rclpy
3234
import rclpy.qos
33-
from tier4_planning_msgs.msg import VelocityLimit
34-
from tier4_planning_msgs.msg import VelocityLimitClearCommand
3535

3636
logger = get_logger(__name__)
3737

planning/autoware_obstacle_cruise_planner/README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ The `autoware_obstacle_cruise_planner` package has following modules.
2323

2424
### Output topics
2525

26-
| Name | Type | Description |
27-
| ------------------------------- | ---------------------------------------------- | -------------------------------- |
28-
| `~/output/trajectory` | autoware_planning_msgs::Trajectory | output trajectory |
29-
| `~/output/velocity_limit` | tier4_planning_msgs::VelocityLimit | velocity limit for cruising |
30-
| `~/output/clear_velocity_limit` | tier4_planning_msgs::VelocityLimitClearCommand | clear command for velocity limit |
26+
| Name | Type | Description |
27+
| ------------------------------- | --------------------------------------------------------------- | -------------------------------- |
28+
| `~/output/trajectory` | autoware_planning_msgs::Trajectory | output trajectory |
29+
| `~/output/velocity_limit` | autoware_internal_planning_msgs::msg::VelocityLimit | velocity limit for cruising |
30+
| `~/output/clear_velocity_limit` | autoware_internal_planning_msgs::msg::VelocityLimitClearCommand | clear command for velocity limit |
3131

3232
## Design
3333

planning/autoware_obstacle_cruise_planner/include/autoware/obstacle_cruise_planner/type_alias.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121

2222
#include "autoware_internal_debug_msgs/msg/float32_stamped.hpp"
2323
#include "autoware_internal_debug_msgs/msg/float64_stamped.hpp"
24+
#include "autoware_internal_planning_msgs/msg/velocity_limit.hpp"
25+
#include "autoware_internal_planning_msgs/msg/velocity_limit_clear_command.hpp"
2426
#include "autoware_perception_msgs/msg/predicted_object.hpp"
2527
#include "autoware_perception_msgs/msg/predicted_objects.hpp"
2628
#include "autoware_planning_msgs/msg/trajectory.hpp"
@@ -31,8 +33,6 @@
3133
#include "nav_msgs/msg/odometry.hpp"
3234
#include "sensor_msgs/msg/point_cloud2.hpp"
3335
#include "tier4_planning_msgs/msg/stop_speed_exceeded.hpp"
34-
#include "tier4_planning_msgs/msg/velocity_limit.hpp"
35-
#include "tier4_planning_msgs/msg/velocity_limit_clear_command.hpp"
3636
#include "visualization_msgs/msg/marker_array.hpp"
3737

3838
#include <pcl/point_cloud.h>
@@ -41,6 +41,8 @@
4141
using autoware::vehicle_info_utils::VehicleInfo;
4242
using autoware_internal_debug_msgs::msg::Float32Stamped;
4343
using autoware_internal_debug_msgs::msg::Float64Stamped;
44+
using autoware_internal_planning_msgs::msg::VelocityLimit;
45+
using autoware_internal_planning_msgs::msg::VelocityLimitClearCommand;
4446
using autoware_perception_msgs::msg::ObjectClassification;
4547
using autoware_perception_msgs::msg::PredictedObject;
4648
using autoware_perception_msgs::msg::PredictedObjects;
@@ -54,8 +56,6 @@ using geometry_msgs::msg::Twist;
5456
using nav_msgs::msg::Odometry;
5557
using sensor_msgs::msg::PointCloud2;
5658
using tier4_planning_msgs::msg::StopSpeedExceeded;
57-
using tier4_planning_msgs::msg::VelocityLimit;
58-
using tier4_planning_msgs::msg::VelocityLimitClearCommand;
5959
using visualization_msgs::msg::Marker;
6060
using visualization_msgs::msg::MarkerArray;
6161
namespace bg = boost::geometry;

planning/autoware_obstacle_cruise_planner/src/pid_based_planner/pid_based_planner.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include "autoware_utils/ros/marker_helper.hpp"
2222
#include "autoware_utils/ros/update_param.hpp"
2323

24-
#include "tier4_planning_msgs/msg/velocity_limit.hpp"
24+
#include "autoware_internal_planning_msgs/msg/velocity_limit.hpp"
2525

2626
#include <algorithm>
2727
#include <memory>

planning/autoware_obstacle_stop_planner/src/node.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434
#include <autoware_internal_debug_msgs/msg/float32_multi_array_stamped.hpp>
3535
#include <autoware_internal_debug_msgs/msg/float32_stamped.hpp>
3636
#include <autoware_internal_debug_msgs/msg/float64_stamped.hpp>
37+
#include <autoware_internal_planning_msgs/msg/velocity_limit.hpp>
38+
#include <autoware_internal_planning_msgs/msg/velocity_limit_clear_command.hpp>
3739
#include <autoware_perception_msgs/msg/predicted_objects.hpp>
3840
#include <autoware_planning_msgs/msg/trajectory.hpp>
3941
#include <diagnostic_msgs/msg/diagnostic_status.hpp>
@@ -42,8 +44,6 @@
4244
#include <geometry_msgs/msg/twist_stamped.hpp>
4345
#include <sensor_msgs/msg/point_cloud2.hpp>
4446
#include <tier4_planning_msgs/msg/expand_stop_range.hpp>
45-
#include <tier4_planning_msgs/msg/velocity_limit.hpp>
46-
#include <tier4_planning_msgs/msg/velocity_limit_clear_command.hpp>
4747

4848
#include <boost/assert.hpp>
4949
#include <boost/assign/list_of.hpp>
@@ -83,15 +83,15 @@ using autoware_internal_debug_msgs::msg::BoolStamped;
8383
using autoware_internal_debug_msgs::msg::Float32MultiArrayStamped;
8484
using autoware_internal_debug_msgs::msg::Float32Stamped;
8585
using autoware_internal_debug_msgs::msg::Float64Stamped;
86+
using autoware_internal_planning_msgs::msg::VelocityLimit;
87+
using autoware_internal_planning_msgs::msg::VelocityLimitClearCommand;
8688
using autoware_perception_msgs::msg::PredictedObjects;
8789
using autoware_planning_msgs::msg::Trajectory;
8890
using autoware_planning_msgs::msg::TrajectoryPoint;
8991
using autoware_utils::Point2d;
9092
using autoware_utils::Polygon2d;
9193
using autoware_utils::StopWatch;
9294
using tier4_planning_msgs::msg::ExpandStopRange;
93-
using tier4_planning_msgs::msg::VelocityLimit;
94-
using tier4_planning_msgs::msg::VelocityLimitClearCommand;
9595

9696
using TrajectoryPoints = std::vector<TrajectoryPoint>;
9797
using PointCloud = pcl::PointCloud<pcl::PointXYZ>;

planning/autoware_remaining_distance_time_calculator/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<buildtool_depend>autoware_cmake</buildtool_depend>
1313

1414
<depend>autoware_internal_msgs</depend>
15+
<depend>autoware_internal_planning_msgs</depend>
1516
<depend>autoware_lanelet2_extension</depend>
1617
<depend>autoware_motion_utils</depend>
1718
<depend>autoware_planning_msgs</depend>
@@ -24,7 +25,6 @@
2425
<depend>rclcpp</depend>
2526
<depend>rclcpp_components</depend>
2627
<depend>std_msgs</depend>
27-
<depend>tier4_planning_msgs</depend>
2828

2929
<test_depend>ament_cmake_ros</test_depend>
3030
<test_depend>ament_lint_auto</test_depend>

planning/autoware_remaining_distance_time_calculator/src/remaining_distance_time_calculator_node.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include <rclcpp/rclcpp.hpp>
2222
#include <rclcpp/timer.hpp>
2323

24-
#include <tier4_planning_msgs/msg/velocity_limit.hpp>
24+
#include <autoware_internal_planning_msgs/msg/velocity_limit.hpp>
2525

2626
#include <chrono>
2727
#include <functional>
@@ -55,7 +55,7 @@ RemainingDistanceTimeCalculatorNode::RemainingDistanceTimeCalculatorNode(
5555
sub_route_ = create_subscription<LaneletRoute>(
5656
"~/input/route", qos_transient_local,
5757
std::bind(&RemainingDistanceTimeCalculatorNode::on_route, this, _1));
58-
sub_planning_velocity_ = create_subscription<tier4_planning_msgs::msg::VelocityLimit>(
58+
sub_planning_velocity_ = create_subscription<autoware_internal_planning_msgs::msg::VelocityLimit>(
5959
"/planning/scenario_planning/current_max_velocity", qos_transient_local,
6060
std::bind(&RemainingDistanceTimeCalculatorNode::on_velocity_limit, this, _1));
6161
sub_scenario_ = this->create_subscription<autoware_internal_planning_msgs::msg::Scenario>(

planning/autoware_remaining_distance_time_calculator/src/remaining_distance_time_calculator_node.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121

2222
#include <autoware_internal_msgs/msg/mission_remaining_distance_time.hpp>
2323
#include <autoware_internal_planning_msgs/msg/scenario.hpp>
24+
#include <autoware_internal_planning_msgs/msg/velocity_limit.hpp>
2425
#include <autoware_map_msgs/msg/lanelet_map_bin.hpp>
2526
#include <autoware_planning_msgs/msg/lanelet_route.hpp>
2627
#include <geometry_msgs/msg/pose.hpp>
2728
#include <geometry_msgs/msg/vector3.hpp>
2829
#include <nav_msgs/msg/odometry.hpp>
29-
#include <tier4_planning_msgs/msg/velocity_limit.hpp>
3030

3131
#include <lanelet2_core/Forward.h>
3232
#include <lanelet2_core/utility/Optional.h>
@@ -49,7 +49,7 @@ class RemainingDistanceTimeCalculatorNode : public rclcpp::Node
4949
using LaneletRoute = autoware_planning_msgs::msg::LaneletRoute;
5050
using HADMapBin = autoware_map_msgs::msg::LaneletMapBin;
5151
using Odometry = nav_msgs::msg::Odometry;
52-
using VelocityLimit = tier4_planning_msgs::msg::VelocityLimit;
52+
using VelocityLimit = autoware_internal_planning_msgs::msg::VelocityLimit;
5353
using MissionRemainingDistanceTime = autoware_internal_msgs::msg::MissionRemainingDistanceTime;
5454

5555
rclcpp::Subscription<LaneletRoute>::SharedPtr sub_route_;

planning/autoware_surround_obstacle_checker/README.md

+9-9
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,15 @@ As mentioned in stop condition section, it prevents chattering by changing thres
8686

8787
### Output
8888

89-
| Name | Type | Description |
90-
| --------------------------------------- | ----------------------------------------------------- | ------------------------------------------------------------------------------------- |
91-
| `~/output/velocity_limit_clear_command` | `tier4_planning_msgs::msg::VelocityLimitClearCommand` | Velocity limit clear command |
92-
| `~/output/max_velocity` | `tier4_planning_msgs::msg::VelocityLimit` | Velocity limit command |
93-
| `~/output/no_start_reason` | `diagnostic_msgs::msg::DiagnosticStatus` | No start reason |
94-
| `~/debug/marker` | `visualization_msgs::msg::MarkerArray` | Marker for visualization |
95-
| `~/debug/footprint` | `geometry_msgs::msg::PolygonStamped` | Ego vehicle base footprint for visualization |
96-
| `~/debug/footprint_offset` | `geometry_msgs::msg::PolygonStamped` | Ego vehicle footprint with `surround_check_distance` offset for visualization |
97-
| `~/debug/footprint_recover_offset` | `geometry_msgs::msg::PolygonStamped` | Ego vehicle footprint with `surround_check_recover_distance` offset for visualization |
89+
| Name | Type | Description |
90+
| --------------------------------------- | ----------------------------------------------------------------- | ------------------------------------------------------------------------------------- |
91+
| `~/output/velocity_limit_clear_command` | `autoware_internal_planning_msgs::msg::VelocityLimitClearCommand` | Velocity limit clear command |
92+
| `~/output/max_velocity` | `autoware_internal_planning_msgs::msg::VelocityLimit` | Velocity limit command |
93+
| `~/output/no_start_reason` | `diagnostic_msgs::msg::DiagnosticStatus` | No start reason |
94+
| `~/debug/marker` | `visualization_msgs::msg::MarkerArray` | Marker for visualization |
95+
| `~/debug/footprint` | `geometry_msgs::msg::PolygonStamped` | Ego vehicle base footprint for visualization |
96+
| `~/debug/footprint_offset` | `geometry_msgs::msg::PolygonStamped` | Ego vehicle footprint with `surround_check_distance` offset for visualization |
97+
| `~/debug/footprint_recover_offset` | `geometry_msgs::msg::PolygonStamped` | Ego vehicle footprint with `surround_check_recover_distance` offset for visualization |
9898

9999
## Parameters
100100

planning/autoware_surround_obstacle_checker/src/node.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
#include <rclcpp/rclcpp.hpp>
2626

2727
#include <autoware_internal_debug_msgs/msg/float64_stamped.hpp>
28+
#include <autoware_internal_planning_msgs/msg/velocity_limit.hpp>
29+
#include <autoware_internal_planning_msgs/msg/velocity_limit_clear_command.hpp>
2830
#include <autoware_perception_msgs/msg/predicted_objects.hpp>
2931
#include <diagnostic_msgs/msg/diagnostic_status.hpp>
3032
#include <diagnostic_msgs/msg/key_value.hpp>
3133
#include <nav_msgs/msg/odometry.hpp>
3234
#include <sensor_msgs/msg/point_cloud2.hpp>
33-
#include <tier4_planning_msgs/msg/velocity_limit.hpp>
34-
#include <tier4_planning_msgs/msg/velocity_limit_clear_command.hpp>
3535
#include <visualization_msgs/msg/marker_array.hpp>
3636

3737
#include <tf2/utils.h>
@@ -50,10 +50,10 @@ namespace autoware::surround_obstacle_checker
5050

5151
using autoware::motion_utils::VehicleStopChecker;
5252
using autoware::vehicle_info_utils::VehicleInfo;
53+
using autoware_internal_planning_msgs::msg::VelocityLimit;
54+
using autoware_internal_planning_msgs::msg::VelocityLimitClearCommand;
5355
using autoware_perception_msgs::msg::PredictedObjects;
5456
using autoware_perception_msgs::msg::Shape;
55-
using tier4_planning_msgs::msg::VelocityLimit;
56-
using tier4_planning_msgs::msg::VelocityLimitClearCommand;
5757

5858
using Obstacle = std::pair<double /* distance */, geometry_msgs::msg::Point>;
5959

planning/autoware_surround_obstacle_checker/surround_obstacle_checker-design.ja.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,12 @@ Stop condition の項で述べたように、状態によって障害物判定
8686

8787
### Output
8888

89-
| Name | Type | Description |
90-
| --------------------------------------- | ----------------------------------------------------- | ---------------------------- |
91-
| `~/output/velocity_limit_clear_command` | `tier4_planning_msgs::msg::VelocityLimitClearCommand` | Velocity limit clear command |
92-
| `~/output/max_velocity` | `tier4_planning_msgs::msg::VelocityLimit` | Velocity limit command |
93-
| `~/output/no_start_reason` | `diagnostic_msgs::msg::DiagnosticStatus` | No start reason |
94-
| `~/debug/marker` | `visualization_msgs::msg::MarkerArray` | Marker for visualization |
89+
| Name | Type | Description |
90+
| --------------------------------------- | ----------------------------------------------------------------- | ---------------------------- |
91+
| `~/output/velocity_limit_clear_command` | `autoware_internal_planning_msgs::msg::VelocityLimitClearCommand` | Velocity limit clear command |
92+
| `~/output/max_velocity` | `autoware_internal_planning_msgs::msg::VelocityLimit` | Velocity limit command |
93+
| `~/output/no_start_reason` | `diagnostic_msgs::msg::DiagnosticStatus` | No start reason |
94+
| `~/debug/marker` | `visualization_msgs::msg::MarkerArray` | Marker for visualization |
9595

9696
## Parameters
9797

planning/autoware_velocity_smoother/include/autoware/velocity_smoother/node.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@
4242
#include "autoware_adapi_v1_msgs/msg/operation_mode_state.hpp"
4343
#include "autoware_internal_debug_msgs/msg/float32_stamped.hpp"
4444
#include "autoware_internal_debug_msgs/msg/float64_stamped.hpp"
45+
#include "autoware_internal_planning_msgs/msg/velocity_limit.hpp" // temporary
4546
#include "autoware_planning_msgs/msg/trajectory.hpp"
4647
#include "autoware_planning_msgs/msg/trajectory_point.hpp"
4748
#include "geometry_msgs/msg/accel_with_covariance_stamped.hpp"
4849
#include "nav_msgs/msg/odometry.hpp"
49-
#include "tier4_planning_msgs/msg/velocity_limit.hpp" // temporary
5050
#include "visualization_msgs/msg/marker_array.hpp"
5151

5252
#include <iostream>
@@ -64,12 +64,12 @@ using TrajectoryPoints = std::vector<TrajectoryPoint>;
6464
using autoware_adapi_v1_msgs::msg::OperationModeState;
6565
using autoware_internal_debug_msgs::msg::Float32Stamped;
6666
using autoware_internal_debug_msgs::msg::Float64Stamped;
67+
using autoware_internal_planning_msgs::msg::VelocityLimit; // temporary
6768
using autoware_utils::DiagnosticsInterface;
6869
using geometry_msgs::msg::AccelWithCovarianceStamped;
6970
using geometry_msgs::msg::Pose;
7071
using geometry_msgs::msg::PoseStamped;
7172
using nav_msgs::msg::Odometry;
72-
using tier4_planning_msgs::msg::VelocityLimit; // temporary
7373
using visualization_msgs::msg::MarkerArray;
7474

7575
struct Motion

0 commit comments

Comments
 (0)