Skip to content

Commit 2a2d037

Browse files
authored
fix(lane_change): set initail rtc state properly (#8902)
set initail rtc state properly Signed-off-by: Go Sakayori <gsakayori@gmail.com>
1 parent f8dc16f commit 2a2d037

File tree

1 file changed

+10
-5
lines changed
  • planning/behavior_path_planner/autoware_behavior_path_lane_change_module/src

1 file changed

+10
-5
lines changed

planning/behavior_path_planner/autoware_behavior_path_lane_change_module/src/interface.cpp

+10-5
Original file line numberDiff line numberDiff line change
@@ -125,16 +125,21 @@ BehaviorModuleOutput LaneChangeInterface::plan()
125125
} else {
126126
const auto path =
127127
assignToCandidate(module_type_->getLaneChangePath(), module_type_->getEgoPosition());
128-
const auto force_activated = std::any_of(
128+
const auto is_registered = std::any_of(
129129
rtc_interface_ptr_map_.begin(), rtc_interface_ptr_map_.end(),
130-
[&](const auto & rtc) { return rtc.second->isForceActivated(uuid_map_.at(rtc.first)); });
131-
if (!force_activated) {
130+
[&](const auto & rtc) { return rtc.second->isRegistered(uuid_map_.at(rtc.first)); });
131+
132+
if (!is_registered) {
132133
updateRTCStatus(
133134
path.start_distance_to_path_change, path.finish_distance_to_path_change, true,
134-
State::RUNNING);
135+
State::WAITING_FOR_EXECUTION);
135136
} else {
137+
const auto force_activated = std::any_of(
138+
rtc_interface_ptr_map_.begin(), rtc_interface_ptr_map_.end(),
139+
[&](const auto & rtc) { return rtc.second->isForceActivated(uuid_map_.at(rtc.first)); });
140+
const bool safe = force_activated ? false : true;
136141
updateRTCStatus(
137-
path.start_distance_to_path_change, path.finish_distance_to_path_change, false,
142+
path.start_distance_to_path_change, path.finish_distance_to_path_change, safe,
138143
State::RUNNING);
139144
}
140145
}

0 commit comments

Comments
 (0)