[Personalrobots-commit] SF.net SVN: personalrobots:[20705] pkg/trunk

[<bla...@us...>]

Revision: 20705
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=20705&view=rev
Author:   blaisegassend
Date:     2009-08-04 21:50:43 +0000 (Tue, 04 Aug 2009)

Log Message:
-----------
Increased led_test tolerance to 2. Allowed self test to retry open and start commands before failing.

Modified Paths:
--------------
    pkg/trunk/pr2/qualification/tests/forearm_cam_test/led_flash_test.launch
    pkg/trunk/stacks/driver_common/driver_base/include/driver_base/driver_node.h

Modified: pkg/trunk/pr2/qualification/tests/forearm_cam_test/led_flash_test.launch
===================================================================
--- pkg/trunk/pr2/qualification/tests/forearm_cam_test/led_flash_test.launch	2009-08-04 21:46:10 UTC (rev 20704)
+++ pkg/trunk/pr2/qualification/tests/forearm_cam_test/led_flash_test.launch	2009-08-04 21:50:43 UTC (rev 20705)
@@ -24,7 +24,7 @@
     <param name="min_high" type="double" value="-0.009"/>
     <param name="max_high" type="double" value="-0.004"/>
     <param name="skip" type="int" value="10"/>
-    <param name="tolerance" type="int" value="1" />
+    <param name="tolerance" type="int" value="2" />
     <param name="frames" type="int" value="300"/>
     <remap from="image" to="/forearm/image_raw"/>
   </node>

Modified: pkg/trunk/stacks/driver_common/driver_base/include/driver_base/driver_node.h
===================================================================
--- pkg/trunk/stacks/driver_common/driver_base/include/driver_base/driver_node.h	2009-08-04 21:46:10 UTC (rev 20704)
+++ pkg/trunk/stacks/driver_common/driver_base/include/driver_base/driver_node.h	2009-08-04 21:50:43 UTC (rev 20705)
@@ -249,6 +249,12 @@
   {
     driver_.open();
 
+    if (!driver_.isOpened()) // Retry to avoid occasional glitches.
+    {
+      sleep(2);
+      driver_.open();
+    }
+
     if (driver_.isOpened())
       status.summaryf(0, "Successfully opened device %s", driver_.getID().c_str());
     else
@@ -259,6 +265,12 @@
   {
     driver_.start();
     
+    if (!driver_.isRunning()) // Retry to avoid occasional glitches.
+    {
+      sleep(2);
+      driver_.start();
+    }
+
     if (driver_.isRunning())      
       status.summaryf(0, "Successfully started streaming.");
     else


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