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: config for awsim #289

Merged
merged 6 commits into from
Aug 29, 2024
Merged

Conversation

Autumn60
Copy link
Contributor

@Autumn60 Autumn60 commented Aug 28, 2024

このPRには以下の変更が含まれます。

  • lidar.launch.xml に渡すパラメータの修正
    lidar.launch.xml に使われていないパラメータ use_awsim が渡されていたため、その行を削除

  • gnss_poser のパラメータ修正
    gnss_poser パッケージに含まれるデフォルトのコンフィグファイルは gnss_base_framegnss_base_link となっているなど、現状のX1のものと異なっていたためX1用のコンフィグファイルを追加し、それを利用するようにしました

  • GNSS関連の起動条件修正
    従来の「AWSIMでも実機でも起動しない」条件を「AWSIMのときのみ起動する」条件に変更。
    これにより、NavSatFix -> PoseWithCovariance の変換がAWSIM実行時にも動作するため、eagleye利用時と非利用時でAWSIMのバイナリを分ける必要がなくなります。

    • 変更前
      eagleye非利用時: AWSIM -> (PoseWithCovarianceMsg) -> ekf_localizer
      eagleye利用時: AWSIM -> (NavSatFixMsg) -> eagleye
    • 変更後
      eagleye非利用時: AWSIM -> (NavSatFixMsg) -> gnss_poser -> (PoseWithCovarianceMsg) -> ekf_localizer
      eagleye利用時: AWSIM -> (NavSatFixMsg) -> eagleye

備考:
 パラメータの意味としては、 use_awsim パラメータの名前を use_gnss パラメータに変更し、autoware_launch.x1 パッケージ側で[AWSIM使うかどうか → GNSS起動是非の判断]をするべきですが、autoware_launch.x1 側の修正と同時に行う必要があるため、一旦このままにしています。

Signed-off-by: Autumn60 <harada.akiro@gmail.com>
Signed-off-by: Autumn60 <harada.akiro@gmail.com>
Signed-off-by: Autumn60 <harada.akiro@gmail.com>
Signed-off-by: Autumn60 <harada.akiro@gmail.com>
@Autumn60 Autumn60 requested a review from 1222-takeshi August 28, 2024 03:47
Copy link
Contributor

@1222-takeshi 1222-takeshi left a comment

Choose a reason for hiding this comment

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

LGTM

@Autumn60 Autumn60 mentioned this pull request Aug 29, 2024
@Autumn60 Autumn60 merged commit f7cb7f2 into add-XT32-model_sync_main Aug 29, 2024
9 of 11 checks passed
@Autumn60 Autumn60 deleted the feat/x1/awsim_config branch August 29, 2024 01:03
Autumn60 added a commit that referenced this pull request Sep 17, 2024
* delete unnecessary arg passing

Signed-off-by: Autumn60 <harada.akiro@gmail.com>

* fix gnss_poser param

Signed-off-by: Autumn60 <harada.akiro@gmail.com>

* Adjust gnss launching condition

Signed-off-by: Autumn60 <harada.akiro@gmail.com>

* fix invalid tag usage

Signed-off-by: Autumn60 <harada.akiro@gmail.com>

* ci(pre-commit): autofix

---------

Signed-off-by: Autumn60 <harada.akiro@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Autumn60 added a commit that referenced this pull request Sep 17, 2024
* delete unnecessary arg passing

Signed-off-by: Autumn60 <harada.akiro@gmail.com>

* fix gnss_poser param

Signed-off-by: Autumn60 <harada.akiro@gmail.com>

* Adjust gnss launching condition

Signed-off-by: Autumn60 <harada.akiro@gmail.com>

* fix invalid tag usage

Signed-off-by: Autumn60 <harada.akiro@gmail.com>

* ci(pre-commit): autofix

---------

Signed-off-by: Autumn60 <harada.akiro@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Autumn60 added a commit that referenced this pull request Sep 27, 2024
* delete unnecessary arg passing

Signed-off-by: Autumn60 <harada.akiro@gmail.com>

* fix gnss_poser param

Signed-off-by: Autumn60 <harada.akiro@gmail.com>

* Adjust gnss launching condition

Signed-off-by: Autumn60 <harada.akiro@gmail.com>

* fix invalid tag usage

Signed-off-by: Autumn60 <harada.akiro@gmail.com>

* ci(pre-commit): autofix

---------

Signed-off-by: Autumn60 <harada.akiro@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Autumn60 added a commit that referenced this pull request Sep 27, 2024
* delete unnecessary arg passing

Signed-off-by: Autumn60 <harada.akiro@gmail.com>

* fix gnss_poser param

Signed-off-by: Autumn60 <harada.akiro@gmail.com>

* Adjust gnss launching condition

Signed-off-by: Autumn60 <harada.akiro@gmail.com>

* fix invalid tag usage

