Commit 2cf3fee 1 parent 7503f42 commit 2cf3fee Copy full SHA for 2cf3fee
File tree 1 file changed +4
-2
lines changed
system/mrm_handler/src/mrm_handler
1 file changed +4
-2
lines changed Original file line number Diff line number Diff line change @@ -450,12 +450,14 @@ void MrmHandler::updateMrmState()
450
450
const bool is_emergency = isEmergency ();
451
451
452
452
// Get mode
453
- const bool is_auto_mode = control_mode_->mode == ControlModeReport::AUTONOMOUS;
453
+ const bool is_vehicle_auto_mode = control_mode_->mode == ControlModeReport::AUTONOMOUS;
454
+ const bool is_operation_mode_auto_mode = operation_mode_state_->mode ==
455
+ autoware_adapi_v1_msgs::msg::OperationModeState::AUTONOMOUS;
454
456
455
457
// State Machine
456
458
if (mrm_state_.state == MrmState::NORMAL) {
457
459
// NORMAL
458
- if (is_auto_mode && is_emergency) {
460
+ if (is_vehicle_auto_mode && is_operation_mode_auto_mode && is_emergency) {
459
461
transitionTo (MrmState::MRM_OPERATING);
460
462
return ;
461
463
}
You can’t perform that action at this time.
0 commit comments