[Personalrobots-commit] SF.net SVN: personalrobots:[23821] pkg/trunk/stacks/pr2/pr2_alpha

[<wa...@us...>]

Revision: 23821
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=23821&view=rev
Author:   wattsk
Date:     2009-09-04 07:05:40 +0000 (Fri, 04 Sep 2009)

Log Message:
-----------
Changes to PRG launch files for new servers

Modified Paths:
--------------
    pkg/trunk/stacks/pr2/pr2_alpha/prg.launch
    pkg/trunk/stacks/pr2/pr2_alpha/prg.machine
    pkg/trunk/stacks/pr2/pr2_alpha/prg_ethercat_reset.launch

Modified: pkg/trunk/stacks/pr2/pr2_alpha/prg.launch
===================================================================
--- pkg/trunk/stacks/pr2/pr2_alpha/prg.launch	2009-09-04 07:03:58 UTC (rev 23820)
+++ pkg/trunk/stacks/pr2/pr2_alpha/prg.launch	2009-09-04 07:05:40 UTC (rev 23821)
@@ -21,7 +21,7 @@
  </node>
 
 <!-- Battery Monitor -->
-  <node machine="two" pkg="ocean_battery_driver" type="ocean_server"  respawn="true">
+<!--  <node machine="two" pkg="ocean_battery_driver" type="ocean_server"  respawn="true">
     <param name="number_of_ports" type="int" value="4" />
     <param name="port0" type="string" value="/dev/ttyUSB0" />
     <param name="port1" type="string" value="/dev/ttyUSB1" />
@@ -29,6 +29,7 @@
     <param name="port3" type="string" value="/dev/ttyUSB3" />
     <param name="debug_level" type="int" value="0" />
   </node>
+-->
 
   <node pkg="power_monitor" type="power_monitor"  respawn="true"/>
 
@@ -67,7 +68,7 @@
     <param name="acquisition_mode" type="str" value="Triggered"/>
     <param name="ip_address" type="str" value="10.68.7.20"/>
   </group>
-  <node machine="three" name="prosilica" pkg="prosilica_camera" type="prosilica_node" output="screen" respawn="true"/-->
+  <node machine="two" name="prosilica" pkg="prosilica_camera" type="prosilica_node" output="screen" respawn="true"/-->
 
   <!-- Watts: Need to get driver working for stereo on servers -->
 <!-- Double stereo setup -->
@@ -102,7 +103,7 @@
 
 
 <!-- Forearm Camera -->
-  <node machine="three" name="forearm_camera_r" pkg="wge100_camera" type="wge100_camera_node" respawn="true" output="screen">
+  <node machine="two" name="forearm_camera_r" pkg="wge100_camera" type="wge100_camera_node" respawn="true" output="screen">
     <param name="camera_url" type="str" value="name://forearm_r"/>
     <param name="video_mode" type="str" value="640x480x30" />
     <param name="auto_exposure" type="bool" value="True" />

Modified: pkg/trunk/stacks/pr2/pr2_alpha/prg.machine
===================================================================
--- pkg/trunk/stacks/pr2/pr2_alpha/prg.machine	2009-09-04 07:03:58 UTC (rev 23820)
+++ pkg/trunk/stacks/pr2/pr2_alpha/prg.machine	2009-09-04 07:05:40 UTC (rev 23821)
@@ -1,7 +1,6 @@
 <launch>
   <machine name="realtime_root" user="root" address="prg1" ros-root="$(env ROS_ROOT)" ros-package-path="$(env ROS_PACKAGE_PATH)" default="never" />
 
-
   <machine name="realtime" address="prg1" ros-root="$(env ROS_ROOT)" ros-package-path="$(env ROS_PACKAGE_PATH)" />
   <machine name="two"      address="prg2" ros-root="$(env ROS_ROOT)" ros-package-path="$(env ROS_PACKAGE_PATH)"  default="true"/>
 </launch>

Modified: pkg/trunk/stacks/pr2/pr2_alpha/prg_ethercat_reset.launch
===================================================================
--- pkg/trunk/stacks/pr2/pr2_alpha/prg_ethercat_reset.launch	2009-09-04 07:03:58 UTC (rev 23820)
+++ pkg/trunk/stacks/pr2/pr2_alpha/prg_ethercat_reset.launch	2009-09-04 07:05:40 UTC (rev 23821)
@@ -9,7 +9,7 @@
   <include file="$(find pr2_alpha)/prg.machine" />
 
   <!-- pr2_etherCAT -->
-  <node machine="realtime_root" pkg="pr2_etherCAT" type="pr2_etherCAT" args="-i eth0 -x robot_description"/>
+  <node machine="realtime_root" pkg="pr2_etherCAT" type="pr2_etherCAT" args="-i ecat0 -x robot_description"/>
 
   <!-- PR2 Calibration -->
   


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.