Skip to content

feat: add control command gate etc #1986

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

Merged
merged 24 commits into from
Apr 18, 2025

Conversation

TetsuKawa
Copy link

Description

Adds control command gate, command mode switcher, command mode decider, etc....

Related links

takagiさんベースとの差分はこちら。(hotfixもふくむ)
#1985

How was this PR tested?

vehicle test.
https://tier4.atlassian.net/wiki/spaces/AIP/pages/3607265921/2025-03-21+MRMv0.7+for+4

Notes for reviewers

None.

Interface changes

None.

Effects on system behavior

None.

isamu-takagi and others added 23 commits April 17, 2025 22:16
Signed-off-by: Takagi, Isamu <[email protected]>
Signed-off-by: Takagi, Isamu <[email protected]>
Signed-off-by: Takagi, Isamu <[email protected]>
Signed-off-by: Takagi, Isamu <[email protected]>
Signed-off-by: Takagi, Isamu <[email protected]>
Signed-off-by: Takagi, Isamu <[email protected]>
Signed-off-by: Takagi, Isamu <[email protected]>
* feat: add commnad mode decider redundancy

Signed-off-by: TetsuKawa <[email protected]>

* feat: change msg member

Signed-off-by: TetsuKawa <[email protected]>

* feat: remap topics (#9)

Signed-off-by: TetsuKawa <[email protected]>

* fix

Signed-off-by: TetsuKawa <[email protected]>

* feat: add tmp convert

Signed-off-by: TetsuKawa <[email protected]>

* feat: follow last

Signed-off-by: TetsuKawa <[email protected]>

* feat: change 0.4 to 0.3

Signed-off-by: TetsuKawa <[email protected]>

* feat: pre-commit

Signed-off-by: TetsuKawa <[email protected]>

---------

Signed-off-by: TetsuKawa <[email protected]>
* feat: add in lane stop switcher

Signed-off-by: TetsuKawa <[email protected]>

* feat: change source name

Signed-off-by: TetsuKawa <[email protected]>

* feat: follow chnage of vertual class

Signed-off-by: TetsuKawa <[email protected]>

* feat: implement get_transision_xxx

Signed-off-by: TetsuKawa <[email protected]>

* feat: chnage 0.4 to 0.3

Signed-off-by: TetsuKawa <[email protected]>

* fix

Signed-off-by: TetsuKawa <[email protected]>

* feat: implement (#10)

Signed-off-by: TetsuKawa <[email protected]>

* feat: pre-commit

Signed-off-by: TetsuKawa <[email protected]>

---------

Signed-off-by: TetsuKawa <[email protected]>
* feat: add param path

Signed-off-by: TetsuKawa <[email protected]>

* fix: rebase mistakes

Signed-off-by: TetsuKawa <[email protected]>

---------

Signed-off-by: TetsuKawa <[email protected]>
* feat: implement

Signed-off-by: TetsuKawa <[email protected]>

* fix: transition

Signed-off-by: TetsuKawa <[email protected]>

* feat: to camel case

Signed-off-by: TetsuKawa <[email protected]>

* feat: to camel case

Signed-off-by: TetsuKawa <[email protected]>

* feat: to camel case

Signed-off-by: TetsuKawa <[email protected]>

* feat: remove unnecessary include

Signed-off-by: TetsuKawa <[email protected]>

* feat: pre-commit

Signed-off-by: TetsuKawa <[email protected]>

---------

Signed-off-by: TetsuKawa <[email protected]>
* fix transition filter is not disabled

Signed-off-by: Takagi, Isamu <[email protected]>

* fix transition filter is not disabled part2

Signed-off-by: Takagi, Isamu <[email protected]>

---------

Signed-off-by: Takagi, Isamu <[email protected]>
Co-authored-by: Takagi, Isamu <[email protected]>
fix: fix min jerk

Signed-off-by: TetsuKawa <[email protected]>
#1981)

* feat: remove in lane stop switcher and export plugin base

Signed-off-by: TetsuKawa <[email protected]>

* feat: is_main_ecu default true

Signed-off-by: TetsuKawa <[email protected]>

* style(pre-commit): autofix

---------

Signed-off-by: TetsuKawa <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@TetsuKawa TetsuKawa requested review from mkuri and isamu-takagi April 17, 2025 13:26
Copy link

mergify bot commented Apr 17, 2025

⚠️ The sha of the head commit of this PR conflicts with #1985. Mergify cannot evaluate rules on this PR. ⚠️

@mkuri
Copy link

mkuri commented Apr 18, 2025

control_cmd_gate周りのため、こちらは髙木さんにレビューおまかせします。

Copy link

@TetsuKawa TetsuKawa merged commit cdb67f6 into beta/v0.41 Apr 18, 2025
42 of 52 checks passed
@zhiwango
Copy link

zhiwango commented May 9, 2025

TetsuKawa added a commit that referenced this pull request May 26, 2025
TetsuKawa added a commit that referenced this pull request May 27, 2025
* Revert "feat: add control command gate etc (#1986)"

This reverts commit cdb67f6.

* feat(control_command_gate): create package

Signed-off-by: Takagi, Isamu <[email protected]>

* feat(command_mode_switcher): create package

Signed-off-by: Takagi, Isamu <[email protected]>

* feat(command_mode_decider): create package

Signed-off-by: Takagi, Isamu <[email protected]>

* feat(stop_mode_publisher): create package

Signed-off-by: Takagi, Isamu <[email protected]>

* feat(launch): add option for control command gate

Signed-off-by: Takagi, Isamu <[email protected]>

* fix filter

Signed-off-by: Takagi, Isamu <[email protected]>

* publish command

Signed-off-by: Takagi, Isamu <[email protected]>

* fix typo

Signed-off-by: Takagi, Isamu <[email protected]>

* update readme

Signed-off-by: Takagi, Isamu <[email protected]>

* update readme

Signed-off-by: Takagi, Isamu <[email protected]>

* update readme

Signed-off-by: Takagi, Isamu <[email protected]>

* rename package

Signed-off-by: Takagi, Isamu <[email protected]>

* rename package

Signed-off-by: Takagi, Isamu <[email protected]>

* fix timeout check

Signed-off-by: Takagi, Isamu <[email protected]>

* readme (wip: japanese)

Signed-off-by: Takagi, Isamu <[email protected]>

* readme (wip: japanese)

Signed-off-by: Takagi, Isamu <[email protected]>

* WIP

Signed-off-by: Takagi, Isamu <[email protected]>

* WIP: state transition

Signed-off-by: Takagi, Isamu <[email protected]>

* sync source mode

Signed-off-by: Takagi, Isamu <[email protected]>

* add notification

Signed-off-by: Takagi, Isamu <[email protected]>

* add disable

Signed-off-by: Takagi, Isamu <[email protected]>

* split request function

Signed-off-by: Takagi, Isamu <[email protected]>

* rename transition

Signed-off-by: Takagi, Isamu <[email protected]>

* fix foreground transition

Signed-off-by: Takagi, Isamu <[email protected]>

* add handover and neutral

Signed-off-by: Takagi, Isamu <[email protected]>

* subscribe availability

Signed-off-by: Takagi, Isamu <[email protected]>

* WIP: decider

Signed-off-by: Takagi, Isamu <[email protected]>

* split files

Signed-off-by: Takagi, Isamu <[email protected]>

* fix transition

Signed-off-by: Takagi, Isamu <[email protected]>

* check psim

Signed-off-by: Takagi, Isamu <[email protected]>

* add required interface

Signed-off-by: Takagi, Isamu <[email protected]>

* modify decider local interface

Signed-off-by: Takagi, Isamu <[email protected]>

* support autoware control (check psim)

Signed-off-by: Takagi, Isamu <[email protected]>

* WIP

Signed-off-by: Takagi, Isamu <[email protected]>

* add command mode mappings

Signed-off-by: Takagi, Isamu <[email protected]>

* fix output state from decider

Signed-off-by: Takagi, Isamu <[email protected]>

* fix copyright year

Signed-off-by: Takagi, Isamu <[email protected]>

* add flag node

Signed-off-by: Takagi, Isamu <[email protected]>

* launch flag node

Signed-off-by: Takagi, Isamu <[email protected]>

* add debug info

Signed-off-by: Takagi, Isamu <[email protected]>

* add switcher init function

Signed-off-by: Takagi, Isamu <[email protected]>

* fix transition condition

Signed-off-by: Takagi, Isamu <[email protected]>

* feat(autoware_default_adapi): release adapi v1.8.0

Signed-off-by: Takagi, Isamu <[email protected]>

* update request check

Signed-off-by: Takagi, Isamu <[email protected]>

* refactor switcher

Signed-off-by: Takagi, Isamu <[email protected]>

* handle transition

Signed-off-by: Takagi, Isamu <[email protected]>

* WIP: refactor

Signed-off-by: Takagi, Isamu <[email protected]>

* WIP: refactor

Signed-off-by: Takagi, Isamu <[email protected]>

* WIP: refactor

Signed-off-by: Takagi, Isamu <[email protected]>

* remove initial source

Signed-off-by: Takagi, Isamu <[email protected]>

* remove unrelated change

Signed-off-by: Takagi, Isamu <[email protected]>

* WIP

Signed-off-by: Takagi, Isamu <[email protected]>

* WIP: basic transition

Signed-off-by: Takagi, Isamu <[email protected]>

* WIP: add type package

Signed-off-by: Takagi, Isamu <[email protected]>

* WIP: add tri state

Signed-off-by: Takagi, Isamu <[email protected]>

* refactor switcher

Signed-off-by: Takagi, Isamu <[email protected]>

* WIP: message adapter

Signed-off-by: Takagi, Isamu <[email protected]>

* add current phase

Signed-off-by: Takagi, Isamu <[email protected]>

* WIP: split state

Signed-off-by: Takagi, Isamu <[email protected]>

* WIP: use adapter pub

Signed-off-by: Takagi, Isamu <[email protected]>

* WIP: fix state tree

Signed-off-by: Takagi, Isamu <[email protected]>

* WIP: fix decider current mode

Signed-off-by: Takagi, Isamu <[email protected]>

* update decider

Signed-off-by: Takagi, Isamu <[email protected]>

* fix transition filter

Signed-off-by: Takagi, Isamu <[email protected]>

* switcher override

Signed-off-by: Takagi, Isamu <[email protected]>

* decider override

Signed-off-by: Takagi, Isamu <[email protected]>

* fix transition filter is not disabled

Signed-off-by: Takagi, Isamu <[email protected]>

* fix transition filter is not disabled part2

Signed-off-by: Takagi, Isamu <[email protected]>

* fix log level

Signed-off-by: Takagi, Isamu <[email protected]>

* add rollback operation mode

Signed-off-by: Takagi, Isamu <[email protected]>

* decider timeout

Signed-off-by: Takagi, Isamu <[email protected]>

* limit vehicle gate request to once

Signed-off-by: Takagi, Isamu <[email protected]>

* fix hazard lights on in stop mode

Signed-off-by: Takagi, Isamu <[email protected]>

* apply transition manager refactoring

Signed-off-by: Takagi, Isamu <[email protected]>

* change command source type

Signed-off-by: Takagi, Isamu <[email protected]>

* support command source naming

Signed-off-by: Takagi, Isamu <[email protected]>

* update swicher mode

Signed-off-by: Takagi, Isamu <[email protected]>

* update decider mode

Signed-off-by: Takagi, Isamu <[email protected]>

* split switcher plugins

Signed-off-by: Takagi, Isamu <[email protected]>

* split decider plugins

Signed-off-by: Takagi, Isamu <[email protected]>

* move mode convertion

Signed-off-by: Takagi, Isamu <[email protected]>

* feat: enable to set plugin param

Signed-off-by: TetsuKawa <[email protected]>

* fix: remove plugin_name from Command struct

Signed-off-by: TetsuKawa <[email protected]>

* pre-commit

Signed-off-by: Takagi, Isamu <[email protected]>

* fix parameters

Signed-off-by: Takagi, Isamu <[email protected]>

* add decider diagnostics

Signed-off-by: Takagi, Isamu <[email protected]>

* decide multiple switcher commands

Signed-off-by: Takagi, Isamu <[email protected]>

* WIP

Signed-off-by: Takagi, Isamu <[email protected]>

* add remap args

Signed-off-by: Takagi, Isamu <[email protected]>

* WIP

Signed-off-by: Takagi, Isamu <[email protected]>

* WIP: switcher transition

Signed-off-by: Takagi, Isamu <[email protected]>

* WIP: decider update

Signed-off-by: Takagi, Isamu <[email protected]>

* fix

Signed-off-by: Takagi, Isamu <[email protected]>

* unify manual mode

Signed-off-by: Takagi, Isamu <[email protected]>

* request manual mode

Signed-off-by: Takagi, Isamu <[email protected]>

* request autoware control

Signed-off-by: Takagi, Isamu <[email protected]>

* remove unused message

Signed-off-by: Takagi, Isamu <[email protected]>

* WIP

Signed-off-by: Takagi, Isamu <[email protected]>

* remove unused types

Signed-off-by: Takagi, Isamu <[email protected]>

* remove unused functions

Signed-off-by: Takagi, Isamu <[email protected]>

* fix ready

Signed-off-by: Takagi, Isamu <[email protected]>

* move flags

Signed-off-by: Takagi, Isamu <[email protected]>

* testing

Signed-off-by: Takagi, Isamu <[email protected]>

* remove debug code

Signed-off-by: Takagi, Isamu <[email protected]>

* fix init condition

Signed-off-by: Takagi, Isamu <[email protected]>

---------

Signed-off-by: Takagi, Isamu <[email protected]>
Signed-off-by: TetsuKawa <[email protected]>
Co-authored-by: Takagi, Isamu <[email protected]>
TetsuKawa added a commit that referenced this pull request May 27, 2025
* Revert "feat: add control command gate etc (#1986)"

This reverts commit cdb67f6.

* feat(control_command_gate): create package

Signed-off-by: Takagi, Isamu <[email protected]>

* feat(command_mode_switcher): create package

Signed-off-by: Takagi, Isamu <[email protected]>

* feat(command_mode_decider): create package

Signed-off-by: Takagi, Isamu <[email protected]>

* feat(stop_mode_publisher): create package

Signed-off-by: Takagi, Isamu <[email protected]>

* feat(launch): add option for control command gate

Signed-off-by: Takagi, Isamu <[email protected]>

* fix filter

Signed-off-by: Takagi, Isamu <[email protected]>

* publish command

Signed-off-by: Takagi, Isamu <[email protected]>

* fix typo

Signed-off-by: Takagi, Isamu <[email protected]>

* update readme

Signed-off-by: Takagi, Isamu <[email protected]>

* update readme

Signed-off-by: Takagi, Isamu <[email protected]>

* update readme

Signed-off-by: Takagi, Isamu <[email protected]>

* rename package

Signed-off-by: Takagi, Isamu <[email protected]>

* rename package

Signed-off-by: Takagi, Isamu <[email protected]>

* fix timeout check

Signed-off-by: Takagi, Isamu <[email protected]>

* readme (wip: japanese)

Signed-off-by: Takagi, Isamu <[email protected]>

* readme (wip: japanese)

Signed-off-by: Takagi, Isamu <[email protected]>

* WIP

Signed-off-by: Takagi, Isamu <[email protected]>

* WIP: state transition

Signed-off-by: Takagi, Isamu <[email protected]>

* sync source mode

Signed-off-by: Takagi, Isamu <[email protected]>

* add notification

Signed-off-by: Takagi, Isamu <[email protected]>

* add disable

Signed-off-by: Takagi, Isamu <[email protected]>

* split request function

Signed-off-by: Takagi, Isamu <[email protected]>

* rename transition

Signed-off-by: Takagi, Isamu <[email protected]>

* fix foreground transition

Signed-off-by: Takagi, Isamu <[email protected]>

* add handover and neutral

Signed-off-by: Takagi, Isamu <[email protected]>

* subscribe availability

Signed-off-by: Takagi, Isamu <[email protected]>

* WIP: decider

Signed-off-by: Takagi, Isamu <[email protected]>

* split files

Signed-off-by: Takagi, Isamu <[email protected]>

* fix transition

Signed-off-by: Takagi, Isamu <[email protected]>

* check psim

Signed-off-by: Takagi, Isamu <[email protected]>

* add required interface

Signed-off-by: Takagi, Isamu <[email protected]>

* modify decider local interface

Signed-off-by: Takagi, Isamu <[email protected]>

* support autoware control (check psim)

Signed-off-by: Takagi, Isamu <[email protected]>

* WIP

Signed-off-by: Takagi, Isamu <[email protected]>

* add command mode mappings

Signed-off-by: Takagi, Isamu <[email protected]>

* fix output state from decider

Signed-off-by: Takagi, Isamu <[email protected]>

* fix copyright year

Signed-off-by: Takagi, Isamu <[email protected]>

* add flag node

Signed-off-by: Takagi, Isamu <[email protected]>

* launch flag node

Signed-off-by: Takagi, Isamu <[email protected]>

* add debug info

Signed-off-by: Takagi, Isamu <[email protected]>

* add switcher init function

Signed-off-by: Takagi, Isamu <[email protected]>

* fix transition condition

Signed-off-by: Takagi, Isamu <[email protected]>

* feat(autoware_default_adapi): release adapi v1.8.0

Signed-off-by: Takagi, Isamu <[email protected]>

* update request check

Signed-off-by: Takagi, Isamu <[email protected]>

* refactor switcher

Signed-off-by: Takagi, Isamu <[email protected]>

* handle transition

Signed-off-by: Takagi, Isamu <[email protected]>

* WIP: refactor

Signed-off-by: Takagi, Isamu <[email protected]>

* WIP: refactor

Signed-off-by: Takagi, Isamu <[email protected]>

* WIP: refactor

Signed-off-by: Takagi, Isamu <[email protected]>

* remove initial source

Signed-off-by: Takagi, Isamu <[email protected]>

* remove unrelated change

Signed-off-by: Takagi, Isamu <[email protected]>

* WIP

Signed-off-by: Takagi, Isamu <[email protected]>

* WIP: basic transition

Signed-off-by: Takagi, Isamu <[email protected]>

* WIP: add type package

Signed-off-by: Takagi, Isamu <[email protected]>

* WIP: add tri state

Signed-off-by: Takagi, Isamu <[email protected]>

* refactor switcher

Signed-off-by: Takagi, Isamu <[email protected]>

* WIP: message adapter

Signed-off-by: Takagi, Isamu <[email protected]>

* add current phase

Signed-off-by: Takagi, Isamu <[email protected]>

* WIP: split state

Signed-off-by: Takagi, Isamu <[email protected]>

* WIP: use adapter pub

Signed-off-by: Takagi, Isamu <[email protected]>

* WIP: fix state tree

Signed-off-by: Takagi, Isamu <[email protected]>

* WIP: fix decider current mode

Signed-off-by: Takagi, Isamu <[email protected]>

* update decider

Signed-off-by: Takagi, Isamu <[email protected]>

* fix transition filter

Signed-off-by: Takagi, Isamu <[email protected]>

* switcher override

Signed-off-by: Takagi, Isamu <[email protected]>

* decider override

Signed-off-by: Takagi, Isamu <[email protected]>

* fix transition filter is not disabled

Signed-off-by: Takagi, Isamu <[email protected]>

* fix transition filter is not disabled part2

Signed-off-by: Takagi, Isamu <[email protected]>

* fix log level

Signed-off-by: Takagi, Isamu <[email protected]>

* add rollback operation mode

Signed-off-by: Takagi, Isamu <[email protected]>

* decider timeout

Signed-off-by: Takagi, Isamu <[email protected]>

* limit vehicle gate request to once

Signed-off-by: Takagi, Isamu <[email protected]>

* fix hazard lights on in stop mode

Signed-off-by: Takagi, Isamu <[email protected]>

* apply transition manager refactoring

Signed-off-by: Takagi, Isamu <[email protected]>

* change command source type

Signed-off-by: Takagi, Isamu <[email protected]>

* support command source naming

Signed-off-by: Takagi, Isamu <[email protected]>

* update swicher mode

Signed-off-by: Takagi, Isamu <[email protected]>

* update decider mode

Signed-off-by: Takagi, Isamu <[email protected]>

* split switcher plugins

Signed-off-by: Takagi, Isamu <[email protected]>

* split decider plugins

Signed-off-by: Takagi, Isamu <[email protected]>

* move mode convertion

Signed-off-by: Takagi, Isamu <[email protected]>

* feat: enable to set plugin param

Signed-off-by: TetsuKawa <[email protected]>

* fix: remove plugin_name from Command struct

Signed-off-by: TetsuKawa <[email protected]>

* pre-commit

Signed-off-by: Takagi, Isamu <[email protected]>

* fix parameters

Signed-off-by: Takagi, Isamu <[email protected]>

* add decider diagnostics

Signed-off-by: Takagi, Isamu <[email protected]>

* decide multiple switcher commands

Signed-off-by: Takagi, Isamu <[email protected]>

* WIP

Signed-off-by: Takagi, Isamu <[email protected]>

* add remap args

Signed-off-by: Takagi, Isamu <[email protected]>

* WIP

Signed-off-by: Takagi, Isamu <[email protected]>

* WIP: switcher transition

Signed-off-by: Takagi, Isamu <[email protected]>

* WIP: decider update

Signed-off-by: Takagi, Isamu <[email protected]>

* fix

Signed-off-by: Takagi, Isamu <[email protected]>

* unify manual mode

Signed-off-by: Takagi, Isamu <[email protected]>

* request manual mode

Signed-off-by: Takagi, Isamu <[email protected]>

* request autoware control

Signed-off-by: Takagi, Isamu <[email protected]>

* remove unused message

Signed-off-by: Takagi, Isamu <[email protected]>

* WIP

Signed-off-by: Takagi, Isamu <[email protected]>

* remove unused types

Signed-off-by: Takagi, Isamu <[email protected]>

* remove unused functions

Signed-off-by: Takagi, Isamu <[email protected]>

* fix ready

Signed-off-by: Takagi, Isamu <[email protected]>

* move flags

Signed-off-by: Takagi, Isamu <[email protected]>

* testing

Signed-off-by: Takagi, Isamu <[email protected]>

* remove debug code

Signed-off-by: Takagi, Isamu <[email protected]>

* fix init condition

Signed-off-by: Takagi, Isamu <[email protected]>

* feat: implement

Signed-off-by: TetsuKawa <[email protected]>

---------

Signed-off-by: Takagi, Isamu <[email protected]>
Signed-off-by: TetsuKawa <[email protected]>
Co-authored-by: Takagi, Isamu <[email protected]>
TetsuKawa added a commit that referenced this pull request May 29, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants