From 81d61efc16b227ba43c68f23301b25744c35f3e1 Mon Sep 17 00:00:00 2001 From: Satoshi Tanaka <16330533+scepter914@users.noreply.github.com> Date: Sat, 9 Jul 2022 15:02:44 +0900 Subject: [PATCH] Feature/radar fusion launch (#1294) * feat(tier4_perception_launch): add radar launcher (#1263) * feat(tier4_perception_launch): add radar launcher Signed-off-by: scepter914 * ci(pre-commit): autofix Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> * fix reviewed by #1263 * fix format * fix default arg * Revert "fix default arg" This reverts commit 72b2690dc8cbd91fa5b14da091f4027c2c5fa661. Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- ...ra_lidar_fusion_based_detection.launch.xml | 3 +- ...ar_radar_fusion_based_detection.launch.xml | 68 +++++++++++++++++++ .../detection/detection.launch.xml | 57 ++++++++++++++-- .../lidar_based_detection.launch.xml | 3 +- .../lidar_radar_based_detection.launch.xml | 32 +++++++++ .../radar_based_detection.launch.xml | 12 ++++ .../launch/perception.launch.xml | 13 ++-- 7 files changed, 175 insertions(+), 13 deletions(-) create mode 100644 launch/tier4_perception_launch/launch/object_recognition/detection/camera_lidar_radar_fusion_based_detection.launch.xml create mode 100644 launch/tier4_perception_launch/launch/object_recognition/detection/lidar_radar_based_detection.launch.xml create mode 100644 launch/tier4_perception_launch/launch/object_recognition/detection/radar_based_detection.launch.xml diff --git a/launch/tier4_perception_launch/launch/object_recognition/detection/camera_lidar_fusion_based_detection.launch.xml b/launch/tier4_perception_launch/launch/object_recognition/detection/camera_lidar_fusion_based_detection.launch.xml index 46ddadad521cd..81e7b2e097551 100644 --- a/launch/tier4_perception_launch/launch/object_recognition/detection/camera_lidar_fusion_based_detection.launch.xml +++ b/launch/tier4_perception_launch/launch/object_recognition/detection/camera_lidar_fusion_based_detection.launch.xml @@ -2,6 +2,7 @@ + @@ -184,7 +185,7 @@ - + diff --git a/launch/tier4_perception_launch/launch/object_recognition/detection/camera_lidar_radar_fusion_based_detection.launch.xml b/launch/tier4_perception_launch/launch/object_recognition/detection/camera_lidar_radar_fusion_based_detection.launch.xml new file mode 100644 index 0000000000000..95cdaae066674 --- /dev/null +++ b/launch/tier4_perception_launch/launch/object_recognition/detection/camera_lidar_radar_fusion_based_detection.launch.xml @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/launch/tier4_perception_launch/launch/object_recognition/detection/detection.launch.xml b/launch/tier4_perception_launch/launch/object_recognition/detection/detection.launch.xml index 6a975a2874627..19afdf22d9cbd 100644 --- a/launch/tier4_perception_launch/launch/object_recognition/detection/detection.launch.xml +++ b/launch/tier4_perception_launch/launch/object_recognition/detection/detection.launch.xml @@ -1,8 +1,13 @@ + + + - - + + + + @@ -20,7 +25,34 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -47,6 +79,16 @@ + + + + + + + + + + @@ -55,6 +97,11 @@ - - + + + + + + + diff --git a/launch/tier4_perception_launch/launch/object_recognition/detection/lidar_based_detection.launch.xml b/launch/tier4_perception_launch/launch/object_recognition/detection/lidar_based_detection.launch.xml index e65f8162e2d49..d36b9d6265c34 100644 --- a/launch/tier4_perception_launch/launch/object_recognition/detection/lidar_based_detection.launch.xml +++ b/launch/tier4_perception_launch/launch/object_recognition/detection/lidar_based_detection.launch.xml @@ -2,6 +2,7 @@ + @@ -107,7 +108,7 @@ - + diff --git a/launch/tier4_perception_launch/launch/object_recognition/detection/lidar_radar_based_detection.launch.xml b/launch/tier4_perception_launch/launch/object_recognition/detection/lidar_radar_based_detection.launch.xml new file mode 100644 index 0000000000000..8b7e9a3089fa0 --- /dev/null +++ b/launch/tier4_perception_launch/launch/object_recognition/detection/lidar_radar_based_detection.launch.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/launch/tier4_perception_launch/launch/object_recognition/detection/radar_based_detection.launch.xml b/launch/tier4_perception_launch/launch/object_recognition/detection/radar_based_detection.launch.xml new file mode 100644 index 0000000000000..21de187f126e5 --- /dev/null +++ b/launch/tier4_perception_launch/launch/object_recognition/detection/radar_based_detection.launch.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/launch/tier4_perception_launch/launch/perception.launch.xml b/launch/tier4_perception_launch/launch/perception.launch.xml index 51ee075f27d0e..50dd53550f20c 100644 --- a/launch/tier4_perception_launch/launch/perception.launch.xml +++ b/launch/tier4_perception_launch/launch/perception.launch.xml @@ -1,9 +1,10 @@ - - + + + @@ -45,6 +46,7 @@ + @@ -53,7 +55,7 @@ - + @@ -69,8 +71,9 @@ - + + @@ -89,8 +92,6 @@ - -