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(longitudinal_controller): add disable emergency option #1201

Merged
merged 3 commits into from
Jul 1, 2022

Conversation

TakaHoribe
Copy link
Contributor

@TakaHoribe TakaHoribe commented Jun 30, 2022

Description

Add option to disable emergency in velocity_controller.
Now velocity_controller is stuck into the emergency state in some situations. It occurs even in manual driving, which blocks engaging while moving. Setting the emergency option to false solves the above issue.

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.

Signed-off-by: Takamasa Horibe <horibe.takamasa@gmail.com>
@codecov
Copy link

codecov bot commented Jun 30, 2022

Codecov Report

Merging #1201 (bb7c2dc) into main (ce6ccec) will increase coverage by 0.14%.
The diff coverage is 40.00%.

@@           Coverage Diff            @@
##            main   #1201      +/-   ##
========================================
+ Coverage   9.59%   9.73%   +0.14%     
========================================
  Files       1045    1045              
  Lines      71821   72037     +216     
  Branches   15590   15730     +140     
========================================
+ Hits        6889    7011     +122     
- Misses     58693   58714      +21     
- Partials    6239    6312      +73     
Flag Coverage Δ *Carryforward flag
differential 35.28% <25.00%> (?)
total 9.57% <25.00%> (ø) Carriedforward from b94e678

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

Impacted Files Coverage Δ
...ollower_nodes/src/longitudinal_controller_node.cpp 44.29% <40.00%> (+5.73%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ce6ccec...bb7c2dc. Read the comment docs.

Signed-off-by: Takamasa Horibe <horibe.takamasa@gmail.com>
Copy link
Contributor

@tkimura4 tkimura4 left a comment

Choose a reason for hiding this comment

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

LGTM

(But I think it's a little strange that the controller send an emergency stop command but it doesn't change to emergency state. I think it is more appropriate to change the recovery conditions from emergency state depending on the parameters.)

@tkimura4
Copy link
Contributor

tkimura4 commented Jul 1, 2022

Could you also update the parameter file in tier4_control_launch?
https://github.com/autowarefoundation/autoware.universe/blob/main/launch/tier4_control_launch/config/trajectory_follower/longitudinal_controller.param.yaml

Signed-off-by: Takamasa Horibe <horibe.takamasa@gmail.com>
@TakaHoribe TakaHoribe merged commit 216f6c0 into main Jul 1, 2022
@TakaHoribe TakaHoribe deleted the feature/add-emergency-stop-disable-option branch July 1, 2022 07:00
boyali referenced this pull request in boyali/autoware.universe Sep 28, 2022
* feat(longitudinal_controller): add disable emergency option

Signed-off-by: Takamasa Horibe <horibe.takamasa@gmail.com>

* update readme

Signed-off-by: Takamasa Horibe <horibe.takamasa@gmail.com>

* add param

Signed-off-by: Takamasa Horibe <horibe.takamasa@gmail.com>
boyali referenced this pull request in boyali/autoware.universe Oct 3, 2022
* feat(longitudinal_controller): add disable emergency option

Signed-off-by: Takamasa Horibe <horibe.takamasa@gmail.com>

* update readme

Signed-off-by: Takamasa Horibe <horibe.takamasa@gmail.com>

* add param

Signed-off-by: Takamasa Horibe <horibe.takamasa@gmail.com>
boyali referenced this pull request in boyali/autoware.universe Oct 3, 2022
* feat(longitudinal_controller): add disable emergency option

Signed-off-by: Takamasa Horibe <horibe.takamasa@gmail.com>

* update readme

Signed-off-by: Takamasa Horibe <horibe.takamasa@gmail.com>

* add param

Signed-off-by: Takamasa Horibe <horibe.takamasa@gmail.com>
yukke42 pushed a commit to tzhong518/autoware.universe that referenced this pull request Oct 14, 2022
…foundation#1201)

* feat(longitudinal_controller): add disable emergency option

Signed-off-by: Takamasa Horibe <horibe.takamasa@gmail.com>

* update readme

Signed-off-by: Takamasa Horibe <horibe.takamasa@gmail.com>

* add param

Signed-off-by: Takamasa Horibe <horibe.takamasa@gmail.com>
boyali referenced this pull request in boyali/autoware.universe Oct 19, 2022
* feat(longitudinal_controller): add disable emergency option

Signed-off-by: Takamasa Horibe <horibe.takamasa@gmail.com>

* update readme

Signed-off-by: Takamasa Horibe <horibe.takamasa@gmail.com>

* add param

Signed-off-by: Takamasa Horibe <horibe.takamasa@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants