Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/cpfl/autoware into relea…
Browse files Browse the repository at this point in the history
…se/1.6.0
  • Loading branch information
yk-fujii committed Dec 11, 2017
2 parents e39693b + cab6a1f commit 8b6c49b
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<arg name="camera_info_src" default="/camera_info"/>
<arg name="use_path_info" default="false"/> <!-- USE VectorMap Server to publish only TrafficSignals on current lane-->

<node pkg="road_wizard" type="feat_proj" name="feature_projection" output="screen">
<node pkg="road_wizard" type="feat_proj" name="feature_projection" output="log">
<param name="camera_info_topic" type="str" value="$(arg camera_id)$(arg camera_info_src)"/>
<param name="use_path_info" type="bool" value="$(arg use_path_info)"/>
</node>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<arg name="camera_id" default="/"/>
<arg name="image_src" default="/image_raw"/>

<node pkg="road_wizard" type="region_tlr" name="traffic_light_recognition" output="screen">
<node pkg="road_wizard" type="region_tlr" name="traffic_light_recognition" output="log">
<param name="image_raw_topic" type="str" value="$(arg camera_id)$(arg image_src)"/>
</node>
</launch>
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<!-- run region_tlr_ssd node -->
<!-- <node pkg="road_wizard" name="region_tlr_ssd" type="region_tlr_ssd" launch-prefix="xterm -e gdb -args"> -->
<node pkg="road_wizard" name="region_tlr_ssd" type="region_tlr_ssd" output="screen">
<node pkg="road_wizard" name="region_tlr_ssd" type="region_tlr_ssd" output="log">
<param name="image_raw_topic" type="str" value="$(arg camera_id)$(arg image_src)" />
<param name="network_definition_file" type="str" value="$( arg network_definition_file)" />
<param name="pretrained_model_file" type="str" value="$(arg pretrained_model_file)" />
Expand Down

0 comments on commit 8b6c49b

Please sign in to comment.