Signed-off-by: Autumn60 <harada.akiro@gmail.com>

* ci(pre-commit): autofix

---------

Signed-off-by: Autumn60 <harada.akiro@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Autumn60 added a commit that referenced this pull request Oct 8, 2024
* delete unnecessary arg passing

Signed-off-by: Autumn60 <harada.akiro@gmail.com>

* fix gnss_poser param

Signed-off-by: Autumn60 <harada.akiro@gmail.com>

* Adjust gnss launching condition

Signed-off-by: Autumn60 <harada.akiro@gmail.com>

* fix invalid tag usage

Signed-off-by: Autumn60 <harada.akiro@gmail.com>

* ci(pre-commit): autofix

---------

Signed-off-by: Autumn60 <harada.akiro@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Autumn60 added a commit that referenced this pull request Oct 8, 2024
* delete unnecessary arg passing

Signed-off-by: Autumn60 <harada.akiro@gmail.com>

* fix gnss_poser param

Signed-off-by: Autumn60 <harada.akiro@gmail.com>

* Adjust gnss launching condition

Signed-off-by: Autumn60 <harada.akiro@gmail.com>

* fix invalid tag usage

Signed-off-by: Autumn60 <harada.akiro@gmail.com>

* ci(pre-commit): autofix

---------

Signed-off-by: Autumn60 <harada.akiro@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Autumn60 added a commit that referenced this pull request Oct 15, 2024
* feat: update aip_x1 to use XT32

Signed-off-by: 1222-takeshi <m.takeshi1995@gmail.com>

fix(velodyne_node_container): fix param load failure

Signed-off-by: 1222-takeshi <m.takeshi1995@gmail.com>

