Skip to content

Commit 4e5ef9c

Browse files
committed
enable ogm creation launcher in tier4_perception_launch to call multi_lidar ogm creation
Signed-off-by: yoshiri <yoshiyoshidetteiu@gmail.com>
1 parent 6b4199d commit 4e5ef9c

File tree

3 files changed

+19
-5
lines changed

3 files changed

+19
-5
lines changed

launch/tier4_perception_launch/launch/occupancy_grid_map/probabilistic_occupancy_grid_map.launch.xml

+15-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<arg name="use_multithread" default="false"/>
99
<arg name="use_pointcloud_container" default="false"/>
1010
<arg name="container_name" default="occupancy_grid_map_container"/>
11-
<arg name="occupancy_grid_map_method" description="options: pointcloud_based_occupancy_grid_map, laserscan_based_occupancy_grid_map"/>
11+
<arg name="occupancy_grid_map_method" description="options: pointcloud_based_occupancy_grid_map, laserscan_based_occupancy_grid_map, multi_lidar_pointcloud_based_occupancy_grid_map"/>
1212
<arg name="occupancy_grid_map_param_path"/>
1313
<arg name="occupancy_grid_map_updater" description="options: binary_bayes_filter"/>
1414
<arg name="occupancy_grid_map_updater_param_path"/>
@@ -48,4 +48,18 @@
4848
<arg name="input_obstacle_and_raw_pointcloud" value="$(var input_obstacle_and_raw_pointcloud)"/>
4949
</include>
5050
</group>
51+
52+
<!--multi lidar pointclouds based method-->
53+
<group if="$(eval &quot;'$(var occupancy_grid_map_method)'=='multi_lidar_pointcloud_based_occupancy_grid_map'&quot;)">
54+
<include file="$(find-pkg-share probabilistic_occupancy_grid_map)/launch/multi_lidar_pointcloud_based_occupancy_grid_map.launch.py">
55+
<arg name="output" value="/perception/occupancy_grid_map/map"/>
56+
<arg name="use_intra_process" value="true"/>
57+
<arg name="use_multithread" value="true"/>
58+
<arg name="use_pointcloud_container" value="$(var use_pointcloud_container)"/>
59+
<arg name="container_name" value="$(var pointcloud_container_name)"/>
60+
<arg name="multi_lidar_fusion_config_file" value="$(var occupancy_grid_map_param_path)"/>
61+
<arg name="updater_type" value="$(var occupancy_grid_map_updater)"/>
62+
<arg name="updater_param_file" value="$(var occupancy_grid_map_updater_param_path)"/>
63+
</include>
64+
</group>
5165
</launch>

perception/probabilistic_occupancy_grid_map/config/multi_lidar_pointclouds_based_fusion_config.param.yaml perception/probabilistic_occupancy_grid_map/config/multi_lidar_pointcloud_based_occupancy_grid_map.param.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@
3636
# Setting1: tune ogm creation parameters
3737
obstacle_pointcloud_topic: "/perception/obstacle_segmentation/single_frame/pointcloud_raw"
3838
raw_pointcloud_topics: # put each sensor's pointcloud topic
39-
- "/sensing/lidar/top/outlier_filtered/pointcloud_synchronized"
40-
- "/sensing/lidar/left/outlier_filtered/pointcloud_synchronized"
41-
- "/sensing/lidar/right/outlier_filtered/pointcloud_synchronized"
39+
- "/sensing/lidar/top/pointcloud_synchronized"
40+
- "/sensing/lidar/left/pointcloud_synchronized"
41+
- "/sensing/lidar/right/pointcloud_synchronized"
4242
fusion_input_ogm_topics:
4343
- "/perception/occupancy_grid_map/top_lidar/map"
4444
- "/perception/occupancy_grid_map/left_lidar/map"

perception/probabilistic_occupancy_grid_map/launch/multi_lidar_pointcloud_based_occupancy_grid_map.launch.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ def add_launch_arg(name: str, default_value=None):
195195
add_launch_arg(
196196
"multi_lidar_fusion_config_file",
197197
get_package_share_directory("probabilistic_occupancy_grid_map")
198-
+ "/config/multi_lidar_pointclouds_based_fusion_config.param.yaml",
198+
+ "/config/multi_lidar_pointcloud_based_occupancy_grid_map.param.yaml",
199199
),
200200
add_launch_arg("updater_type", "binary_bayes_filter"),
201201
add_launch_arg(

0 commit comments

Comments
 (0)