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

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

Revision: 18388
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=18388&view=rev
Author:   wattsk
Date:     2009-07-07 05:39:03 +0000 (Tue, 07 Jul 2009)

Log Message:
-----------
Added computer monitoring to PRF, PRG launch files

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

Added Paths:
-----------
    pkg/trunk/stacks/pr2/pr2_alpha/pr2_monitors.launch

Added: pkg/trunk/stacks/pr2/pr2_alpha/pr2_monitors.launch
===================================================================
--- pkg/trunk/stacks/pr2/pr2_alpha/pr2_monitors.launch	                        (rev 0)
+++ pkg/trunk/stacks/pr2/pr2_alpha/pr2_monitors.launch	2009-07-07 05:39:03 UTC (rev 18388)
@@ -0,0 +1,15 @@
+<launch>
+ 
+  <!-- Disk usage monitor -->
+  <node pkg="pr2_computer_monitor" type="hd_monitor.py" args="$(optenv HOME /home) /dev/sda" machine="realtime_root"/>
+  <node pkg="pr2_computer_monitor" type="hd_monitor.py" args="$(optenv HOME /home) /dev/sda" machine="two_root"/> 
+  <node pkg="pr2_computer_monitor" type="hd_monitor.py" args="$(optenv HOME /home) /dev/sda" machine="three_root"/> 
+  <node pkg="pr2_computer_monitor" type="hd_monitor.py" args="$(optenv HOME /home) /dev/sda" machine="four_root"/> 
+
+  <!-- CPU monitors -->
+  <node pkg="pr2_computer_monitor" type="cpu_monitor.py" args="--no_cpu_temp" machine="realtime_root"/>
+  <node pkg="pr2_computer_monitor" type="cpu_monitor.py" args="--no_cpu_temp" machine="two_root"/> 
+  <node pkg="pr2_computer_monitor" type="cpu_monitor.py" args="--no_cpu_temp" machine="three_root"/> 
+  <node pkg="pr2_computer_monitor" type="cpu_monitor.py" args="--no_cpu_temp" achine="four_root"/> 
+
+</launch>
\ No newline at end of file

Modified: pkg/trunk/stacks/pr2/pr2_alpha/prf.launch
===================================================================
--- pkg/trunk/stacks/pr2/pr2_alpha/prf.launch	2009-07-07 05:32:40 UTC (rev 18387)
+++ pkg/trunk/stacks/pr2/pr2_alpha/prf.launch	2009-07-07 05:39:03 UTC (rev 18388)
@@ -77,11 +77,8 @@
   <node pkg="runtime_monitor" type="ntp_monitor.py" args="prf2" machine="three"/>
   <node pkg="runtime_monitor" type="ntp_monitor.py" args="prf2" machine="four"/>
 
-<!-- Disk usage monitoring script Warns to console if disk full -->
-  <node pkg="pr2_computer_monitor" type="disk_usage.py" args="$(optenv HOME /home)" machine="realtime"/>
-  <node pkg="pr2_computer_monitor" type="disk_usage.py" args="$(optenv HOME /home)" machine="two"/> 
-  <node pkg="pr2_computer_monitor" type="disk_usage.py" args="$(optenv HOME /home)" machine="three"/>
-  <node pkg="pr2_computer_monitor" type="disk_usage.py" args="$(optenv HOME /home)" machine="four"/>   
+<!-- Disk, CPU monitoring scripts. -->
+  <include file="$(find pr2_alpha)/pr2_monitors.launch" />
 
   <!-- Plug to chessboard offsets -->
   <group ns="plug_detector">

Modified: pkg/trunk/stacks/pr2/pr2_alpha/prf.machine
===================================================================
--- pkg/trunk/stacks/pr2/pr2_alpha/prf.machine	2009-07-07 05:32:40 UTC (rev 18387)
+++ pkg/trunk/stacks/pr2/pr2_alpha/prf.machine	2009-07-07 05:39:03 UTC (rev 18388)
@@ -1,6 +1,12 @@
 <launch>
+  <!-- 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.launch
===================================================================
--- pkg/trunk/stacks/pr2/pr2_alpha/prg.launch	2009-07-07 05:32:40 UTC (rev 18387)
+++ pkg/trunk/stacks/pr2/pr2_alpha/prg.launch	2009-07-07 05:39:03 UTC (rev 18388)
@@ -72,13 +72,11 @@
   <node pkg="runtime_monitor" type="ntp_monitor.py" args="prg2" machine="realtime"/>
   <node pkg="runtime_monitor" type="ntp_monitor.py" args="fw1 7000" machine="two"/> 
   <node pkg="runtime_monitor" type="ntp_monitor.py" args="prg2" machine="three"/>
-  <node pkg="runtime_monitor" type="ntp_monitor.py" args="prg2" machine="four"/>   
-<!-- Disk usage monitoring script Warns to console if disk full -->
-  <node pkg="pr2_computer_monitor" type="disk_usage.py" args="$(optenv HOME /home)" machine="realtime"/>
-  <node pkg="pr2_computer_monitor" type="disk_usage.py" args="$(optenv HOME /home)" machine="two"/> 
-  <node pkg="pr2_computer_monitor" type="disk_usage.py" args="$(optenv HOME /home)" machine="three"/>
-  <node pkg="pr2_computer_monitor" type="disk_usage.py" args="$(optenv HOME /home)" machine="four"/>   
+  <node pkg="runtime_monitor" type="ntp_monitor.py" args="prg2" machine="four"/>
 
+<!-- Disk, CPU monitoring scripts. -->
+  <include file="$(find pr2_alpha)/pr2_monitors.launch" />
+
   <!-- Videre Stereo cam -->
   <include file="$(find pr2_alpha)/stereo.launch" />
 

Modified: pkg/trunk/stacks/pr2/pr2_alpha/prg.machine
===================================================================
--- pkg/trunk/stacks/pr2/pr2_alpha/prg.machine	2009-07-07 05:32:40 UTC (rev 18387)
+++ pkg/trunk/stacks/pr2/pr2_alpha/prg.machine	2009-07-07 05:39:03 UTC (rev 18388)
@@ -1,9 +1,16 @@
 <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)" />
   <machine name="four"     address="prg4" ros-root="$(env ROS_ROOT)" ros-package-path="$(env ROS_PACKAGE_PATH)" />
+
+  <!-- Defines the machine that the Videre Stereocam is attached to -->
   <machine name="stereo"   address="prg4" ros-root="$(env ROS_ROOT)" ros-package-path="$(env ROS_PACKAGE_PATH)" />
 </launch>


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