-
Notifications
You must be signed in to change notification settings - Fork 682
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(emergency_handler): add a selector for multiple MRM behaviors #2070
feat(emergency_handler): add a selector for multiple MRM behaviors #2070
Conversation
Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com>
Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com>
Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com>
Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com>
Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com>
Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com>
Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com>
Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com>
Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com>
Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com>
Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com>
Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com>
Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com>
Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com>
Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com>
Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com>
Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com>
Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com>
Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com>
Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com>
Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com>
Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com>
Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com>
Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com>
Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com>
Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com>
Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com>
Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com>
Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com>
…_msgs Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com>
Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com>
Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com>
Sorry to bother you. Could you please review? The maintainers of each package are listed below. I would like to ask @yukkysaito -san and @isamu-takagi -san to review the overall design. |
system/emergency_handler/include/emergency_handler/emergency_handler_core.hpp
Outdated
Show resolved
Hide resolved
system/emergency_handler/src/emergency_handler/emergency_handler_core.cpp
Outdated
Show resolved
Hide resolved
Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com>
Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com>
Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com>
Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com>
Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com>
Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com>
Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you've re-checked the behavior, I think it's okay.
Codecov ReportBase: 11.22% // Head: 11.08% // Decreases project coverage by
Additional details and impacted files@@ Coverage Diff @@
## main #2070 +/- ##
==========================================
- Coverage 11.22% 11.08% -0.15%
==========================================
Files 1198 1202 +4
Lines 79325 86592 +7267
Branches 20343 20872 +529
==========================================
+ Hits 8907 9601 +694
- Misses 60671 66852 +6181
- Partials 9747 10139 +392
*This pull request uses carry forward flags. Click here to find out more.
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. ☔ View full report at Codecov. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
…utowarefoundation#2070) * feat(emergency_handler): add mrm command and status publishers Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * feat(autoware_ad_api_msgs): define mrm operation srv and mrm status msg Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * feat(emergency_handler): add mrm clients and subscribers Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * feat(mrm_comfortable_stop_operator): ready ros2 node template Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * feat(mrm_comfortable_stop_operator): implemented Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * feat(mrm_comfortable_stop_operator): implement as component Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * chore(mrm_comfortable_stop_operator): add a launch script Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * refactor(mrm_comfortable_stop_operator): remove a xml launch file Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * feat(autoware_ad_api_msgs): change mrm status msg Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * feat(emergency_handler): add mrm operator and mrm behavior updater Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * feat(emergency_handler): add mrm behavior state machine Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * feat(emergency_handler): remap io names Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * fix(emergency_handler): fix request generation Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * fix(emergency_handler): add multi thread execution for service Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * feat(vehicle_cmd_gate): add mrm operation service and status publisher Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * refactor(mrm_comfortable_stop_operator): use MRMBehaviorStatus struct Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * fix(mrm_comfortable_stop_operator): add time stamp for status Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * feat(vehicle_cmd_gate): change system emergency state by mrm operation Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * chore(autoware_ad_api_msgs): remove rti_operating state from mrm status Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * feat(mrm_sudden_stop_operator): add mrm_sudden_stop_operator Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * refactor(autoware_ad_api_msgs): rename from mrm status to mrm state Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * fix(mrm_comfortable_stop_operator): set qos for velocity limit publisher Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * feat(emergency_handler): add mrm state publisher Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * feat(vehicle_cmd_gate): add subscription for mrm_state Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * fix(mrm_sudden_stop_operator): fix control command topic name Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * feat(vehicle_cmd_gate): pub emergency control_cmd according to mrm state Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * feat(emergency_handler): remove emergency control_cmd publisher Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * chore(tier4_control_launch): remap mrm state topic Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * feat(tier4_system_launch): launch mrm operators Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * fix(emergency_handler): fix autoware_ad_api_msgs to autoware_adapi_v1_msgs Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * fix(vehicle_cmd_gate): remove subscribers for emergency_state and mrm operation Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * fix(vehicle_cmd_gate): fix system emergency condition Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * fix(emergency_handler): add stamp for mrm_state Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * fix(mrm_emergency_stop_operator): rename sudden stop to emergency stop Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * fix(vehicle_cmd_gate): remove emergency stop status publisher Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * fix(emergency_handler): replace emergency state to mrm state Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * feat(mrm_emergency_stop_operator): add is_available logic Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * feat(emergency_handler): add use_comfortable_stop param Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * refactor(emergency_handler): rename getCurrentMRMBehavior Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * feat(emergency_handler): add mrm available status for ready conditions Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * feat(emergency_handler): add readme Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * fix(mrm_comfortable_stop_operator): fix update rate Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * refactor(emergency_handler): move MRMBehaviorStatus msg to tier4_system_msgs Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * feat(emergency_handler): describe new io for emergency_handler Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * fix(emergency_handler): remove extra settings Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * fix(mrm_emergency_stop_operator): fix is_available condition Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * fix(mrm_emergency_stop_operator): fix typo Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * ci(pre-commit): autofix * fix(mrm_emergency_stop_operator): remove extra descriptions on config files Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * fix(mrm_comfortable_stop_operator): fix typo Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * chore(mrm_comfortable_stop_operator): change words Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * chore(mrm_comfortable_stop_operator): change maintainer infomation Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * fix(emergency_handler): fix acronyms case Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * chore(emergency_handler): add a maintainer Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * fix(emergency_handler): fix to match msg changes Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * fix(vehicle_cmd_gate): remove an extra include Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * ci(pre-commit): autofix * fix(emergency_handler): fix topic name spaces Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * fix(emergency_handler): fix acronyms case Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * chore(tier4_system_launch): add a mrm comfortable stop parameter Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Signed-off-by: Kotaro Yoshimoto <pythagora.yoshimoto@gmail.com>
…utowarefoundation#2070) * feat(emergency_handler): add mrm command and status publishers Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * feat(autoware_ad_api_msgs): define mrm operation srv and mrm status msg Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * feat(emergency_handler): add mrm clients and subscribers Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * feat(mrm_comfortable_stop_operator): ready ros2 node template Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * feat(mrm_comfortable_stop_operator): implemented Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * feat(mrm_comfortable_stop_operator): implement as component Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * chore(mrm_comfortable_stop_operator): add a launch script Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * refactor(mrm_comfortable_stop_operator): remove a xml launch file Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * feat(autoware_ad_api_msgs): change mrm status msg Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * feat(emergency_handler): add mrm operator and mrm behavior updater Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * feat(emergency_handler): add mrm behavior state machine Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * feat(emergency_handler): remap io names Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * fix(emergency_handler): fix request generation Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * fix(emergency_handler): add multi thread execution for service Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * feat(vehicle_cmd_gate): add mrm operation service and status publisher Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * refactor(mrm_comfortable_stop_operator): use MRMBehaviorStatus struct Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * fix(mrm_comfortable_stop_operator): add time stamp for status Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * feat(vehicle_cmd_gate): change system emergency state by mrm operation Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * chore(autoware_ad_api_msgs): remove rti_operating state from mrm status Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * feat(mrm_sudden_stop_operator): add mrm_sudden_stop_operator Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * refactor(autoware_ad_api_msgs): rename from mrm status to mrm state Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * fix(mrm_comfortable_stop_operator): set qos for velocity limit publisher Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * feat(emergency_handler): add mrm state publisher Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * feat(vehicle_cmd_gate): add subscription for mrm_state Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * fix(mrm_sudden_stop_operator): fix control command topic name Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * feat(vehicle_cmd_gate): pub emergency control_cmd according to mrm state Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * feat(emergency_handler): remove emergency control_cmd publisher Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * chore(tier4_control_launch): remap mrm state topic Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * feat(tier4_system_launch): launch mrm operators Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * fix(emergency_handler): fix autoware_ad_api_msgs to autoware_adapi_v1_msgs Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * fix(vehicle_cmd_gate): remove subscribers for emergency_state and mrm operation Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * fix(vehicle_cmd_gate): fix system emergency condition Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * fix(emergency_handler): add stamp for mrm_state Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * fix(mrm_emergency_stop_operator): rename sudden stop to emergency stop Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * fix(vehicle_cmd_gate): remove emergency stop status publisher Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * fix(emergency_handler): replace emergency state to mrm state Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * feat(mrm_emergency_stop_operator): add is_available logic Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * feat(emergency_handler): add use_comfortable_stop param Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * refactor(emergency_handler): rename getCurrentMRMBehavior Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * feat(emergency_handler): add mrm available status for ready conditions Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * feat(emergency_handler): add readme Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * fix(mrm_comfortable_stop_operator): fix update rate Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * refactor(emergency_handler): move MRMBehaviorStatus msg to tier4_system_msgs Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * feat(emergency_handler): describe new io for emergency_handler Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * fix(emergency_handler): remove extra settings Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * fix(mrm_emergency_stop_operator): fix is_available condition Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * fix(mrm_emergency_stop_operator): fix typo Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * ci(pre-commit): autofix * fix(mrm_emergency_stop_operator): remove extra descriptions on config files Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * fix(mrm_comfortable_stop_operator): fix typo Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * chore(mrm_comfortable_stop_operator): change words Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * chore(mrm_comfortable_stop_operator): change maintainer infomation Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * fix(emergency_handler): fix acronyms case Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * chore(emergency_handler): add a maintainer Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * fix(emergency_handler): fix to match msg changes Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * fix(vehicle_cmd_gate): remove an extra include Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * ci(pre-commit): autofix * fix(emergency_handler): fix topic name spaces Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * fix(emergency_handler): fix acronyms case Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> * chore(tier4_system_launch): add a mrm comfortable stop parameter Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> Signed-off-by: Makoto Kurihara <mkuri8m@gmail.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Signed-off-by: yoshiri <yoshiyoshidetteiu@gmail.com>
Description
Provide a mechanism to select multiple MRM behaviors depending on the hazard state.
#1856
Emergency handler
MRM Emergency stop operator
MRM Comfortable stop operator
Vehicle cmd gate
Limitations and future works
Related links
#1856
Tests performed
emergency_stop_output.mp4
comfortable_stop_output.mp4
Notes for reviewers
Need to apply the following PRs to add the msgs
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.
After all checkboxes are checked, anyone who has write access can merge the PR.