Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(mrm_handler): mrm recoverable option (#1316) #1654

Merged
merged 4 commits into from
Nov 23, 2024

Conversation

TomohitoAndo
Copy link

@TomohitoAndo TomohitoAndo commented Nov 21, 2024

Description

Update for launcher: https://github.com/tier4/autoware_launch.x2/pull/847

このPRでは、MRMからの自動復帰を選択するための機能を取り込んでいます。

具体的には、以下の変更を取り込んでいます。

Related links

Related JIRA: https://tier4.atlassian.net/browse/RT0-34249

How was this PR tested?

詳細は下記を確認ください。
TIER IV INTERNAL

PSimで以下を確認しています。

  • 復帰可能なダイアグから復帰できること
  • 復帰不可なダイアグから復帰できないこと
simplescreenrecorder-2024-11-22_19.47.56.mp4

Notes for reviewers

Warning

MOT側でMRMを解除するボタンの実装はまだ取り込まれていません。
復帰不可なMRMが発生した場合でも、ターミナルで下記サービスを実行すれば解除できます。

ros2 service call /system/clear_mrm std_srvs/srv/Trigger

Interface changes

None.

Effects on system behavior

None.

Copy link

sonarcloud bot commented Nov 21, 2024

saka1-s and others added 3 commits November 22, 2024 19:34
* implement is_mrm_recoverable option of mrm_handler

* add pull over after stopped option

* update json schema of mrm_handler

Signed-off-by: Tomohito Ando <[email protected]>
* implement service for clear MRM behavior

* clang format

Signed-off-by: Tomohito Ando <[email protected]>
@TomohitoAndo TomohitoAndo force-pushed the feat/add-mrm-recoverable-feature branch from babdfaa to 2aca1c9 Compare November 22, 2024 10:52
Signed-off-by: Tomohito Ando <[email protected]>
@TomohitoAndo TomohitoAndo marked this pull request as ready for review November 22, 2024 11:10
Copy link

@mkuri mkuri left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@TomohitoAndo TomohitoAndo merged commit d48e741 into beta/x2_gen2/v0.29.0 Nov 23, 2024
48 of 51 checks passed
@TomohitoAndo TomohitoAndo deleted the feat/add-mrm-recoverable-feature branch November 23, 2024 00:36
TetsuKawa pushed a commit that referenced this pull request Dec 1, 2024
* feat(mrm_handler): mrm recoverable option (#1316)

* implement is_mrm_recoverable option of mrm_handler

* add pull over after stopped option

* update json schema of mrm_handler

Signed-off-by: Tomohito Ando <[email protected]>

* feat: implement service for clear MRM behavior (#1511)

* implement service for clear MRM behavior

* clang format

Signed-off-by: Tomohito Ando <[email protected]>

* feat: implement MRM automatic recovery feature

Signed-off-by: Tomohito Ando <[email protected]>

* fix typo

Signed-off-by: Tomohito Ando <[email protected]>

---------

Signed-off-by: Tomohito Ando <[email protected]>
Co-authored-by: Shohei Sakai <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants