From 7a9ad30407e8c780ee1b5d2175d79d360a94dfdc Mon Sep 17 00:00:00 2001 From: "tier4-autoware-public-bot[bot]" <98652886+tier4-autoware-public-bot[bot]@users.noreply.github.com> Date: Sun, 17 Apr 2022 10:02:28 +0900 Subject: [PATCH 1/3] chore: sync files (#284) Signed-off-by: GitHub Co-authored-by: kenji-miyake --- .github/workflows/pre-commit.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.github/workflows/pre-commit.yaml b/.github/workflows/pre-commit.yaml index e1b72f706..7fd1cc90f 100644 --- a/.github/workflows/pre-commit.yaml +++ b/.github/workflows/pre-commit.yaml @@ -5,12 +5,28 @@ on: jobs: pre-commit: + if: ${{ github.event.repository.private }} runs-on: ubuntu-latest steps: + - name: Generate token + id: generate-token + uses: tibdex/github-app-token@v1 + with: + app_id: ${{ secrets.APP_ID }} + private_key: ${{ secrets.PRIVATE_KEY }} + - name: Check out repository uses: actions/checkout@v3 + with: + ref: ${{ github.event.pull_request.head.ref }} + + - name: Set git config + uses: autowarefoundation/autoware-github-actions/set-git-config@v1 + with: + token: ${{ steps.generate-token.outputs.token }} - name: Run pre-commit uses: autowarefoundation/autoware-github-actions/pre-commit@v1 with: pre-commit-config: .pre-commit-config.yaml + token: ${{ steps.generate-token.outputs.token }} From 5bfee4cfd8e5c77dbb44a2421e8cd0d0b54e7d01 Mon Sep 17 00:00:00 2001 From: Hiroki OTA Date: Tue, 19 Apr 2022 12:39:42 +0900 Subject: [PATCH 2/3] feat: use same parameter for system_error_monitor (#252) * feat: use same parameter for system_error_monitor * feat: launch when run_mode is psim * feat: launch system_monitor only in online * feat: crete launch.py * ci(pre-commit): autofix * fix: delete print * feat: create dummy.param.yaml * feat: make multi dummy diag publisher.launch.xml for each functions * feat: add include for sensor_kit Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- ...ror_monitor.planning_simulation.param.yaml | 50 ---------- .../dummy_diag_publisher/control.launch.xml | 7 ++ .../localization.launch.xml | 11 +++ .../dummy_diag_publisher/system.launch.xml | 91 +++++++++++++++++++ .../dummy_diag_publisher/vehicle.launch.xml | 7 ++ system_launch/launch/system.launch.xml | 15 ++- 6 files changed, 128 insertions(+), 53 deletions(-) delete mode 100644 system_launch/config/system_error_monitor.planning_simulation.param.yaml create mode 100644 system_launch/launch/dummy_diag_publisher/control.launch.xml create mode 100644 system_launch/launch/dummy_diag_publisher/localization.launch.xml create mode 100644 system_launch/launch/dummy_diag_publisher/system.launch.xml create mode 100644 system_launch/launch/dummy_diag_publisher/vehicle.launch.xml diff --git a/system_launch/config/system_error_monitor.planning_simulation.param.yaml b/system_launch/config/system_error_monitor.planning_simulation.param.yaml deleted file mode 100644 index ce081b75b..000000000 --- a/system_launch/config/system_error_monitor.planning_simulation.param.yaml +++ /dev/null @@ -1,50 +0,0 @@ -# Description: -# name: diag name -# sf_at: diag level where it becomes Safe Fault -# lf_at: diag level where it becomes Latent Fault -# spf_at: diag level where it becomes Single Point Fault -# auto_recovery: Determines whether the system will automatically recover when it recovers from an error. -# -# Note: -# empty-value for sf_at, lf_at and spf_at is "none" -# default values are: -# sf_at: "none" -# lf_at: "warn" -# spf_at: "error" -# auto_recovery: "true" ---- -/**: - ros__parameters: - required_modules: - autonomous_driving: - /autoware/control/autonomous_driving/node_alive_monitoring: default - /autoware/control/autonomous_driving/performance_monitoring/lane_departure: default - /autoware/control/control_command_gate/node_alive_monitoring: default - - /autoware/localization/node_alive_monitoring: default - # /autoware/localization/performance_monitoring/matching_score: { sf_at: "warn", lf_at: "none", spf_at: "none" } - # /autoware/localization/performance_monitoring/localization_accuracy: default - - /autoware/map/node_alive_monitoring: default - - /autoware/perception/node_alive_monitoring: default - - /autoware/planning/node_alive_monitoring: default - /autoware/planning/performance_monitoring/trajectory_validation: default - - /autoware/sensing/node_alive_monitoring: default - - /autoware/system/node_alive_monitoring: default - /autoware/system/emergency_stop_operation: default - # /autoware/system/resource_monitoring: { sf_at: "warn", lf_at: "error", spf_at: "none" } - - /autoware/vehicle/node_alive_monitoring: default - - external_control: - /autoware/control/control_command_gate/node_alive_monitoring: default - /autoware/control/external_control/external_command_selector/node_alive_monitoring: default - - /autoware/system/node_alive_monitoring: default - /autoware/system/emergency_stop_operation: default - - /autoware/vehicle/node_alive_monitoring: default diff --git a/system_launch/launch/dummy_diag_publisher/control.launch.xml b/system_launch/launch/dummy_diag_publisher/control.launch.xml new file mode 100644 index 000000000..b93a93d92 --- /dev/null +++ b/system_launch/launch/dummy_diag_publisher/control.launch.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/system_launch/launch/dummy_diag_publisher/localization.launch.xml b/system_launch/launch/dummy_diag_publisher/localization.launch.xml new file mode 100644 index 000000000..19f70a723 --- /dev/null +++ b/system_launch/launch/dummy_diag_publisher/localization.launch.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/system_launch/launch/dummy_diag_publisher/system.launch.xml b/system_launch/launch/dummy_diag_publisher/system.launch.xml new file mode 100644 index 000000000..164dfe2e1 --- /dev/null +++ b/system_launch/launch/dummy_diag_publisher/system.launch.xml @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/system_launch/launch/dummy_diag_publisher/vehicle.launch.xml b/system_launch/launch/dummy_diag_publisher/vehicle.launch.xml new file mode 100644 index 000000000..3848c9e7e --- /dev/null +++ b/system_launch/launch/dummy_diag_publisher/vehicle.launch.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/system_launch/launch/system.launch.xml b/system_launch/launch/system.launch.xml index f1986499c..88aaca852 100644 --- a/system_launch/launch/system.launch.xml +++ b/system_launch/launch/system.launch.xml @@ -9,7 +9,7 @@ - + @@ -30,8 +30,7 @@ - - + @@ -45,5 +44,15 @@ + + + + + + + + + + From afc2240b8ca8db7b461392fdf95d6d8976f57836 Mon Sep 17 00:00:00 2001 From: h-ohta Date: Tue, 19 Apr 2022 14:13:46 +0900 Subject: [PATCH 3/3] chore: temporary disable --- system_launch/config/system_error_monitor.param.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system_launch/config/system_error_monitor.param.yaml b/system_launch/config/system_error_monitor.param.yaml index 47f926851..78c1e9ad8 100644 --- a/system_launch/config/system_error_monitor.param.yaml +++ b/system_launch/config/system_error_monitor.param.yaml @@ -40,7 +40,7 @@ /autoware/system/debug_data_logger/storage_error: default /autoware/vehicle/node_alive_monitoring: default - /autoware/vehicle/roboteq: { auto_recovery: "false" } + # /autoware/vehicle/roboteq: { auto_recovery: "false" } external_control: /autoware/control/control_command_gate/node_alive_monitoring: default @@ -52,4 +52,4 @@ /autoware/system/debug_data_logger/storage_error: default /autoware/vehicle/node_alive_monitoring: default - /autoware/vehicle/roboteq: default + # /autoware/vehicle/roboteq: default