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(static_obstacle_avoidance): force deactivation #8288

Merged

Conversation

go-sakayori
Copy link
Contributor

@go-sakayori go-sakayori commented Jul 31, 2024

Description

Previously the static obstacle avoidance continuously activated even when the shift point was force deactivated by human operation via RTC.
This PR enables force deactivation when yield maneuver could be applied, and after a certain time (this is parameterized) the avoidance would reactivate.

Related links

Please merge this PR first.

How was this PR tested?

Before:
Can't cancel
After:
Duration time 2 second
Duration time 10 second

No degrade in TIER IV internal scenario test

Notes for reviewers

None.

Interface changes

None.

Effects on system behavior

None.

go-sakayori and others added 2 commits July 31, 2024 15:47
Signed-off-by: Go Sakayori <go.sakayori@tier4.jp>
Signed-off-by: Go Sakayori <gsakayori@gmail.com>
@github-actions github-actions bot added the component:planning Route planning, decision-making, and navigation. (auto-assigned) label Jul 31, 2024
Copy link

github-actions bot commented Jul 31, 2024

Thank you for contributing to the Autoware project!

🚧 If your pull request is in progress, switch it to draft mode.

Please ensure:

Signed-off-by: Go Sakayori <go.sakayori@tier4.jp>
Signed-off-by: Go Sakayori <go.sakayori@tier4.jp>
});
};

auto is_force_deactivated = registered_sl_force_deactivated("left", left_shift_array_) ||
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
auto is_force_deactivated = registered_sl_force_deactivated("left", left_shift_array_) ||
const auto is_force_deactivated = registered_sl_force_deactivated("left", left_shift_array_) ||

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed in 22fa38d

@@ -570,6 +570,24 @@ void StaticObstacleAvoidanceModule::fillEgoStatus(
return;
}

auto registered_sl_force_deactivated =
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
auto registered_sl_force_deactivated =
const auto registered_sl_force_deactivated =

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed in 22fa38d

Signed-off-by: Go Sakayori <go.sakayori@tier4.jp>
@go-sakayori go-sakayori added the tag:run-build-and-test-differential Mark to enable build-and-test-differential workflow. (used-by-ci) label Jul 31, 2024
Copy link

codecov bot commented Jul 31, 2024

Codecov Report

Attention: Patch coverage is 46.42857% with 15 lines in your changes missing coverage. Please review.

Project coverage is 29.14%. Comparing base (3d849e9) to head (22fa38d).
Report is 949 commits behind head on main.

Files Patch % Lines
...ath_static_obstacle_avoidance_module/src/scene.cpp 37.50% 12 Missing and 3 partials ⚠️
Additional details and impacted files
@@             Coverage Diff             @@
##             main    #8288       +/-   ##
===========================================
+ Coverage   15.09%   29.14%   +14.04%     
===========================================
  Files        1967     1602      -365     
  Lines      135941   117701    -18240     
  Branches    42122    50662     +8540     
===========================================
+ Hits        20520    34301    +13781     
+ Misses      92700    74220    -18480     
+ Partials    22721     9180    -13541     
Flag Coverage Δ *Carryforward flag
differential 13.68% <46.42%> (?)
total 29.19% <ø> (+14.10%) ⬆️ Carriedforward from 5093495

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

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

@go-sakayori go-sakayori merged commit ab93dab into autowarefoundation:main Jul 31, 2024
37 of 39 checks passed
@go-sakayori go-sakayori deleted the feat/avoidance_force_cancel branch July 31, 2024 10:45
go-sakayori added a commit to tier4/autoware.universe that referenced this pull request Aug 2, 2024
…on#8288)

* add force cancel function

Signed-off-by: Go Sakayori <go.sakayori@tier4.jp>

* fix format

Signed-off-by: Go Sakayori <gsakayori@gmail.com>

* fix json schema

Signed-off-by: Go Sakayori <go.sakayori@tier4.jp>

* fix spelling

Signed-off-by: Go Sakayori <go.sakayori@tier4.jp>

* fix

Signed-off-by: Go Sakayori <go.sakayori@tier4.jp>

---------

Signed-off-by: Go Sakayori <go.sakayori@tier4.jp>
Signed-off-by: Go Sakayori <gsakayori@gmail.com>
kyoichi-sugahara pushed a commit to kyoichi-sugahara/autoware.universe that referenced this pull request Aug 5, 2024
…on#8288)

* add force cancel function

Signed-off-by: Go Sakayori <go.sakayori@tier4.jp>

* fix format

Signed-off-by: Go Sakayori <gsakayori@gmail.com>

* fix json schema

Signed-off-by: Go Sakayori <go.sakayori@tier4.jp>

* fix spelling

Signed-off-by: Go Sakayori <go.sakayori@tier4.jp>

* fix

Signed-off-by: Go Sakayori <go.sakayori@tier4.jp>

---------

