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(trajectory_follower_nodes): change control running order to keep stopped state #1252

Merged
merged 2 commits into from
Jul 7, 2022

Conversation

kosuke55
Copy link
Contributor

@kosuke55 kosuke55 commented Jul 6, 2022

Description

  • fix keep stopped until the steer is converged when the new trajectory is received.
  • steer convergence is checked in the lateral controller for a new trajectory. In order to pass it immediately to the longitudinal controller, the lateral controller must run first then the longitudinal.
    • If two are executed at the same time, the longitudinal controller uses the steer convergence information of the trajectory one step earlier and can not keep stopped.

Related links

#901

Tests performed

checked keeping stopped state until steer is converged when receiving a new trajectory.

Notes for reviewers

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.

  • The PR follows the pull request guidelines.
  • The PR has been properly tested.
  • The PR has been reviewed by the code owners.

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.
  • The PR is ready for merge.

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

@kosuke55 kosuke55 changed the title fix(trajectory_follower): change control running order to keep stoppe… fix(trajectory_follower): change control running order to keep stopped state Jul 6, 2022
@kosuke55 kosuke55 marked this pull request as ready for review July 6, 2022 06:27
@kosuke55 kosuke55 requested a review from TakaHoribe July 6, 2022 06:29
…stopped state

Signed-off-by: kosuke55 <kosuke.tnp@gmail.com>
@kosuke55 kosuke55 force-pushed the fix/keep_stopped branch from b0654b6 to 8a7b6e0 Compare July 6, 2022 06:30
@kosuke55 kosuke55 changed the title fix(trajectory_follower): change control running order to keep stopped state fix(trajectory_follower_nodes): change control running order to keep stopped state Jul 6, 2022
@codecov
Copy link

codecov bot commented Jul 6, 2022

Codecov Report

Merging #1252 (1e0e9e2) into main (b190ea7) will increase coverage by 0.05%.
The diff coverage is 76.92%.

@@           Coverage Diff            @@
##            main   #1252      +/-   ##
========================================
+ Coverage   9.66%   9.71%   +0.05%     
========================================
  Files       1054    1056       +2     
  Lines      72647   72763     +116     
  Branches   15819   15863      +44     
========================================
+ Hits        7018    7070      +52     
- Misses     59307   59623     +316     
+ Partials    6322    6070     -252     
Flag Coverage Δ *Carryforward flag
differential 42.11% <80.00%> (?)
total 9.65% <57.14%> (+<0.01%) ⬆️ Carriedforward from 8a7b6e0

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

Impacted Files Coverage Δ
...trajectory_follower/src/mpc_lateral_controller.cpp 39.19% <40.00%> (+5.28%) ⬆️
.../trajectory_follower_nodes/src/controller_node.cpp 48.61% <100.00%> (+6.42%) ⬆️
map/lanelet2_extension/lib/query.cpp 9.52% <0.00%> (ø)
map/lanelet2_extension/lib/utilities.cpp 8.89% <0.00%> (ø)
common/osqp_interface/src/osqp_interface.cpp 34.35% <0.00%> (ø)
map/lanelet2_extension/lib/visualization.cpp 0.00% <0.00%> (ø)
planning/route_handler/src/route_handler.cpp 0.00% <0.00%> (ø)
planning/rtc_interface/src/rtc_interface.cpp 0.00% <0.00%> (ø)
control/trajectory_follower/src/mpc_utils.cpp 62.71% <0.00%> (ø)
map/lanelet2_extension/lib/detection_area.cpp 0.00% <0.00%> (ø)
... and 85 more

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 b190ea7...1e0e9e2. Read the comment docs.

@tkimura4
Copy link
Contributor

tkimura4 commented Jul 6, 2022

In my environment, the vehicle starts before the steer is converged.
Is it something wrong?

2022-07-06-21-41-42.mp4

@kosuke55
Copy link
Contributor Author

kosuke55 commented Jul 6, 2022

hmm, I can not watch your video, but did you set following params true?

  • enable_keep_stopped_until_steer_convergence
  • keep_steer_control_until_converged

@tkimura4
Copy link
Contributor

tkimura4 commented Jul 6, 2022

In parking scenario, it seems to work well.
Is it as your expected?

2022-07-06-22-00-39.mp4

@kosuke55
Copy link
Contributor Author

kosuke55 commented Jul 6, 2022

In parking scenario, it seems to work well.
Is it as your expected?

yes, I expected it

Signed-off-by: kosuke55 <kosuke.tnp@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

@kosuke55
Copy link
Contributor Author

kosuke55 commented Jul 6, 2022

In my environment, the vehicle starts before the steer is converged.
Is it something wrong?

It takes time to propagate the new trajectory to the output command, but it does not wait for the first trajectory.
So add waiting time for it in 1e0e9e2

steer_converged-2022-07-06_23.31.47.mp4

@kosuke55 kosuke55 merged commit e25b0b5 into autowarefoundation:main Jul 7, 2022
@kosuke55 kosuke55 deleted the fix/keep_stopped branch July 7, 2022 00:17
boyali referenced this pull request in boyali/autoware.universe Sep 28, 2022
…stopped state (tier4#1252)

* fix(trajectory_follower_nodes): change control running order to keep stopped state

Signed-off-by: kosuke55 <kosuke.tnp@gmail.com>

* add flag for receiving first trajectory

Signed-off-by: kosuke55 <kosuke.tnp@gmail.com>
boyali referenced this pull request in boyali/autoware.universe Oct 3, 2022
…stopped state (tier4#1252)

* fix(trajectory_follower_nodes): change control running order to keep stopped state

Signed-off-by: kosuke55 <kosuke.tnp@gmail.com>

* add flag for receiving first trajectory

Signed-off-by: kosuke55 <kosuke.tnp@gmail.com>
boyali referenced this pull request in boyali/autoware.universe Oct 3, 2022
…stopped state (tier4#1252)

* fix(trajectory_follower_nodes): change control running order to keep stopped state

Signed-off-by: kosuke55 <kosuke.tnp@gmail.com>

* add flag for receiving first trajectory

Signed-off-by: kosuke55 <kosuke.tnp@gmail.com>
yukke42 pushed a commit to tzhong518/autoware.universe that referenced this pull request Oct 14, 2022
…stopped state (autowarefoundation#1252)

* fix(trajectory_follower_nodes): change control running order to keep stopped state

Signed-off-by: kosuke55 <kosuke.tnp@gmail.com>

* add flag for receiving first trajectory

Signed-off-by: kosuke55 <kosuke.tnp@gmail.com>
boyali referenced this pull request in boyali/autoware.universe Oct 19, 2022
…stopped state (tier4#1252)

* fix(trajectory_follower_nodes): change control running order to keep stopped state

Signed-off-by: kosuke55 <kosuke.tnp@gmail.com>

* add flag for receiving first trajectory

Signed-off-by: kosuke55 <kosuke.tnp@gmail.com>
kyoichi-sugahara pushed a commit to kyoichi-sugahara/autoware.universe that referenced this pull request Jun 12, 2024
…6786) (autowarefoundation#1252)

* refactor(avoidance): unify similar param



* refactor(avoidance): rename misreading params



* refactor(avoidance): update parameter namespace



* refactor(avoidance): use prefix th instead of threshold



* refactor(avoidance): rename params



* refactor(AbLC): rename params



* refactor(avoidance): update yaml



* refactor(AbLC): update yaml



---------

Signed-off-by: satoshi-ota <satoshi.ota928@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