diff --git a/planning/rtc_interface/include/rtc_interface/rtc_interface.hpp b/planning/rtc_interface/include/rtc_interface/rtc_interface.hpp index 4763fcc25f256..821dd4a6e6b1f 100644 --- a/planning/rtc_interface/include/rtc_interface/rtc_interface.hpp +++ b/planning/rtc_interface/include/rtc_interface/rtc_interface.hpp @@ -81,7 +81,7 @@ class RTCInterface Module module_; CooperateStatusArray registered_status_; std::vector stored_commands_; - bool is_auto_mode_; + bool is_auto_mode_init_; bool is_locked_; std::string cooperate_status_namespace_ = "/planning/cooperate_status"; diff --git a/planning/rtc_interface/src/rtc_interface.cpp b/planning/rtc_interface/src/rtc_interface.cpp index 8115a347c4c21..83809a6ccc97b 100644 --- a/planning/rtc_interface/src/rtc_interface.cpp +++ b/planning/rtc_interface/src/rtc_interface.cpp @@ -70,7 +70,7 @@ namespace rtc_interface { RTCInterface::RTCInterface(rclcpp::Node * node, const std::string & name) : logger_{node->get_logger().get_child("RTCInterface[" + name + "]")}, - is_auto_mode_{false}, + is_auto_mode_init_{false}, is_locked_{false} { using std::placeholders::_1; @@ -156,7 +156,6 @@ void RTCInterface::updateCooperateCommandStatus(const std::vectorcommand_status = command.command; itr->auto_mode = false; - is_auto_mode_ = false; } } } @@ -165,7 +164,7 @@ void RTCInterface::onAutoModeService( const AutoMode::Request::SharedPtr request, const AutoMode::Response::SharedPtr response) { std::lock_guard lock(mutex_); - is_auto_mode_ = request->enable; + is_auto_mode_init_ = request->enable; for (auto & status : registered_status_.statuses) { status.auto_mode = request->enable; } @@ -192,7 +191,7 @@ void RTCInterface::updateCooperateStatus( status.command_status.type = Command::DEACTIVATE; status.start_distance = start_distance; status.finish_distance = finish_distance; - status.auto_mode = is_auto_mode_; + status.auto_mode = is_auto_mode_init_; registered_status_.statuses.push_back(status); return; } @@ -202,7 +201,6 @@ void RTCInterface::updateCooperateStatus( itr->safe = safe; itr->start_distance = start_distance; itr->finish_distance = finish_distance; - itr->auto_mode = is_auto_mode_; } void RTCInterface::removeCooperateStatus(const UUID & uuid)