Skip to content

Commit 9079986

Browse files
committed
add pull over after stopped option
1 parent 9dc94c3 commit 9079986

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

system/mrm_handler/config/mrm_handler.param.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
is_mrm_recoverable: true
1212
use_parking_after_stopped: false
1313
use_pull_over: false
14+
use_pull_over_after_stopped: false
1415
use_comfortable_stop: false
1516

1617
# setting whether to turn hazard lamp on for each situation

system/mrm_handler/include/mrm_handler/mrm_handler_core.hpp

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ struct Param
5454
bool is_mrm_recoverable;
5555
bool use_parking_after_stopped;
5656
bool use_pull_over;
57+
bool use_pull_over_after_stopped;
5758
bool use_comfortable_stop;
5859
HazardLampPolicy turning_hazard_on{};
5960
};

system/mrm_handler/src/mrm_handler/mrm_handler_core.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ MrmHandler::MrmHandler() : Node("mrm_handler")
3232
param_.is_mrm_recoverable = declare_parameter<bool>("is_mrm_recoverable", true);
3333
param_.use_parking_after_stopped = declare_parameter<bool>("use_parking_after_stopped", false);
3434
param_.use_pull_over = declare_parameter<bool>("use_pull_over", false);
35+
param_.use_pull_over_after_stopped = declare_parameter<bool>("use_pull_over_after_stopped", false);
3536
param_.use_comfortable_stop = declare_parameter<bool>("use_comfortable_stop", false);
3637
param_.turning_hazard_on.emergency = declare_parameter<bool>("turning_hazard_on.emergency", true);
3738

@@ -548,7 +549,7 @@ autoware_adapi_v1_msgs::msg::MrmState::_behavior_type MrmHandler::getCurrentMrmB
548549
return MrmState::EMERGENCY_STOP;
549550
}
550551
if (isStopped() && operation_mode_availability_->pull_over) {
551-
if (param_.use_pull_over) {
552+
if (param_.use_pull_over && param_.use_pull_over_after_stopped) {
552553
return MrmState::PULL_OVER;
553554
}
554555
}
@@ -567,7 +568,7 @@ autoware_adapi_v1_msgs::msg::MrmState::_behavior_type MrmHandler::getCurrentMrmB
567568
return MrmState::EMERGENCY_STOP;
568569
}
569570
if (isStopped() && operation_mode_availability_->pull_over) {
570-
if (param_.use_pull_over) {
571+
if (param_.use_pull_over && param_.use_pull_over_after_stopped) {
571572
return MrmState::PULL_OVER;
572573
}
573574
}

0 commit comments

Comments
 (0)