From fb35f6216ae57ec72ff30f173198d2d70ba99f31 Mon Sep 17 00:00:00 2001 From: Yoshi Ri Date: Tue, 17 Oct 2023 00:13:17 +0900 Subject: [PATCH] feat(tier4_perception_launch): add radar far object integration in tracking stage (#5269) * update tracking/perception launch Signed-off-by: yoshiri * switch tracker launcher mode with argument Signed-off-by: yoshiri * update prediction to switch by radar_long_range_integration paramter Signed-off-by: yoshiri * make radar far object integration switchable between detection/tracking Signed-off-by: yoshiri * fix camera lidar radar fusion flow when 'tracking' is used. Signed-off-by: yoshiri * fix spelling and appearance Signed-off-by: yoshiri * reconstruct topic flow when use tracking to merge far object detection and near object detection Signed-off-by: yoshiri * fix input topic miss in tracking.launch Signed-off-by: yoshiri * fix comment in camera_lidar_radar fusion Signed-off-by: yoshiri * refactor: rename and remove paramters in prediction.launch Signed-off-by: yoshiri * refactor: rename merger control variable from string to bool Signed-off-by: yoshiri --------- Signed-off-by: yoshiri --- ...ar_radar_fusion_based_detection.launch.xml | 31 ++++++----- .../prediction/prediction.launch.xml | 3 +- .../tracking/tracking.launch.xml | 53 ++++++++++++++----- .../launch/perception.launch.xml | 15 ++++++ 4 files changed, 75 insertions(+), 27 deletions(-) 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 index fbe5f21c041b6..7d0988635fb10 100644 --- 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 @@ -51,6 +51,10 @@ + + + + - - - - - - - - - + + + + + + + + + + + + diff --git a/launch/tier4_perception_launch/launch/object_recognition/prediction/prediction.launch.xml b/launch/tier4_perception_launch/launch/object_recognition/prediction/prediction.launch.xml index 711e6374f5786..fa343f49840ad 100644 --- a/launch/tier4_perception_launch/launch/object_recognition/prediction/prediction.launch.xml +++ b/launch/tier4_perception_launch/launch/object_recognition/prediction/prediction.launch.xml @@ -1,12 +1,13 @@ - + + diff --git a/launch/tier4_perception_launch/launch/object_recognition/tracking/tracking.launch.xml b/launch/tier4_perception_launch/launch/object_recognition/tracking/tracking.launch.xml index 77de1e5995ee0..07b53fb671732 100644 --- a/launch/tier4_perception_launch/launch/object_recognition/tracking/tracking.launch.xml +++ b/launch/tier4_perception_launch/launch/object_recognition/tracking/tracking.launch.xml @@ -3,29 +3,54 @@ + + + + + + + + - + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/launch/tier4_perception_launch/launch/perception.launch.xml b/launch/tier4_perception_launch/launch/perception.launch.xml index bbb7ebb2d8d25..63ea0cc7f0f3d 100644 --- a/launch/tier4_perception_launch/launch/perception.launch.xml +++ b/launch/tier4_perception_launch/launch/perception.launch.xml @@ -96,6 +96,13 @@ + + + @@ -181,6 +188,14 @@ + + + + +