Skip to content

Commit 4a77f3d

Browse files
chore(traffic_light_multi_camera_fusion): read parameters from yaml file (#10144)
* chore(traffic_light_multi_camera_fusion): read parameters from yaml file Signed-off-by: Tomohito Ando <tomohito.ando@tier4.jp> * style(pre-commit): autofix * add all_traffic_light_camera param to launch.xml Signed-off-by: Tomohito Ando <tomohito.ando@tier4.jp> * fix json schema Signed-off-by: Tomohito Ando <tomohito.ando@tier4.jp> * remove camera namespace parameter from config file Signed-off-by: Tomohito Ando <tomohito.ando@tier4.jp> * revert unnecessary change Signed-off-by: Tomohito Ando <tomohito.ando@tier4.jp> * remove camera_namespaces from required Signed-off-by: Tomohito Ando <tomohito.ando@tier4.jp> --------- Signed-off-by: Tomohito Ando <tomohito.ando@tier4.jp> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
1 parent c9aa409 commit 4a77f3d

File tree

5 files changed

+11
-17
lines changed

5 files changed

+11
-17
lines changed

launch/tier4_perception_launch/launch/perception.launch.xml

+2
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
<arg name="occupancy_grid_map_updater"/>
3636
<arg name="occupancy_grid_map_updater_param_path"/>
3737
<arg name="traffic_light_arbiter_param_path"/>
38+
<arg name="traffic_light_multi_camera_fusion_param_path"/>
3839
<arg name="lidar_detection_model"/>
3940

4041
<!-- ML model parameters -->
@@ -310,6 +311,7 @@
310311
<arg name="fusion_only" value="$(var traffic_light_recognition/fusion_only)"/>
311312
<arg name="all_camera_namespaces" value="$(var all_traffic_light_camera)"/>
312313
<arg name="traffic_light_arbiter_param_path" value="$(var traffic_light_arbiter_param_path)"/>
314+
<arg name="traffic_light_multi_camera_fusion_param_path" value="$(var traffic_light_multi_camera_fusion_param_path)"/>
313315
<arg name="traffic_light_fine_detector_model_path" value="$(var traffic_light_fine_detector_model_path)"/>
314316
<arg name="traffic_light_fine_detector_model_name" value="$(var traffic_light_fine_detector_model_name)"/>
315317
<arg name="traffic_light_classifier_model_path" value="$(var traffic_light_classifier_model_path)"/>

launch/tier4_perception_launch/launch/traffic_light_recognition/traffic_light.launch.xml

+6-7
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,12 @@
5656

5757
<!-- traffic_light_multi_camera_fusion -->
5858
<group>
59-
<node pkg="autoware_traffic_light_multi_camera_fusion" exec="traffic_light_multi_camera_fusion_node" name="traffic_light_multi_camera_fusion" output="screen">
60-
<param name="camera_namespaces" value="$(var all_camera_namespaces)"/>
61-
<param name="message_lifespan" value="0.09"/>
62-
<param name="approximate_sync" value="false"/>
63-
<remap from="~/input/vector_map" to="/map/vector_map"/>
64-
<remap from="~/output/traffic_signals" to="$(var internal/traffic_signals)"/>
65-
</node>
59+
<include file="$(find-pkg-share autoware_traffic_light_multi_camera_fusion)/launch/traffic_light_multi_camera_fusion.launch.xml">
60+
<arg name="camera_namespaces" value="$(var all_camera_namespaces)"/>
61+
<arg name="param_path" value="$(var traffic_light_multi_camera_fusion_param_path)"/>
62+
<arg name="input/vector_map" value="/map/vector_map"/>
63+
<arg name="output/traffic_signals" value="$(var internal/traffic_signals)"/>
64+
</include>
6665
</group>
6766

6867
<!-- V2X fusion -->
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
/**:
22
ros__parameters:
3-
camera_namespaces: ["camera6", "camera7"]
43
message_lifespan: 0.09
54
approximate_sync: false

perception/autoware_traffic_light_multi_camera_fusion/launch/traffic_light_multi_camera_fusion.launch.xml

+2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@
33
<arg name="input/vector_map" default="/map/vector_map"/>
44
<arg name="param_path" default="$(find-pkg-share autoware_traffic_light_multi_camera_fusion)/config/traffic_light_multi_camera_fusion.param.yaml"/>
55
<arg name="output/traffic_signals" default="/perception/traffic_light_recognition/traffic_signals"/>
6+
<arg name="camera_namespaces" default="[camera6, camera7]"/>
67

78
<node pkg="autoware_traffic_light_multi_camera_fusion" exec="traffic_light_multi_camera_fusion_node" name="traffic_light_multi_camera_fusion" output="screen">
89
<remap from="~/input/vector_map" to="$(var input/vector_map)"/>
910
<remap from="~/output/traffic_signals" to="$(var output/traffic_signals)"/>
1011
<param from="$(var param_path)"/>
12+
<param name="camera_namespaces" value="$(var camera_namespaces)"/>
1113
</node>
1214
</launch>

perception/autoware_traffic_light_multi_camera_fusion/schema/traffic_light_multi_camera_fusion.schema.json

+1-9
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,6 @@
66
"autoware_traffic_light_multi_camera_fusion": {
77
"type": "object",
88
"properties": {
9-
"camera_namespaces": {
10-
"type": "array",
11-
"description": "Camera namespaces to be fused.",
12-
"items": {
13-
"type": "string"
14-
},
15-
"default": []
16-
},
179
"message_lifespan": {
1810
"type": "number",
1911
"description": "The maximum timestamp span to be fused.",
@@ -25,7 +17,7 @@
2517
"default": false
2618
}
2719
},
28-
"required": ["camera_namespaces", "message_lifespan", "approximate_sync"],
20+
"required": ["message_lifespan", "approximate_sync"],
2921
"additionalProperties": false
3022
}
3123
},

0 commit comments

Comments
 (0)