Skip to content

Commit 192d01e

Browse files
feat(autoware_planning_factor_interface): modify multiple plugins under motion_velocity_planner folder, autoware_planning_factor_interface, : v0.6
Signed-off-by: liuXinGangChina <lxg19892021@gmail.com>
1 parent 2da0bf4 commit 192d01e

File tree

6 files changed

+14
-12
lines changed

6 files changed

+14
-12
lines changed

planning/behavior_velocity_planner/autoware_behavior_velocity_run_out_module/src/scene.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -769,7 +769,7 @@ bool RunOutModule::insertStopPoint(
769769

770770
planning_factor_interface_->add(
771771
path.points, planner_data_->current_odometry->pose, stop_point.value(), stop_point.value(),
772-
tier4_planning_msgs::msg::PlanningFactor::STOP, tier4_planning_msgs::msg::SafetyFactorArray{},
772+
autoware_internal_planning_msgs::msg::PlanningFactor::STOP, autoware_internal_planning_msgs::msg::SafetyFactorArray{},
773773
true /*is_driving_forward*/, 0.0 /*velocity*/, 0.0 /*shift_distance*/, "run_out_stop");
774774

775775
return true;
@@ -883,8 +883,8 @@ void RunOutModule::insertApproachingVelocity(
883883

884884
planning_factor_interface_->add(
885885
output_path.points, planner_data_->current_odometry->pose, stop_point.value(),
886-
stop_point.value(), tier4_planning_msgs::msg::PlanningFactor::STOP,
887-
tier4_planning_msgs::msg::SafetyFactorArray{}, true /*is_driving_forward*/, 0.0 /*velocity*/,
886+
stop_point.value(), autoware_internal_planning_msgs::msg::PlanningFactor::STOP,
887+
autoware_internal_planning_msgs::msg::SafetyFactorArray{}, true /*is_driving_forward*/, 0.0 /*velocity*/,
888888
0.0 /*shift_distance*/, "run_out_approaching_velocity");
889889

890890
// debug

planning/motion_velocity_planner/autoware_motion_velocity_obstacle_slow_down_module/package.xml

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
<depend>tf2</depend>
2929
<depend>tier4_metric_msgs</depend>
3030
<depend>tier4_planning_msgs</depend>
31+
<depend>autoware_internal_planning_msgs</depend>
3132
<depend>visualization_msgs</depend>
3233

3334
<test_depend>ament_cmake_ros</test_depend>

planning/motion_velocity_planner/autoware_motion_velocity_obstacle_slow_down_module/src/type_alias.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
#include "visualization_msgs/msg/marker_array.hpp"
3232
#include <tier4_metric_msgs/msg/metric.hpp>
3333
#include <tier4_metric_msgs/msg/metric_array.hpp>
34-
#include <tier4_planning_msgs/msg/planning_factor.hpp>
35-
#include <tier4_planning_msgs/msg/safety_factor_array.hpp>
34+
#include <autoware_internal_planning_msgs/msg/planning_factor.hpp>
35+
#include <autoware_internal_planning_msgs/msg/safety_factor_array.hpp>
3636

3737
#include <pcl/point_cloud.h>
3838
#include <pcl/point_types.h>
@@ -63,8 +63,8 @@ using autoware_utils::Polygon2d;
6363
using Metric = tier4_metric_msgs::msg::Metric;
6464
using MetricArray = tier4_metric_msgs::msg::MetricArray;
6565
using PointCloud = pcl::PointCloud<pcl::PointXYZ>;
66-
using tier4_planning_msgs::msg::PlanningFactor;
67-
using tier4_planning_msgs::msg::SafetyFactorArray;
66+
using autoware_internal_planning_msgs::msg::PlanningFactor;
67+
using autoware_internal_planning_msgs::msg::SafetyFactorArray;
6868
} // namespace autoware::motion_velocity_planner
6969

7070
#endif // TYPE_ALIAS_HPP_

planning/motion_velocity_planner/autoware_motion_velocity_obstacle_stop_module/package.xml

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
<depend>tf2</depend>
2828
<depend>tier4_metric_msgs</depend>
2929
<depend>tier4_planning_msgs</depend>
30+
<depend>autoware_internal_planning_msgs</depend>
3031
<depend>visualization_msgs</depend>
3132

3233
<test_depend>ament_cmake_ros</test_depend>

planning/motion_velocity_planner/autoware_motion_velocity_obstacle_stop_module/src/type_alias.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
#include "visualization_msgs/msg/marker_array.hpp"
2929
#include <tier4_metric_msgs/msg/metric.hpp>
3030
#include <tier4_metric_msgs/msg/metric_array.hpp>
31-
#include <tier4_planning_msgs/msg/planning_factor.hpp>
32-
#include <tier4_planning_msgs/msg/safety_factor_array.hpp>
31+
#include <autoware_internal_planning_msgs/msg/planning_factor.hpp>
32+
#include <autoware_internal_planning_msgs/msg/safety_factor_array.hpp>
3333

3434
#include <pcl/point_cloud.h>
3535
#include <pcl/point_types.h>
@@ -57,7 +57,7 @@ using autoware_utils::Polygon2d;
5757
using Metric = tier4_metric_msgs::msg::Metric;
5858
using MetricArray = tier4_metric_msgs::msg::MetricArray;
5959
using PointCloud = pcl::PointCloud<pcl::PointXYZ>;
60-
using tier4_planning_msgs::msg::PlanningFactor;
61-
using tier4_planning_msgs::msg::SafetyFactorArray;
60+
using autoware_internal_planning_msgs::msg::PlanningFactor;
61+
using autoware_internal_planning_msgs::msg::SafetyFactorArray;
6262
} // namespace autoware::motion_velocity_planner
6363
#endif // TYPE_ALIAS_HPP_

planning/motion_velocity_planner/autoware_motion_velocity_planner_node_universe/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ This means that to stop before a wall, a stop point is inserted in the trajector
3333
| Name | Type | Description |
3434
| ----------------------------------------- | ---------------------------------------------- | -------------------------------------------------- |
3535
| `~/output/trajectory` | autoware_planning_msgs::msg::Trajectory | Ego trajectory with updated velocity profile |
36-
| `~/output/planning_factors/<MODULE_NAME>` | tier4_planning_msgs::msg::PlanningFactorsArray | factors causing change in the ego velocity profile |
36+
| `~/output/planning_factors/<MODULE_NAME>` | autoware_internal_planning_msgs::msg::PlanningFactorsArray | factors causing change in the ego velocity profile |
3737

3838
## Services
3939

0 commit comments

Comments
 (0)