Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[rosnode_rtc] fix samples (chatter_inport and chatter_outport) #1111

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions rosnode_rtc/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# rosnode_rtc

Document is [here](https://github.com/start-jsk/rtmros_common/blob/master/rosnode_rtc/index.rst).
11 changes: 2 additions & 9 deletions rosnode_rtc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,21 +21,14 @@ chatter_inport.launch

.. code-block:: bash

roslaunch rosnode_rtc chatter_inport.launch

chatter_inport_1.1.0.launch
---------------------------

.. code-block:: bash

roslaunch rosnode_rtc chatter_inport_1.1.0.launch
rtmlaunch rosnode_rtc chatter_inport.launch

chatter_outport.launch
----------------------

.. code-block:: bash

roslaunch rosnode_rtc chatter_outport.launch
rtmlaunch rosnode_rtc chatter_outport.launch

stage_sample.launch
-------------------
Expand Down
8 changes: 4 additions & 4 deletions rosnode_rtc/sample/chatter_inport.launch
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<!-- PYTHONPATH must contains path for rtshell -->
<env name="PYTHONPATH" value="$(env PYTHONPATH)" />
<arg name="nameserver" default="localhost" />
<env name="RTCTREE_NAMESERVERS" value="$(arg nameserver)" />
<arg name="openrtm_args" value='-o "corba.nameservers:$(arg nameserver):2809" -o "naming.formats:%n.rtc" -o "logger.file_name:/tmp/rtc%p.log"' />
<env name="RTCTREE_NAMESERVERS" value="$(arg nameserver):15005" />
<arg name="openrtm_args" value='-o "corba.nameservers:$(arg nameserver):15005" -o "naming.formats:%n.rtc" -o "logger.file_name:/tmp/rtc%p.log"' />

<!-- ROS sample -->
<node pkg="roscpp_tutorials" type="listener" name="listener"
Expand All @@ -17,12 +17,12 @@

<!-- RTM sample -->
<node pkg="rosnode_rtc" type="dataport_rtinject.sh" name="rtinject"
args="/localhost/RTMROSDataBridge0.rtc:chatter &quot;RTMROSDataBridge.std_msgs_String(data='hello')&quot;"
args="/localhost:15005/RTMROSDataBridge0.rtc:chatter &quot;RTMROSDataBridge.std_msgs_String(data='hello')&quot;"
launch-prefix="xterm -e"/>

<!-- BEGIN:openrtm connection -->
<node name="rtmlaunch_data_bridge" pkg="openrtm_tools" type="rtmlaunch.py"
args="$(find rosnode_rtc)/sample/chatter_inport_1.1.0.launch"/>
args="$(find rosnode_rtc)/sample/chatter_inport.launch"/>
<rtactivate component="RTMROSDataBridge0.rtc" />
<!-- END:openrtm connection -->

Expand Down
6 changes: 3 additions & 3 deletions rosnode_rtc/sample/chatter_outport.launch
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<!-- PYTHONPATH must contains path for rtshell -->
<env name="PYTHONPATH" value="$(env PYTHONPATH)" />
<arg name="nameserver" default="localhost" />
<env name="RTCTREE_NAMESERVERS" value="$(arg nameserver)" />
<arg name="openrtm_args" value='-o "corba.nameservers:$(arg nameserver):2809" -o "naming.formats:%n.rtc" -o "logger.file_name:/tmp/rtc%p.log"' />
<env name="RTCTREE_NAMESERVERS" value="$(arg nameserver):15005" />
<arg name="openrtm_args" value='-o "corba.nameservers:$(arg nameserver):15005" -o "naming.formats:%n.rtc" -o "logger.file_name:/tmp/rtc%p.log"' />

<!-- ROS sample -->
<node pkg="roscpp_tutorials" type="talker" name="talker"
Expand All @@ -17,6 +17,6 @@

<!-- RTM sample -->
<node pkg="rosnode_rtc" type="dataport_rtprint.sh" name="rtprint"
args="/localhost/RTMROSDataBridge0.rtc:chatter"
args="/localhost:15005/RTMROSDataBridge0.rtc:chatter"
launch-prefix="xterm -e" />
</launch>