Skip to content

Commit 28c7155

Browse files
committed
fix behavior during timeout
Signed-off-by: veqcc <ryuta.kambe@tier4.jp>
1 parent 4d4dd18 commit 28c7155

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

system/mrm_handler/src/mrm_handler/mrm_handler_core.cpp

+12
Original file line numberDiff line numberDiff line change
@@ -509,6 +509,9 @@ autoware_adapi_v1_msgs::msg::MrmState::_behavior_type MrmHandler::getCurrentMrmB
509509

510510
// State machine
511511
if (mrm_state_.behavior == MrmState::NONE) {
512+
if (is_operation_mode_availability_timeout) {
513+
return MrmState::EMERGENCY_STOP;
514+
}
512515
if (operation_mode_availability_->pull_over) {
513516
if (param_.use_pull_over) {
514517
return MrmState::PULL_OVER;
@@ -525,6 +528,9 @@ autoware_adapi_v1_msgs::msg::MrmState::_behavior_type MrmHandler::getCurrentMrmB
525528
return MrmState::EMERGENCY_STOP;
526529
}
527530
if (mrm_state_.behavior == MrmState::PULL_OVER) {
531+
if (is_operation_mode_availability_timeout) {
532+
return MrmState::EMERGENCY_STOP;
533+
}
528534
if (operation_mode_availability_->pull_over) {
529535
if (param_.use_pull_over) {
530536
return MrmState::PULL_OVER;
@@ -541,6 +547,9 @@ autoware_adapi_v1_msgs::msg::MrmState::_behavior_type MrmHandler::getCurrentMrmB
541547
return MrmState::EMERGENCY_STOP;
542548
}
543549
if (mrm_state_.behavior == MrmState::COMFORTABLE_STOP) {
550+
if (is_operation_mode_availability_timeout) {
551+
return MrmState::EMERGENCY_STOP;
552+
}
544553
if (isStopped() && operation_mode_availability_->pull_over) {
545554
if (param_.use_pull_over) {
546555
return MrmState::PULL_OVER;
@@ -557,6 +566,9 @@ autoware_adapi_v1_msgs::msg::MrmState::_behavior_type MrmHandler::getCurrentMrmB
557566
return MrmState::EMERGENCY_STOP;
558567
}
559568
if (mrm_state_.behavior == MrmState::EMERGENCY_STOP) {
569+
if (is_operation_mode_availability_timeout) {
570+
return MrmState::EMERGENCY_STOP;
571+
}
560572
if (isStopped() && operation_mode_availability_->pull_over) {
561573
if (param_.use_pull_over) {
562574
return MrmState::PULL_OVER;

0 commit comments

Comments
 (0)