Merge branch 'tier4/universe' into feat/point_type_migration

tier4 · Jul 8, 2024 · 0e03728 · 0e03728
2 parents becd9ab + 40322e3
commit 0e03728
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/...nfig/blockage_diagnostics_param_file.yaml → ...ch/config/blockage_diagnostics.param.yaml b/...nfig/blockage_diagnostics_param_file.yaml → ...ch/config/blockage_diagnostics.param.yaml
diff --git a/common_sensor_launch/config/distortion_corrector_node.param.yaml b/common_sensor_launch/config/distortion_corrector_node.param.yaml
@@ -0,0 +1,5 @@
+/**:
+  ros__parameters:
+    base_frame: base_link
+    use_imu: true
+    use_3d_distortion_correction: false
diff --git a/common_sensor_launch/launch/nebula_node_container.launch.py b/common_sensor_launch/launch/nebula_node_container.launch.py
@@ -216,6 +216,7 @@ def create_parameter_dict(*args):
                 ("~/input/pointcloud", "mirror_cropped/pointcloud_ex"),
                 ("~/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")}],
         )
     )
@@ -375,7 +376,11 @@ def add_launch_arg(name: str, default_value=None, description=None):
     add_launch_arg("horizontal_resolution", "0.4")
     add_launch_arg(
         "blockage_diagnostics_param_file",
-        [FindPackageShare("common_sensor_launch"), "/config/blockage_diagnostics_param_file.yaml"],
+        [FindPackageShare("common_sensor_launch"), "/config/blockage_diagnostics.param.yaml"],
+    )
+    add_launch_arg(
+        "distortion_corrector_node_param_file",
+        [FindPackageShare("common_sensor_launch"), "/config/distortion_corrector_node.param.yaml"],
     )
 
     set_container_executable = SetLaunchConfiguration(