feat(strat_planner): add a prepare time for blinker before taking act…

…ion for approval (autowarefoundation#6438) Signed-off-by: Mamoru Sobue <mamoru.sobue@tier4.jp>
tier4 · Mar 11, 2024 · e6fbf9e · e6fbf9e
1 parent 0a8cc23
commit e6fbf9e
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 1 deletion.
diff --git a/planning/behavior_path_start_planner_module/config/start_planner.param.yaml b/planning/behavior_path_start_planner_module/config/start_planner.param.yaml
@@ -36,6 +36,7 @@
       backward_path_update_duration: 3.0
       ignore_distance_from_lane_end: 15.0
       # turns signal
+      prepare_time_before_start: 0.0
       th_turn_signal_on_lateral_offset: 1.0
       intersection_search_length: 30.0
       length_ratio_for_turn_signal_deactivation_near_intersection: 0.5

diff --git a/..._start_planner_module/include/behavior_path_start_planner_module/start_planner_module.hpp b/..._start_planner_module/include/behavior_path_start_planner_module/start_planner_module.hpp
@@ -69,6 +69,9 @@ struct PullOutStatus
   bool prev_is_safe_dynamic_objects{false};
   std::shared_ptr<PathWithLaneId> prev_stop_path_after_approval{nullptr};
   bool has_stop_point{false};
+  std::optional<Pose> stop_pose{std::nullopt};
+  //! record the first time when the state changed from !isActivated() to isActivated()
+  std::optional<rclcpp::Time> first_approved_time{std::nullopt};
 
   PullOutStatus() {}
 };
@@ -228,6 +231,7 @@ class StartPlannerModule : public SceneModuleInterface
   void updateStatusAfterBackwardDriving();
   PredictedObjects filterStopObjectsInPullOutLanes(
     const lanelet::ConstLanelets & pull_out_lanes, const double velocity_threshold) const;
+  bool needToPrepareBlinkerBeforeStart() const;
   bool hasFinishedPullOut() const;
   bool hasFinishedBackwardDriving() const;
   bool hasCollisionWithDynamicObjects() const;

diff --git a/...rt_planner_module/include/behavior_path_start_planner_module/start_planner_parameters.hpp b/...rt_planner_module/include/behavior_path_start_planner_module/start_planner_parameters.hpp
@@ -38,6 +38,7 @@ struct StartPlannerParameters
   double th_arrived_distance{0.0};
   double th_stopped_velocity{0.0};
   double th_stopped_time{0.0};
+  double prepare_time_before_start{0.0};
   double th_turn_signal_on_lateral_offset{0.0};
   double th_distance_to_middle_of_the_road{0.0};
   double intersection_search_length{0.0};

diff --git a/planning/behavior_path_start_planner_module/src/manager.cpp b/planning/behavior_path_start_planner_module/src/manager.cpp
@@ -36,6 +36,7 @@ void StartPlannerModuleManager::init(rclcpp::Node * node)
   p.th_arrived_distance = node->declare_parameter<double>(ns + "th_arrived_distance");
   p.th_stopped_velocity = node->declare_parameter<double>(ns + "th_stopped_velocity");
   p.th_stopped_time = node->declare_parameter<double>(ns + "th_stopped_time");
+  p.prepare_time_before_start = node->declare_parameter<double>(ns + "prepare_time_before_start");
   p.th_turn_signal_on_lateral_offset =
     node->declare_parameter<double>(ns + "th_turn_signal_on_lateral_offset");
   p.th_distance_to_middle_of_the_road =

diff --git a/planning/behavior_path_start_planner_module/src/start_planner_module.cpp b/planning/behavior_path_start_planner_module/src/start_planner_module.cpp
@@ -104,7 +104,7 @@ void StartPlannerModule::onFreespacePlannerTimer()
 BehaviorModuleOutput StartPlannerModule::run()
 {
   updateData();
-  if (!isActivated()) {
+  if (!isActivated() || needToPrepareBlinkerBeforeStart()) {
     return planWaitingApproval();
   }
 
@@ -161,6 +161,10 @@ void StartPlannerModule::updateData()
     DEBUG_PRINT("StartPlannerModule::updateData() received new route, reset status");
   }
 
+  if (!status_.first_approved_time && isActivated()) {
+    status_.first_approved_time = clock_->now();
+  }
+
   if (hasFinishedBackwardDriving()) {
     updateStatusAfterBackwardDriving();
     DEBUG_PRINT("StartPlannerModule::updateData() completed backward driving");
@@ -962,6 +966,16 @@ bool StartPlannerModule::hasFinishedPullOut() const
   return has_finished;
 }
 
+bool StartPlannerModule::needToPrepareBlinkerBeforeStart() const
+{
+  if (!status_.first_approved_time) {
+    return true;
+  }
+  const auto first_approved_time = status_.first_approved_time.value();
+  const double elapsed = rclcpp::Duration(clock_->now() - first_approved_time).seconds();
+  return elapsed < parameters_->prepare_time_before_start;
+}
+
 bool StartPlannerModule::isStuck()
 {
   if (!isStopped()) {