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

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

Revision: 19312
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=19312&view=rev
Author:   wattsk
Date:     2009-07-21 18:58:08 +0000 (Tue, 21 Jul 2009)

Log Message:
-----------
pr2_computer_monitors don't require root access

Modified Paths:
--------------
    pkg/trunk/stacks/pr2/pr2_alpha/pr2_monitors.launch
    pkg/trunk/stacks/pr2/pr2_alpha/pre.machine
    pkg/trunk/stacks/pr2/pr2_alpha/prf.machine
    pkg/trunk/stacks/pr2/pr2_alpha/prg.machine

Modified: pkg/trunk/stacks/pr2/pr2_alpha/pr2_monitors.launch
===================================================================
--- pkg/trunk/stacks/pr2/pr2_alpha/pr2_monitors.launch	2009-07-21 18:57:36 UTC (rev 19311)
+++ pkg/trunk/stacks/pr2/pr2_alpha/pr2_monitors.launch	2009-07-21 18:58:08 UTC (rev 19312)
@@ -8,15 +8,15 @@
   <param name="enforce_clock_speed" value="False" />
 
   <!-- Disk usage monitor -->
-  <node pkg="pr2_computer_monitor" type="hd_monitor.py" machine="realtime_root"/>
-  <node pkg="pr2_computer_monitor" type="hd_monitor.py" args="$(optenv HOME /home)" machine="two_root"/> 
-  <node pkg="pr2_computer_monitor" type="hd_monitor.py" machine="three_root"/> 
-  <node pkg="pr2_computer_monitor" type="hd_monitor.py" machine="four_root"/> 
+  <node pkg="pr2_computer_monitor" type="hd_monitor.py" machine="realtime"/>
+  <node pkg="pr2_computer_monitor" type="hd_monitor.py" args="$(optenv HOME /home)" machine="two"/> 
+  <node pkg="pr2_computer_monitor" type="hd_monitor.py" machine="three"/> 
+  <node pkg="pr2_computer_monitor" type="hd_monitor.py" machine="four"/> 
 
   <!-- CPU monitors -->
-  <node pkg="pr2_computer_monitor" type="cpu_monitor.py" machine="realtime_root"/>
-  <node pkg="pr2_computer_monitor" type="cpu_monitor.py" machine="two_root"/> 
-  <node pkg="pr2_computer_monitor" type="cpu_monitor.py" machine="three_root"/> 
-  <node pkg="pr2_computer_monitor" type="cpu_monitor.py" machine="four_root"/> 
+  <node pkg="pr2_computer_monitor" type="cpu_monitor.py" machine="realtime"/>
+  <node pkg="pr2_computer_monitor" type="cpu_monitor.py" machine="two"/> 
+  <node pkg="pr2_computer_monitor" type="cpu_monitor.py" machine="three"/> 
+  <node pkg="pr2_computer_monitor" type="cpu_monitor.py" machine="four"/> 
 
 </launch>
\ No newline at end of file

Modified: pkg/trunk/stacks/pr2/pr2_alpha/pre.machine
===================================================================
--- pkg/trunk/stacks/pr2/pr2_alpha/pre.machine	2009-07-21 18:57:36 UTC (rev 19311)
+++ pkg/trunk/stacks/pr2/pr2_alpha/pre.machine	2009-07-21 18:58:08 UTC (rev 19312)
@@ -4,6 +4,5 @@
   <machine name="realtime" address="pre1" ros-root="$(env ROS_ROOT)" ros-package-path="$(env ROS_PACKAGE_PATH)" default="true"/>
   <machine name="two"      address="pre2" ros-root="$(env ROS_ROOT)" ros-package-path="$(env ROS_PACKAGE_PATH)" />
 
-  <machine name="two_root"      user="root" address="pre2" ros-root="$(env ROS_ROOT)" ros-package-path="$(env ROS_PACKAGE_PATH)" />
   <machine name="stereo"   address="pre2" ros-root="$(env ROS_ROOT)" ros-package-path="$(env ROS_PACKAGE_PATH)" />
 </launch>

Modified: pkg/trunk/stacks/pr2/pr2_alpha/prf.machine
===================================================================
--- pkg/trunk/stacks/pr2/pr2_alpha/prf.machine	2009-07-21 18:57:36 UTC (rev 19311)
+++ pkg/trunk/stacks/pr2/pr2_alpha/prf.machine	2009-07-21 18:58:08 UTC (rev 19312)
@@ -2,11 +2,6 @@
   <!-- Need realtime root machine for pr2_etherCAT -->
   <machine name="realtime_root" user="root" address="prf1" ros-root="$(env ROS_ROOT)" ros-package-path="$(env ROS_PACKAGE_PATH)" default="never" />
 
-  <!-- Root access to all machines for computer monitoring -->
-  <machine name="two_root" user="root" address="prf2" ros-root="$(env ROS_ROOT)" ros-package-path="$(env ROS_PACKAGE_PATH)" default="never" />
-  <machine name="three_root" user="root" address="prf3" ros-root="$(env ROS_ROOT)" ros-package-path="$(env ROS_PACKAGE_PATH)" default="never" />
-  <machine name="four_root" user="root" address="prf4" ros-root="$(env ROS_ROOT)" ros-package-path="$(env ROS_PACKAGE_PATH)" default="never" />
-
   <machine name="realtime" address="prf1" ros-root="$(env ROS_ROOT)" ros-package-path="$(env ROS_PACKAGE_PATH)" />
   <machine name="two" address="prf2" ros-root="$(env ROS_ROOT)" ros-package-path="$(env ROS_PACKAGE_PATH)"  default="true" />
   <machine name="three" address="prf3" ros-root="$(env ROS_ROOT)" ros-package-path="$(env ROS_PACKAGE_PATH)" />

Modified: pkg/trunk/stacks/pr2/pr2_alpha/prg.machine
===================================================================
--- pkg/trunk/stacks/pr2/pr2_alpha/prg.machine	2009-07-21 18:57:36 UTC (rev 19311)
+++ pkg/trunk/stacks/pr2/pr2_alpha/prg.machine	2009-07-21 18:58:08 UTC (rev 19312)
@@ -1,11 +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" />
 
-  <!-- Root access to all machines for computer monitoring -->
-  <machine name="two_root" user="root" address="prg2" ros-root="$(env ROS_ROOT)" ros-package-path="$(env ROS_PACKAGE_PATH)" default="never" />
-  <machine name="three_root" user="root" address="prg3" ros-root="$(env ROS_ROOT)" ros-package-path="$(env ROS_PACKAGE_PATH)" default="never" />
-  <machine name="four_root" user="root" address="prg4" 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"/>
   <machine name="three"    address="prg3" ros-root="$(env ROS_ROOT)" ros-package-path="$(env ROS_PACKAGE_PATH)" />


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