diff --git a/launch/perception_launch/launch/object_recognition/detection/camera_lidar_fusion_based_detection.launch.xml b/launch/perception_launch/launch/object_recognition/detection/camera_lidar_fusion_based_detection.launch.xml index 5f35a20c09d90..e026e17f621a5 100644 --- a/launch/perception_launch/launch/object_recognition/detection/camera_lidar_fusion_based_detection.launch.xml +++ b/launch/perception_launch/launch/object_recognition/detection/camera_lidar_fusion_based_detection.launch.xml @@ -3,33 +3,25 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + diff --git a/launch/perception_launch/launch/object_recognition/detection/detection.launch.xml b/launch/perception_launch/launch/object_recognition/detection/detection.launch.xml index 1f371d7580b6e..ee5eecd05f643 100644 --- a/launch/perception_launch/launch/object_recognition/detection/detection.launch.xml +++ b/launch/perception_launch/launch/object_recognition/detection/detection.launch.xml @@ -59,6 +59,6 @@ diff --git a/launch/perception_launch/launch/perception.launch.xml b/launch/perception_launch/launch/perception.launch.xml index a692624f30ddb..b259b77f4cefa 100644 --- a/launch/perception_launch/launch/perception.launch.xml +++ b/launch/perception_launch/launch/perception.launch.xml @@ -4,22 +4,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/launch/perception_launch/launch/traffic_light_recognition/traffic_light_node_container.launch.py b/launch/perception_launch/launch/traffic_light_recognition/traffic_light_node_container.launch.py index 5fcc08e634ce6..03179c7797654 100644 --- a/launch/perception_launch/launch/traffic_light_recognition/traffic_light_node_container.launch.py +++ b/launch/perception_launch/launch/traffic_light_recognition/traffic_light_node_container.launch.py @@ -96,9 +96,11 @@ def create_parameter_dict(*args): remappings=[('input/image', LaunchConfiguration('input/image')), ('input/rois', 'rois'), ('input/rough/rois', 'rough/rois'), + ('input/traffic_light_states', 'traffic_light_states'), ('output/image', 'debug/rois'), ('output/image/compressed', 'debug/rois/compressed'), - ('output/image/compressedDepth', 'debug/rois/compressedDepth')] + ('output/image/compressedDepth', 'debug/rois/compressedDepth'), + ('output/image/theora', 'debug/rois/theora')] ) ], output='both', diff --git a/launch/perception_launch/package.xml b/launch/perception_launch/package.xml index 9680249fb58f4..1dd2ab52641e6 100644 --- a/launch/perception_launch/package.xml +++ b/launch/perception_launch/package.xml @@ -10,6 +10,7 @@ ament_cmake_auto + dynamic_object_visualization euclidean_cluster lidar_apollo_instance_segmentation @@ -18,6 +19,16 @@ naive_path_prediction roi_cluster_fusion shape_estimation + tensorrt_yolo + object_range_splitter + object_merger + + + image_transport + traffic_light_map_based_detector + traffic_light_ssd_fine_detector + traffic_light_classifier + traffic_light_visualization ament_lint_auto ament_lint_common