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(pid_longitudinal_controller): use is_autoware_control_enabled for manual driving #5092

Conversation

takayuki5168
Copy link
Contributor

@takayuki5168 takayuki5168 commented Sep 23, 2023

Description

The following PR uses m_current_operation_mode.mode to know if the current driving is autonomous or manual.
However, in my understanding, this value can be AUTONOMOUS even when the driving is manual.
#2619

Actually, I think m_current_operation_mode.is_autoware_control_enabled && m_current_operation_mode.mode == OperationModeState::AUTONOMOUS is the correct one.

Tests performed

nothing

Effects on system behavior

nothing

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.

… manual driving

Signed-off-by: Takayuki Murooka <takayuki5168@gmail.com>
@github-actions github-actions bot added the component:control Vehicle control algorithms and mechanisms. (auto-assigned) label Sep 23, 2023
@takayuki5168 takayuki5168 added the run:build-and-test-differential Mark to enable build-and-test-differential workflow. (used-by-ci) label Sep 23, 2023
@takayuki5168 takayuki5168 marked this pull request as ready for review September 23, 2023 16:21
@takayuki5168
Copy link
Contributor Author

@TakaHoribe Could you check if my understanding is correct.

Signed-off-by: Takayuki Murooka <takayuki5168@gmail.com>
@codecov
Copy link

codecov bot commented Sep 23, 2023

Codecov Report

Patch coverage has no change and project coverage change: -0.01% ⚠️

Comparison is base (9402bb5) 15.77% compared to head (60da572) 15.77%.
Report is 102 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #5092      +/-   ##
==========================================
- Coverage   15.77%   15.77%   -0.01%     
==========================================
  Files        1584     1584              
  Lines      109568   109569       +1     
  Branches    33728    33730       +2     
==========================================
  Hits        17286    17286              
- Misses      73656    73657       +1     
  Partials    18626    18626              
Flag Coverage Δ *Carryforward flag
differential 42.18% <0.00%> (?)
total 15.77% <ø> (-0.01%) ⬇️ Carriedforward from 9402bb5

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

Files Changed Coverage Δ
...nal_controller/src/pid_longitudinal_controller.cpp 39.63% <0.00%> (-0.08%) ⬇️

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

Copy link
Contributor

@TakaHoribe TakaHoribe left a comment

Choose a reason for hiding this comment

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

LGTM.

The autoware control is applied when is_autoware_control_enabled = true and `operation_mode = AUTONOMOUS.

@takayuki5168 takayuki5168 merged commit 617a627 into autowarefoundation:main Sep 25, 2023
@takayuki5168 takayuki5168 deleted the fix/velocity-controller-skip-integral-for-manual branch September 25, 2023 02:07
takayuki5168 added a commit to tier4/autoware.universe that referenced this pull request Sep 25, 2023
… manual driving (autowarefoundation#5092)

* fix(pid_longitudinal_controller): use is_autoware_control_enabled for manual driving

Signed-off-by: Takayuki Murooka <takayuki5168@gmail.com>

* update

Signed-off-by: Takayuki Murooka <takayuki5168@gmail.com>

---------

Signed-off-by: Takayuki Murooka <takayuki5168@gmail.com>
maxime-clem pushed a commit to maxime-clem/autoware.universe that referenced this pull request Oct 2, 2023
… manual driving (autowarefoundation#5092)

* fix(pid_longitudinal_controller): use is_autoware_control_enabled for manual driving

Signed-off-by: Takayuki Murooka <takayuki5168@gmail.com>

* update

Signed-off-by: Takayuki Murooka <takayuki5168@gmail.com>

---------

Signed-off-by: Takayuki Murooka <takayuki5168@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) 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