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

fix(mrm_handler): fix bug in operation mode availability timeout #6513

Merged
merged 8 commits into from
Mar 11, 2024

Conversation

veqcc
Copy link
Contributor

@veqcc veqcc commented Feb 29, 2024

Description

Fixed how to handle operation_mode_availability timeout in mrm_handler.
Previously, when operation_mode_availability timeout is detected, onTimer callback just changes the mrm_state and publish some commands. However, this is not enough for an MRM operation since no MRM behavior is requested.
This Pull Request solved the problem.

This is almost the same change as #6399 .

Tests performed

Comfirmed MRM changes from (NORMAL, NONE) to (OPERATING, EMERGENCY_STOP) when operation_mode_availability timed outs.

Effects on system behavior

Not applicable.

Pre-review checklist for the PR author

The PR author must check the checkboxes below when creating the PR.

In-review checklist for the PR reviewers

The PR reviewers must check the checkboxes below before approval.

Post-review checklist for the PR author

The PR author must check the checkboxes below before merging.

  • There are no open discussions or they are tracked via tickets.

After all checkboxes are checked, anyone who has write access can merge the PR.

@veqcc veqcc added the component:system System design and integration. (auto-assigned) label Feb 29, 2024
@veqcc veqcc requested review from mkuri and TetsuKawa February 29, 2024 04:52
@veqcc veqcc self-assigned this Feb 29, 2024
@veqcc veqcc changed the title bugfix(mrm_handler): fix bug in operation mode availability timeout fix(mrm_handler): fix bug in operation mode availability timeout Mar 4, 2024
@veqcc veqcc added the run:build-and-test-differential Mark to enable build-and-test-differential workflow. (used-by-ci) label Mar 4, 2024
Copy link

codecov bot commented Mar 4, 2024

Codecov Report

Attention: Patch coverage is 0% with 16 lines in your changes are missing coverage. Please review.

Project coverage is 14.78%. Comparing base (71c5669) to head (6617b83).

Files Patch % Lines
...m/mrm_handler/src/mrm_handler/mrm_handler_core.cpp 0.00% 16 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #6513      +/-   ##
==========================================
- Coverage   14.78%   14.78%   -0.01%     
==========================================
  Files        1917     1917              
  Lines      132253   132261       +8     
  Branches    39297    39297              
==========================================
  Hits        19550    19550              
- Misses      90876    90884       +8     
  Partials    21827    21827              
Flag Coverage Δ *Carryforward flag
differential 0.00% <0.00%> (?)
total 14.78% <ø> (+<0.01%) ⬆️ Carriedforward from 71c5669

*This pull request uses carry forward flags. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@mkuri
Copy link
Contributor

mkuri commented Mar 4, 2024

How is the MRM behavior determined when a timeout is established?
It looks like getCurrentMrmBehavior needs to return MRM behavior at timeout.

Please check the timeout behavior with Psim.

Copy link
Contributor

@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

@veqcc veqcc merged commit b404c8f into autowarefoundation:main Mar 11, 2024
22 of 25 checks passed
@veqcc veqcc deleted the fix_mrm_handler branch March 11, 2024 13:35
HansRobo pushed a commit that referenced this pull request Mar 12, 2024
* fix operation mode availability timeout

Signed-off-by: veqcc <[email protected]>
Signed-off-by: Kotaro Yoshimoto <[email protected]>
kaigohirao pushed a commit to kaigohirao/autoware.universe that referenced this pull request Mar 22, 2024
…owarefoundation#6513)

* fix operation mode availability timeout

Signed-off-by: veqcc <[email protected]>
Signed-off-by: kaigohirao <[email protected]>
mkuri pushed a commit to tier4/autoware.universe that referenced this pull request Mar 28, 2024
karishma1911 pushed a commit to Interplai/autoware.universe that referenced this pull request Jun 3, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component:system System design and integration. (auto-assigned) run:build-and-test-differential Mark to enable build-and-test-differential workflow. (used-by-ci)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants