From d0b42827074464e860794eca57c61b74f306e328 Mon Sep 17 00:00:00 2001 From: Max SCHMELLER Date: Tue, 17 Sep 2024 19:02:09 +0900 Subject: [PATCH] chore(nebula_node_container): confirm ring outlier filter is working with the latest versions: nebula: develop-eval@81afef9ec1cdc1dae9d39e08e916813baab1fd4c transport_drivers: autowarefoundation/transport_drivers.git@8a93ae022604df8132bd65ab8a599532cf4c0a98 ros2_socketcan: /autowarefoundation/ros2_socketcan.git@2bbdba46ce4177e3076892aa99ede557b4f82446 --- .../launch/nebula_node_container.launch.py | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/aip_x2_gen2_launch/launch/nebula_node_container.launch.py b/aip_x2_gen2_launch/launch/nebula_node_container.launch.py index c244fa53..dca86bf6 100644 --- a/aip_x2_gen2_launch/launch/nebula_node_container.launch.py +++ b/aip_x2_gen2_launch/launch/nebula_node_container.launch.py @@ -22,7 +22,7 @@ # from launch.conditions import LaunchConfigurationNotEquals from launch.conditions import IfCondition -from launch.conditions import LaunchConfigurationEquals +from launch.conditions import LaunchConfigurationEquals, LaunchConfigurationNotEquals from launch.conditions import UnlessCondition from launch.substitutions import LaunchConfiguration from launch_ros.actions import ComposableNodeContainer @@ -221,22 +221,22 @@ def str2vector(string): ("~/input/twist", "/sensing/vehicle_velocity_converter/twist_with_covariance"), ("~/input/imu", "/sensing/imu/imu_data"), ("~/input/pointcloud", "mirror_cropped/pointcloud_ex"), - ("~/output/pointcloud", "pointcloud"), + ("~/output/pointcloud", "rectified/pointcloud_ex"), ], parameters=[load_composable_node_param("distortion_corrector_node_param_file")], extra_arguments=[{"use_intra_process_comms": LaunchConfiguration("use_intra_process")}], ) - # ring_outlier_filter_component = ComposableNode( - # package="pointcloud_preprocessor", - # plugin="pointcloud_preprocessor::RingOutlierFilterComponent", - # name="ring_outlier_filter", - # remappings=[ - # ("input", "rectified/pointcloud_ex"), - # ("output", "pointcloud"), - # ], - # extra_arguments=[{"use_intra_process_comms": LaunchConfiguration("use_intra_process")}], - # ) + ring_outlier_filter_component = ComposableNode( + package="pointcloud_preprocessor", + plugin="pointcloud_preprocessor::RingOutlierFilterComponent", + name="ring_outlier_filter", + remappings=[ + ("input", "rectified/pointcloud_ex"), + ("output", "pointcloud"), + ], + extra_arguments=[{"use_intra_process_comms": LaunchConfiguration("use_intra_process")}], + ) dual_return_filter_component = ComposableNode( package="pointcloud_preprocessor", @@ -295,11 +295,11 @@ def str2vector(string): ], ) - # ring_outlier_filter_loader = LoadComposableNodes( - # composable_node_descriptions=[ring_outlier_filter_component], - # target_container=container, - # condition=LaunchConfigurationNotEquals("return_mode", "Dual"), - # ) + ring_outlier_filter_loader = LoadComposableNodes( + composable_node_descriptions=[ring_outlier_filter_component], + target_container=container, + condition=LaunchConfigurationNotEquals("return_mode", "Dual"), + ) dual_return_filter_loader = LoadComposableNodes( composable_node_descriptions=[dual_return_filter_component], @@ -315,7 +315,7 @@ def str2vector(string): return [ container, - # ring_outlier_filter_loader, + ring_outlier_filter_loader, dual_return_filter_loader, blockage_diag_loader, ]