Skip to content

Commit 110b9fd

Browse files
committed
chore(radar_crossing_objects_noise_filter): add config file
Signed-off-by: scepter914 <scepter914@gmail.com>
1 parent 57cf88d commit 110b9fd

File tree

5 files changed

+11
-10
lines changed

5 files changed

+11
-10
lines changed

launch/tier4_perception_launch/launch/object_recognition/detection/detection.launch.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,9 @@
7575
<include file="$(find-pkg-share tier4_perception_launch)/launch/object_recognition/detection/detector/radar_detector.launch.xml">
7676
<arg name="input/radar" value="$(var input/radar)"/>
7777
<arg name="output/objects" value="far_objects"/>
78-
<arg name="filter/angle_threshold" value="1.0472"/>
79-
<arg name="filter/velocity_threshold" value="3.0"/>
8078
<arg name="split/velocity_threshold" value="4.5"/>
8179
<arg name="split_range" value="70.0"/>
80+
<arg name="radar_crossing_objects_noise_filter_param_path" value="$(var object_recognition_detection_radar_crossing_objects_noise_filter_param_path)"/>
8281
<arg name="radar_lanelet_filtering_range_param" value="$(var radar_lanelet_filtering_range_param)"/>
8382
<arg name="radar_object_clustering_param_path" value="$(var radar_object_clustering_param_path)"/>
8483
</include>
@@ -236,6 +235,7 @@
236235
<include file="$(find-pkg-share tier4_perception_launch)/launch/object_recognition/detection/detector/radar_detector.launch.xml">
237236
<arg name="input/radar" value="$(var input/radar)"/>
238237
<arg name="output/objects" value="objects"/>
238+
<arg name="radar_crossing_objects_noise_filter_param_path" value="$(var object_recognition_detection_radar_crossing_objects_noise_filter_param_path)"/>
239239
<arg name="radar_lanelet_filtering_range_param" value="$(var radar_lanelet_filtering_range_param)"/>
240240
<arg name="radar_object_clustering_param_path" value="$(var radar_object_clustering_param_path)"/>
241241
</include>

launch/tier4_perception_launch/launch/object_recognition/detection/detector/radar_detector.launch.xml

+2-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22
<launch>
33
<arg name="input/radar" default="/sensing/radar/detected_objects"/>
44
<arg name="output/objects" default="far_objects"/>
5-
<arg name="filter/angle_threshold" default="1.221"/>
6-
<arg name="filter/velocity_threshold" default="1.5"/>
75
<arg name="split/velocity_threshold" default="5.5"/>
86
<arg name="split_range" default="80.0"/>
7+
<arg name="radar_crossing_objects_noise_filter_param_path"/>
98
<arg name="radar_lanelet_filtering_range_param" default="$(find-pkg-share detected_object_validation)/config/object_lanelet_filter.param.yaml"/>
109
<arg name="radar_object_clustering_param_path" default="$(find-pkg-share radar_object_clustering)/config/radar_object_clustering.param.yaml"/>
1110

@@ -14,8 +13,7 @@
1413
<arg name="input/objects" value="$(var input/radar)"/>
1514
<arg name="output/noise_objects" value="noise_objects"/>
1615
<arg name="output/filtered_objects" value="noise_filtered_objects"/>
17-
<arg name="angle_threshold" value="$(var filter/angle_threshold)"/>
18-
<arg name="velocity_threshold" value="$(var filter/velocity_threshold)"/>
16+
<arg name="param_path" value="$(radar_crossing_objects_noise_filter_param_path)"/>
1917
</include>
2018

2119
<include file="$(find-pkg-share object_velocity_splitter)/launch/object_velocity_splitter.launch.xml">

perception/radar_crossing_objects_noise_filter/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,5 @@ endif()
3737
ament_auto_package(
3838
INSTALL_TO_SHARE
3939
launch
40+
config
4041
)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
/**:
2+
ros__parameters:
3+
angle_threshold: 1.2210
4+
velocity_threshold: 1.5

perception/radar_crossing_objects_noise_filter/launch/radar_crossing_objects_noise_filter.launch.xml

+2-4
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,13 @@
55
<arg name="output/noise_objects" default="~/output/noise_objects"/>
66
<arg name="output/filtered_objects" default="~/output/filtered_objects"/>
77
<!-- Parameter -->
8-
<arg name="angle_threshold" default="1.0472"/>
9-
<arg name="velocity_threshold" default="3.0"/>
8+
<arg name="param_path" default="$(find-pkg-share radar_crossing_objects_noise_filter)/config/radar_crossing_objects_noise_filter.param.yaml"/>
109

1110
<!-- Node -->
1211
<node pkg="radar_crossing_objects_noise_filter" exec="radar_crossing_objects_noise_filter_node" name="radar_crossing_objects_noise_filter" output="screen">
1312
<remap from="~/input/objects" to="$(var input/objects)"/>
1413
<remap from="~/output/noise_objects" to="$(var output/noise_objects)"/>
1514
<remap from="~/output/filtered_objects" to="$(var output/filtered_objects)"/>
16-
<param name="angle_threshold" value="$(var angle_threshold)"/>
17-
<param name="velocity_threshold" value="$(var velocity_threshold)"/>
15+
<param from="param_path" value="$(var param_path)"/>
1816
</node>
1917
</launch>

0 commit comments

Comments
 (0)