fix(diagnostic_aggregator): update sensor kit param (#22) (#23)

* fix(diagnostic_aggregator): Modified aggregator confinguration to V1'

* fix path on diagnostic aggregator

fix: add vehicle_velocity_converter.launch (#146)

fix: add vehicle_velocity_converter.launch to aip_x1_1_launch

Signed-off-by: 1222-takeshi <m.takeshi1995@gmail.com>

feat: add use_awsim option and add gnss imu

Signed-off-by: 1222-takeshi <m.takeshi1995@gmail.com>

feat: add GNSS

Signed-off-by: 1222-takeshi <m.takeshi1995@gmail.com>

feat: update for upstream

Signed-off-by: 1222-takeshi <m.takeshi1995@gmail.com>

feat: add use_awsim option

Signed-off-by: 1222-takeshi <m.takeshi1995@gmail.com>

feat: change topic name

Signed-off-by: 1222-takeshi <m.takeshi1995@gmail.com>

feat: add node alive monitoring

Signed-off-by: 1222-takeshi <m.takeshi1995@gmail.com>

feat: add gnss

Signed-off-by: 1222-takeshi <m.takeshi1995@gmail.com>

feat: update ground_segmentation param

Signed-off-by: 1222-takeshi <m.takeshi1995@gmail.com>

feat: remove use_awsim option

Signed-off-by: 1222-takeshi <m.takeshi1995@gmail.com>

feat: add cropbox filter

Signed-off-by: 1222-takeshi <m.takeshi1995@gmail.com>

feat: add diag of gyro_bias_validator

Signed-off-by: 1222-takeshi <m.takeshi1995@gmail.com>

chore: update for upstream

Signed-off-by: 1222-takeshi <m.takeshi1995@gmail.com>

chore: comment out for avoid no diag stale

Signed-off-by: 1222-takeshi <m.takeshi1995@gmail.com>

feat: add gnss.launch for x1_1

Signed-off-by: 1222-takeshi <m.takeshi1995@gmail.com>

feat: use pointcloud_container

Signed-off-by: 1222-takeshi <m.takeshi1995@gmail.com>

fix: change topic name for ground segmentation

Signed-off-by: 1222-takeshi <m.takeshi1995@gmail.com>

feat(aip_x1_launch): rename some topics

Signed-off-by: 1222-takeshi <m.takeshi1995@gmail.com>

feat(aip_x1, aip_x1_1): use interpolate

Signed-off-by: 1222-takeshi <m.takeshi1995@gmail.com>

feat(velodyne_node_container): use distortion_corrector

Signed-off-by: 1222-takeshi <m.takeshi1995@gmail.com>

feat(ground_segmentation): change crop parameter

Signed-off-by: 1222-takeshi <m.takeshi1995@gmail.com>

feat(obstacle_segmentation): relax ground_segmentation threshold

Signed-off-by: 1222-takeshi <m.takeshi1995@gmail.com>

chore(ground_segmentation): change parameter name (#229)

* chore(ground_segmentation): change parameter name

Signed-off-by: 1222-takeshi <m.takeshi1995@gmail.com>

* ci(pre-commit): autofix

---------

Signed-off-by: 1222-takeshi <m.takeshi1995@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

chore(ground_segmentation): add missing parameters (#231)

* chore(ground_segmentation): change parameter name

Signed-off-by: 1222-takeshi <m.takeshi1995@gmail.com>

* ci(pre-commit): autofix

* Add missing params to ground_segmentation.param.yaml

Signed-off-by: Autumn60 <akiro.harada@tier4.jp>

* ci(pre-commit): autofix

* Add missing params to ground_segmentation.param.yaml

Signed-off-by: Autumn60 <akiro.harada@tier4.jp>

* Fix crop_box params in ground_segmentation.param.yaml

Signed-off-by: Autumn60 <akiro.harada@tier4.jp>

* Fix crop_box param in ground_segmentation.param.yaml

Signed-off-by: Autumn60 <akiro.harada@tier4.jp>

* Revert crop_box params

Signed-off-by: Autumn60 <akiro.harada@tier4.jp>

* Add cropbox param calc to ground_segmentation.launch.py

Signed-off-by: Autumn60 <akiro.harada@tier4.jp>

* chore(ground_segmentation): change margin_max_z for cropbox

Signed-off-by: 1222-takeshi <m.takeshi1995@gmail.com>

---------

Signed-off-by: 1222-takeshi <m.takeshi1995@gmail.com>
Signed-off-by: Autumn60 <akiro.harada@tier4.jp>
Co-authored-by: 1222-takeshi <m.takeshi1995@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Autumn60 <akiro.harada@tier4.jp>

feat: use nebula driver for aip_x1_1 sensor configuration (#235)

* feat: use nebula driver for aip_x1_1

Signed-off-by: 1222-takeshi <m.takeshi1995@gmail.com>

* ci(pre-commit): autofix

* chore: remove comment out

Signed-off-by: 1222-takeshi <m.takeshi1995@gmail.com>

* chore: remove unnecessary changes

Signed-off-by: 1222-takeshi <m.takeshi1995@gmail.com>

---------

Signed-off-by: 1222-takeshi <m.takeshi1995@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

chore: remove aip_x1 and rename aip_x1_1 to aip_x1

Signed-off-by: 1222-takeshi <m.takeshi1995@gmail.com>

chore: rename aip_x1_1 to aip_x1

Signed-off-by: 1222-takeshi <m.takeshi1995@gmail.com>

chore: remove unused file and fix bug

Signed-off-by: 1222-takeshi <m.takeshi1995@gmail.com>

ci(pre-commit): autofix

fix: diag list

Signed-off-by: 1222-takeshi <m.takeshi1995@gmail.com>

fix cancat lidar topics

Signed-off-by: 1222-takeshi <m.takeshi1995@gmail.com>

* feat: add input_offset parameter to pointcloud preprocessor launch

Signed-off-by: asa-naki <akihisa.nagata@tier4.jp>

* feat: nebula_hw_monitor is not started except when simulation is running

Signed-off-by: 1222-takeshi <m.takeshi1995@gmail.com>

* chore(blockage_diag): update param for aip_x1_launch (#268)

* add enable_blockage_diag argument to lidar.launch.xml

Signed-off-by: Autumn60 <akiro.harada@tier4.jp>

* ci(pre-commit): autofix

---------

Signed-off-by: Autumn60 <akiro.harada@tier4.jp>
Co-authored-by: Autumn60 <akiro.harada@tier4.jp>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* fix: change container name

Signed-off-by: 1222-takeshi <m.takeshi1995@gmail.com>

* chore: add prefix for rosdep

Signed-off-by: 1222-takeshi <m.takeshi1995@gmail.com>

* fix: config for awsim (#289)

* delete unnecessary arg passing

Signed-off-by: Autumn60 <harada.akiro@gmail.com>

* fix gnss_poser param

Signed-off-by: Autumn60 <harada.akiro@gmail.com>

* Adjust gnss launching condition

Signed-off-by: Autumn60 <harada.akiro@gmail.com>

* fix invalid tag usage

Signed-off-by: Autumn60 <harada.akiro@gmail.com>

* ci(pre-commit): autofix

---------

Signed-off-by: Autumn60 <harada.akiro@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* chore: replace use_awsim to use_gnss (#292)

replace use_awsim to use_gnss

Signed-off-by: Autumn60 <harada.akiro@gmail.com>

---------

Signed-off-by: 1222-takeshi <m.takeshi1995@gmail.com>
Signed-off-by: asa-naki <akihisa.nagata@tier4.jp>
Signed-off-by: Autumn60 <akiro.harada@tier4.jp>
Signed-off-by: Autumn60 <harada.akiro@gmail.com>
Co-authored-by: 1222-takeshi <m.takeshi1995@gmail.com>
Co-authored-by: asa-naki <akihisa.nagata@tier4.jp>
Co-authored-by: Autumn60 <akiro.harada@tier4.jp>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.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