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: add check for external_emergency_stop_heartbeat_received_time to isDataReady #2155

Conversation

s-azumi
Copy link
Contributor

@s-azumi s-azumi commented Oct 26, 2022

Description

The vehicle_cmd_gate node periodically checks two heartbeat topics: system emergency heartbeat and external emergency stop heartbeat.
However, in the initialization function (isDataReady) only checks for system emergency heartbeat.
So I`ll add a check for the external emergency stop heartbeat to the initialization function.

TierIV Internal Link
https://tier4.atlassian.net/browse/T4PB-21179

Tests performed

  1. Make sure the use_external_emergency_stop argument in control.launch.py is true.
  2. Launch planning_simulator, set Ego and Goal position.
  3. You can see the message external_emergency_stop_heartbeat_received_time_ is false in the terminal.
    1. If use_external_emergency_stop is false, then you can engage the vehicle on simulaotr.
  4. Publish /external/selected/heartbeat topic(e.g. by rqt Message Publisher), then you can engage the vehicle.

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.

@s-azumi s-azumi force-pushed the fix/external_emergency_stop_heartbeat_timeout branch from e4bea47 to c8f2bb5 Compare October 26, 2022 09:33
@s-azumi s-azumi requested a review from h-ohta October 26, 2022 09:34
@s-azumi s-azumi force-pushed the fix/external_emergency_stop_heartbeat_timeout branch from c8f2bb5 to 24c394c Compare October 26, 2022 09:43
@codecov
Copy link

codecov bot commented Oct 26, 2022

Codecov Report

Base: 11.09% // Head: 11.08% // Decreases project coverage by -0.01% ⚠️

Coverage data is based on head (968ef51) compared to base (a40d23e).
Patch coverage: 0.00% of modified lines in pull request are covered.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2155      +/-   ##
==========================================
- Coverage   11.09%   11.08%   -0.02%     
==========================================
  Files        1213     1213              
  Lines       86618    86732     +114     
  Branches    20787    20858      +71     
==========================================
+ Hits         9612     9613       +1     
- Misses      66847    66958     +111     
- Partials    10159    10161       +2     
Flag Coverage Δ *Carryforward flag
differential 18.60% <0.00%> (?)
total 11.07% <0.00%> (ø) Carriedforward from a40d23e

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

Impacted Files Coverage Δ
control/vehicle_cmd_gate/src/vehicle_cmd_gate.cpp 0.44% <0.00%> (+0.14%) ⬆️
..._smoother/src/smoother/l2_pseudo_jerk_smoother.cpp 0.00% <0.00%> (ø)

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.
📢 Do you have feedback about the report comment? Let us know in this issue.

@s-azumi s-azumi marked this pull request as ready for review October 26, 2022 10:05
@s-azumi s-azumi requested a review from TakaHoribe as a code owner October 26, 2022 10:05
@h-ohta
Copy link
Contributor

h-ohta commented Oct 28, 2022

@s-azumi Could you tell me how you confirmed this pr?

@s-azumi s-azumi force-pushed the fix/external_emergency_stop_heartbeat_timeout branch 2 times, most recently from 9588e6e to b59bb66 Compare November 1, 2022 07:51
@s-azumi
Copy link
Contributor Author

s-azumi commented Nov 1, 2022

@h-ohta
I added the confirmation method, please check it.

@TakaHoribe
Merging this PR will prevent vehicles from starting in planning_simulator because use_external_emergency_stop is true by default.
If this argument setting is correct, I think the planning_simulator.launch needs to be changed.

@h-ohta
Copy link
Contributor

h-ohta commented Nov 4, 2022

@s-azumi I'll wait PR for launch.

@s-azumi
Copy link
Contributor Author

s-azumi commented Nov 8, 2022

@h-ohta @TakaHoribe
I updated README about use_external_emergency_stop parameter.

PRs for launch are here, please review with this.

@h-ohta h-ohta force-pushed the fix/external_emergency_stop_heartbeat_timeout branch 2 times, most recently from 95c24a0 to ccf3b8e Compare November 9, 2022 07:11
Copy link
Contributor

@h-ohta h-ohta left a comment

Choose a reason for hiding this comment

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

LGTM
@TakaHoribe Could you confirm README changes ?

@s-azumi s-azumi force-pushed the fix/external_emergency_stop_heartbeat_timeout branch from ccf3b8e to 715ac73 Compare November 15, 2022 07:57
@github-actions github-actions bot added component:control Vehicle control algorithms and mechanisms. (auto-assigned) document labels Nov 15, 2022
control/vehicle_cmd_gate/README.md Outdated Show resolved Hide resolved
… isDataReady

Signed-off-by: Azumi Suzuki <azumi.suzuki@tier4.jp>
Signed-off-by: Azumi Suzuki <azumi.suzuki@tier4.jp>
Signed-off-by: Azumi Suzuki <azumi.suzuki@tier4.jp>
@s-azumi s-azumi force-pushed the fix/external_emergency_stop_heartbeat_timeout branch from 1fc5e81 to 968ef51 Compare November 15, 2022 08:25
@s-azumi s-azumi merged commit a117014 into autowarefoundation:main Nov 15, 2022
@s-azumi s-azumi deleted the fix/external_emergency_stop_heartbeat_timeout branch November 15, 2022 09:18
s-azumi added a commit to tier4/autoware.universe that referenced this pull request Nov 24, 2022
… isDataReady (autowarefoundation#2155)

* fix: add check for external_emergency_stop_heartbeat_received_time to isDataReady

Signed-off-by: Azumi Suzuki <azumi.suzuki@tier4.jp>

* feat: add README about `use_external_emergency_stop` parameter

Signed-off-by: Azumi Suzuki <azumi.suzuki@tier4.jp>

* fix: update README as recommended

Signed-off-by: Azumi Suzuki <azumi.suzuki@tier4.jp>

Signed-off-by: Azumi Suzuki <azumi.suzuki@tier4.jp>
s-azumi added a commit to tier4/autoware.universe that referenced this pull request Nov 24, 2022
… isDataReady (autowarefoundation#2155) (#188)

fix: add check for external_emergency_stop_heartbeat_received_time to isDataReady (autowarefoundation#2155)

* fix: add check for external_emergency_stop_heartbeat_received_time to isDataReady

Signed-off-by: Azumi Suzuki <azumi.suzuki@tier4.jp>

* feat: add README about `use_external_emergency_stop` parameter

Signed-off-by: Azumi Suzuki <azumi.suzuki@tier4.jp>

* fix: update README as recommended

Signed-off-by: Azumi Suzuki <azumi.suzuki@tier4.jp>

Signed-off-by: Azumi Suzuki <azumi.suzuki@tier4.jp>

Signed-off-by: Azumi Suzuki <azumi.suzuki@tier4.jp>
HansRobo pushed a commit to HansRobo/autoware.universe that referenced this pull request Dec 16, 2022
… isDataReady (autowarefoundation#2155)

* fix: add check for external_emergency_stop_heartbeat_received_time to isDataReady

Signed-off-by: Azumi Suzuki <azumi.suzuki@tier4.jp>

* feat: add README about `use_external_emergency_stop` parameter

Signed-off-by: Azumi Suzuki <azumi.suzuki@tier4.jp>

* fix: update README as recommended

Signed-off-by: Azumi Suzuki <azumi.suzuki@tier4.jp>

Signed-off-by: Azumi Suzuki <azumi.suzuki@tier4.jp>
Signed-off-by: Kotaro Yoshimoto <pythagora.yoshimoto@gmail.com>
kminoda pushed a commit to kminoda/autoware.universe that referenced this pull request Jan 6, 2023
… isDataReady (autowarefoundation#2155)

* fix: add check for external_emergency_stop_heartbeat_received_time to isDataReady

Signed-off-by: Azumi Suzuki <azumi.suzuki@tier4.jp>

* feat: add README about `use_external_emergency_stop` parameter

Signed-off-by: Azumi Suzuki <azumi.suzuki@tier4.jp>

* fix: update README as recommended

Signed-off-by: Azumi Suzuki <azumi.suzuki@tier4.jp>

Signed-off-by: Azumi Suzuki <azumi.suzuki@tier4.jp>
Signed-off-by: kminoda <koji.minoda@tier4.jp>
YoshiRi pushed a commit to YoshiRi/autoware.universe that referenced this pull request Jan 11, 2023
… isDataReady (autowarefoundation#2155)

* fix: add check for external_emergency_stop_heartbeat_received_time to isDataReady

Signed-off-by: Azumi Suzuki <azumi.suzuki@tier4.jp>

* feat: add README about `use_external_emergency_stop` parameter

Signed-off-by: Azumi Suzuki <azumi.suzuki@tier4.jp>

* fix: update README as recommended

Signed-off-by: Azumi Suzuki <azumi.suzuki@tier4.jp>

Signed-off-by: Azumi Suzuki <azumi.suzuki@tier4.jp>
Signed-off-by: yoshiri <yoshiyoshidetteiu@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component:control Vehicle control algorithms and mechanisms. (auto-assigned)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants