From ab36063f3ab871cb7225794cc8cc41deb66a2ee9 Mon Sep 17 00:00:00 2001 From: Go Sakayori Date: Wed, 18 Sep 2024 05:28:57 +0900 Subject: [PATCH 1/2] fix function updateRTCStatus Signed-off-by: Go Sakayori --- .../interface/scene_module_interface.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/planning/behavior_path_planner/autoware_behavior_path_planner_common/include/autoware/behavior_path_planner_common/interface/scene_module_interface.hpp b/planning/behavior_path_planner/autoware_behavior_path_planner_common/include/autoware/behavior_path_planner_common/interface/scene_module_interface.hpp index 4420fc320daa5..b4f3e4336ffd3 100644 --- a/planning/behavior_path_planner/autoware_behavior_path_planner_common/include/autoware/behavior_path_planner_common/interface/scene_module_interface.hpp +++ b/planning/behavior_path_planner/autoware_behavior_path_planner_common/include/autoware/behavior_path_planner_common/interface/scene_module_interface.hpp @@ -501,7 +501,7 @@ class SceneModuleInterface { for (const auto & [module_name, ptr] : rtc_interface_ptr_map_) { if (ptr) { - const auto state = isWaitingApproval() ? State::WAITING_FOR_EXECUTION : State::RUNNING; + const auto state = !ptr->isRegistered(uuid_map_.at(module_name)) || isWaitingApproval() ? State::WAITING_FOR_EXECUTION : State::RUNNING; ptr->updateCooperateStatus( uuid_map_.at(module_name), isExecutionReady(), state, start_distance, finish_distance, clock_->now()); From ecf10b9e9685dcb6c4aa2ac4e9cdfb5c4eb52b96 Mon Sep 17 00:00:00 2001 From: Go Sakayori Date: Wed, 18 Sep 2024 07:40:48 +0900 Subject: [PATCH 2/2] fix pre-commit Signed-off-by: Go Sakayori --- .../interface/scene_module_interface.hpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/planning/behavior_path_planner/autoware_behavior_path_planner_common/include/autoware/behavior_path_planner_common/interface/scene_module_interface.hpp b/planning/behavior_path_planner/autoware_behavior_path_planner_common/include/autoware/behavior_path_planner_common/interface/scene_module_interface.hpp index b4f3e4336ffd3..f536b211da8a6 100644 --- a/planning/behavior_path_planner/autoware_behavior_path_planner_common/include/autoware/behavior_path_planner_common/interface/scene_module_interface.hpp +++ b/planning/behavior_path_planner/autoware_behavior_path_planner_common/include/autoware/behavior_path_planner_common/interface/scene_module_interface.hpp @@ -501,7 +501,9 @@ class SceneModuleInterface { for (const auto & [module_name, ptr] : rtc_interface_ptr_map_) { if (ptr) { - const auto state = !ptr->isRegistered(uuid_map_.at(module_name)) || isWaitingApproval() ? State::WAITING_FOR_EXECUTION : State::RUNNING; + const auto state = !ptr->isRegistered(uuid_map_.at(module_name)) || isWaitingApproval() + ? State::WAITING_FOR_EXECUTION + : State::RUNNING; ptr->updateCooperateStatus( uuid_map_.at(module_name), isExecutionReady(), state, start_distance, finish_distance, clock_->now());