fix: fix to use sample sensor kit (#22)

* Fixed to use sample_sensor_kit Signed-off-by: Shintaro Sakoda <[email protected]> * Removed common_awsim_sensor_launch Signed-off-by: Shintaro Sakoda <[email protected]> * Added a trailing break line Signed-off-by: Shintaro Sakoda <[email protected]> --------- Signed-off-by: Shintaro Sakoda <[email protected]>
tier4 · Nov 1, 2024 · 931930c · 931930c
1 parent c72ae1f
commit 931930c
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 514 deletions.
diff --git a/awsim_sensor_kit_launch/launch/lidar.launch.xml b/awsim_sensor_kit_launch/launch/lidar.launch.xml
@@ -11,7 +11,7 @@
 
     <group>
       <push-ros-namespace namespace="top"/>
-      <include file="$(find-pkg-share common_awsim_sensor_launch)/launch/velodyne_VLP16.launch.xml">
+      <include file="$(find-pkg-share common_sensor_launch)/launch/velodyne_VLP16.launch.xml">
         <arg name="max_range" value="250.0"/>
         <arg name="sensor_frame" value="velodyne_top"/>
         <arg name="sensor_ip" value="127.0.0.1"/>
@@ -26,7 +26,7 @@
 
     <group>
       <push-ros-namespace namespace="left"/>
-      <include file="$(find-pkg-share common_awsim_sensor_launch)/launch/velodyne_VLP16.launch.xml">
+      <include file="$(find-pkg-share common_sensor_launch)/launch/velodyne_VLP16.launch.xml">
         <arg name="max_range" value="5.0"/>
         <arg name="sensor_frame" value="velodyne_left"/>
         <arg name="sensor_ip" value="127.0.0.1"/>
@@ -43,7 +43,7 @@
 
     <group>
       <push-ros-namespace namespace="right"/>
-      <include file="$(find-pkg-share common_awsim_sensor_launch)/launch/velodyne_VLP16.launch.xml">
+      <include file="$(find-pkg-share common_sensor_launch)/launch/velodyne_VLP16.launch.xml">
         <arg name="max_range" value="5.0"/>
         <arg name="sensor_frame" value="velodyne_right"/>
         <arg name="sensor_ip" value="127.0.0.1"/>

diff --git a/awsim_sensor_kit_launch/launch/pointcloud_preprocessor.launch.py b/awsim_sensor_kit_launch/launch/pointcloud_preprocessor.launch.py
@@ -20,35 +20,38 @@
 from launch.conditions import IfCondition
 from launch.conditions import UnlessCondition
 from launch.substitutions import LaunchConfiguration
-from launch_ros.actions import ComposableNodeContainer
 from launch_ros.actions import LoadComposableNodes
 from launch_ros.descriptions import ComposableNode
 
 
 def launch_setup(context, *args, **kwargs):
-
     # set concat filter as a component
     concat_component = ComposableNode(
         package="autoware_pointcloud_preprocessor",
         plugin="autoware::pointcloud_preprocessor::PointCloudConcatenateDataSynchronizerComponent",
         name="concatenate_data",
         remappings=[
-            ("~/input/twist", "/sensing/vehicle_velocity_converter/twist_with_covariance"),
+            (
+                "~/input/twist",
+                "/sensing/vehicle_velocity_converter/twist_with_covariance",
+            ),
             ("output", "concatenated/pointcloud"),
         ],
         parameters=[
             {
                 "input_topics": [
-                    "/sensing/lidar/top/pointcloud",
-                    "/sensing/lidar/left/pointcloud",
-                    "/sensing/lidar/right/pointcloud",
+                    "/sensing/lidar/top/pointcloud_before_sync",
+                    "/sensing/lidar/left/pointcloud_before_sync",
+                    "/sensing/lidar/right/pointcloud_before_sync",
                 ],
                 "output_frame": LaunchConfiguration("base_frame"),
-                "timeout_sec": 0.01,
                 "input_twist_topic_type": "twist",
+                "publish_synchronized_pointcloud": True,
             }
         ],
-        extra_arguments=[{"use_intra_process_comms": LaunchConfiguration("use_intra_process")}],
+        extra_arguments=[
+            {"use_intra_process_comms": LaunchConfiguration("use_intra_process")}
+        ],
     )
 
     # load concat or passthrough filter
@@ -62,11 +65,12 @@ def launch_setup(context, *args, **kwargs):
 
 
 def generate_launch_description():
-
     launch_arguments = []
 
     def add_launch_arg(name: str, default_value=None):
-        launch_arguments.append(DeclareLaunchArgument(name, default_value=default_value))
+        launch_arguments.append(
+            DeclareLaunchArgument(name, default_value=default_value)
+        )
 
     add_launch_arg("base_frame", "base_link")
     add_launch_arg("use_multithread", "False")

diff --git a/common_awsim_sensor_launch/CMakeLists.txt b/common_awsim_sensor_launch/CMakeLists.txt
diff --git a/common_awsim_sensor_launch/config/distortion_corrector_node.param.yaml b/common_awsim_sensor_launch/config/distortion_corrector_node.param.yaml
diff --git a/common_awsim_sensor_launch/config/ring_outlier_filter_node.param.yaml b/common_awsim_sensor_launch/config/ring_outlier_filter_node.param.yaml