Signed-off-by: Go Sakayori <go.sakayori@tier4.jp>
Signed-off-by: Go Sakayori <gsakayori@gmail.com>
batuhanbeytekin pushed a commit to batuhanbeytekin/autoware.universe that referenced this pull request Aug 12, 2024
…on#8288)

* add force cancel function

Signed-off-by: Go Sakayori <go.sakayori@tier4.jp>

* fix format

Signed-off-by: Go Sakayori <gsakayori@gmail.com>

* fix json schema

Signed-off-by: Go Sakayori <go.sakayori@tier4.jp>

* fix spelling

Signed-off-by: Go Sakayori <go.sakayori@tier4.jp>

* fix

Signed-off-by: Go Sakayori <go.sakayori@tier4.jp>

---------

Signed-off-by: Go Sakayori <go.sakayori@tier4.jp>
Signed-off-by: Go Sakayori <gsakayori@gmail.com>
Signed-off-by: Batuhan Beytekin <batuhanbeytekin@gmail.com>
go-sakayori added a commit to tier4/autoware.universe that referenced this pull request Aug 13, 2024
…on#8288)

* add force cancel function

Signed-off-by: Go Sakayori <go.sakayori@tier4.jp>

* fix format

Signed-off-by: Go Sakayori <gsakayori@gmail.com>

* fix json schema

Signed-off-by: Go Sakayori <go.sakayori@tier4.jp>

* fix spelling

Signed-off-by: Go Sakayori <go.sakayori@tier4.jp>

* fix

Signed-off-by: Go Sakayori <go.sakayori@tier4.jp>

---------

Signed-off-by: Go Sakayori <go.sakayori@tier4.jp>
Signed-off-by: Go Sakayori <gsakayori@gmail.com>
esteve pushed a commit to esteve/autoware.universe that referenced this pull request Aug 13, 2024
…on#8288)

* add force cancel function

Signed-off-by: Go Sakayori <go.sakayori@tier4.jp>

* fix format

Signed-off-by: Go Sakayori <gsakayori@gmail.com>

* fix json schema

Signed-off-by: Go Sakayori <go.sakayori@tier4.jp>

* fix spelling

Signed-off-by: Go Sakayori <go.sakayori@tier4.jp>

* fix

Signed-off-by: Go Sakayori <go.sakayori@tier4.jp>

---------

Signed-off-by: Go Sakayori <go.sakayori@tier4.jp>
Signed-off-by: Go Sakayori <gsakayori@gmail.com>
batuhanbeytekin pushed a commit to batuhanbeytekin/autoware.universe that referenced this pull request Aug 14, 2024
…on#8288)

* add force cancel function

Signed-off-by: Go Sakayori <go.sakayori@tier4.jp>

* fix format

Signed-off-by: Go Sakayori <gsakayori@gmail.com>

* fix json schema

Signed-off-by: Go Sakayori <go.sakayori@tier4.jp>

* fix spelling

Signed-off-by: Go Sakayori <go.sakayori@tier4.jp>

* fix

Signed-off-by: Go Sakayori <go.sakayori@tier4.jp>

---------

Signed-off-by: Go Sakayori <go.sakayori@tier4.jp>
Signed-off-by: Go Sakayori <gsakayori@gmail.com>
Signed-off-by: Batuhan Beytekin <batuhanbeytekin@gmail.com>
shmpwk pushed a commit to tier4/autoware.universe that referenced this pull request Aug 20, 2024
…on#8288)

* add force cancel function

Signed-off-by: Go Sakayori <go.sakayori@tier4.jp>

* fix format

Signed-off-by: Go Sakayori <gsakayori@gmail.com>

* fix json schema

Signed-off-by: Go Sakayori <go.sakayori@tier4.jp>

* fix spelling

Signed-off-by: Go Sakayori <go.sakayori@tier4.jp>

* fix

Signed-off-by: Go Sakayori <go.sakayori@tier4.jp>

---------

Signed-off-by: Go Sakayori <go.sakayori@tier4.jp>
Signed-off-by: Go Sakayori <gsakayori@gmail.com>
shmpwk pushed a commit to tier4/autoware.universe that referenced this pull request Aug 20, 2024
…on#8288)

* add force cancel function

Signed-off-by: Go Sakayori <go.sakayori@tier4.jp>

* fix format

Signed-off-by: Go Sakayori <gsakayori@gmail.com>

* fix json schema

Signed-off-by: Go Sakayori <go.sakayori@tier4.jp>

* fix spelling

Signed-off-by: Go Sakayori <go.sakayori@tier4.jp>

* fix

Signed-off-by: Go Sakayori <go.sakayori@tier4.jp>

---------

Signed-off-by: Go Sakayori <go.sakayori@tier4.jp>
Signed-off-by: Go Sakayori <gsakayori@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component:planning Route planning, decision-making, and navigation. (auto-assigned) tag: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