diff --git a/aip_xx1_launch/launch/lidar.launch.xml b/aip_xx1_launch/launch/lidar.launch.xml index f39e90c9..efd97805 100644 --- a/aip_xx1_launch/launch/lidar.launch.xml +++ b/aip_xx1_launch/launch/lidar.launch.xml @@ -7,7 +7,7 @@ - + @@ -30,7 +30,7 @@ - + @@ -54,7 +54,7 @@ - + @@ -78,7 +78,7 @@ - + @@ -102,7 +102,7 @@ - + diff --git a/common_sensor_launch/config/blockage_diagnostics_param_file.yaml b/common_sensor_launch/config/blockage_diagnostics_param_file.yaml index e8409a50..b8b62b50 100644 --- a/common_sensor_launch/config/blockage_diagnostics_param_file.yaml +++ b/common_sensor_launch/config/blockage_diagnostics_param_file.yaml @@ -9,5 +9,3 @@ dust_kernel_size: 2 dust_buffering_frames: 10 dust_buffering_interval: 1 - distance_coefficient: 327.67 - horizontal_resolution: 0.4 diff --git a/common_sensor_launch/launch/nebula_node_container.launch.py b/common_sensor_launch/launch/nebula_node_container.launch.py index c4c2dc50..8d31fbde 100644 --- a/common_sensor_launch/launch/nebula_node_container.launch.py +++ b/common_sensor_launch/launch/nebula_node_container.launch.py @@ -55,12 +55,11 @@ def get_vehicle_info(context): return p - def launch_setup(context, *args, **kwargs): def load_composable_node_param(param_path): with open(LaunchConfiguration(param_path).perform(context), "r") as f: return yaml.safe_load(f)["/**"]["ros__parameters"] - + def create_parameter_dict(*args): result = {} for x in args: @@ -273,10 +272,10 @@ def create_parameter_dict(*args): blockage_diag_loader = LoadComposableNodes( composable_node_descriptions=[blockage_diag_component], target_container=target_container, - condition=IfCondition(LaunchConfiguration("launch_blockage_diag")), + condition=IfCondition(LaunchConfiguration("enable_blockage_diag")), ) - return [container, component_loader, driver_component_loader,blockage_diag_loader] + return [container, component_loader, driver_component_loader, blockage_diag_loader] def generate_launch_description(): @@ -315,11 +314,13 @@ def add_launch_arg(name: str, default_value=None, description=None): add_launch_arg("use_intra_process", "False", "use ROS 2 component container communication") add_launch_arg("use_pointcloud_container", "false") add_launch_arg("container_name", "nebula_node_container") - + + add_launch_arg("enable_blockage_diag", "true") add_launch_arg("angle_range", "[0.0, 360]") add_launch_arg("horizontal_ring_id", "64") add_launch_arg("vertical_bins", "128") add_launch_arg("is_channel_order_top2down", "true") + add_launch_arg("horizontal_resolution", "0.4") add_launch_arg( "blockage_diagnostics_param_file", [FindPackageShare("common_sensor_launch"), "/config/blockage_diagnostics_param_file.yaml"],