[Gearbox-commit] SF.net SVN: gearbox:[414] gearbox/trunk

[<bo...@us...>]

Revision: 414
          http://gearbox.svn.sourceforge.net/gearbox/?rev=414&view=rev
Author:   borax00
Date:     2009-05-29 06:58:49 +0000 (Fri, 29 May 2009)

Log Message:
-----------
MR Changes

Modified Paths:
--------------
    gearbox/trunk/cmake/DependencyUtils.cmake
    gearbox/trunk/src/gbxserialacfr/test/serialloopbacktest.cpp
    gearbox/trunk/src/gbxsickacfr/gbxiceutilacfr/timer.cpp
    gearbox/trunk/src/gbxsickacfr/gbxiceutilacfr/timer.h
    gearbox/trunk/src/gbxsmartbatteryacfr/oceanserverhealthchecks.cpp
    gearbox/trunk/src/gbxsmartbatteryacfr/smartbatteryparsing.cpp
    gearbox/trunk/src/hokuyo_aist/python/test/CMakeLists.txt

Modified: gearbox/trunk/cmake/DependencyUtils.cmake
===================================================================
--- gearbox/trunk/cmake/DependencyUtils.cmake	2009-05-28 04:17:24 UTC (rev 413)
+++ gearbox/trunk/cmake/DependencyUtils.cmake	2009-05-29 06:58:49 UTC (rev 414)
@@ -216,15 +216,14 @@
         # must dereference both var and option names once (!) and IF will evaluate their values
         if( NOT target_location  )
             set( ${cumulative_var} FALSE )
-            # force ENABLE_* variables to off in ccmake UI if dependencies aren't met.
             GBX_UTIL_MAKE_OPTION_NAME( option_name ${module_type} ${module_name} )
-
+            # alexm: disabling dependency caching
             if( is_exe )
                 GBX_NOT_ADD_EXECUTABLE( ${module_name} ${reason} )
-                set( ${option_name} OFF CACHE BOOL "Try to build ${module_name}" FORCE )
+#                set( ${option_name} OFF CACHE BOOL "Try to build ${module_name}" FORCE )
             else( is_exe )
-                GBX_NOT_ADD_LIBRARY( ${module_name} ${reason} )
-                set( ${option_name} OFF CACHE BOOL "Try to build lib${module_name} library" FORCE )
+                GBX_NOT_add_library( ${module_name} ${reason} )
+#                set( ${option_name} OFF CACHE BOOL "Try to build lib${module_name} library" FORCE )
             endif( is_exe )
         endif( NOT target_location )
 

Modified: gearbox/trunk/src/gbxserialacfr/test/serialloopbacktest.cpp
===================================================================
--- gearbox/trunk/src/gbxserialacfr/test/serialloopbacktest.cpp	2009-05-28 04:17:24 UTC (rev 413)
+++ gearbox/trunk/src/gbxserialacfr/test/serialloopbacktest.cpp	2009-05-29 06:58:49 UTC (rev 414)
@@ -41,9 +41,9 @@
 
     gbxserialacfr::Serial serial( argv[1], atoi(argv[2]), gbxserialacfr::Serial::Timeout(1,0) );
 
-    const int NUM_CHARS = 1000;
+    const int NUM_TIMES = 10;
     std::vector<std::string> stringList = getStringList();
-    for ( int i=0; i < NUM_CHARS; i++ )
+    for ( int i=0; i < NUM_TIMES; i++ )
     {
         int stringI = i % (stringList.size());
         std::string sendString = stringList[stringI]+"\n";

Modified: gearbox/trunk/src/gbxsickacfr/gbxiceutilacfr/timer.cpp
===================================================================
--- gearbox/trunk/src/gbxsickacfr/gbxiceutilacfr/timer.cpp	2009-05-28 04:17:24 UTC (rev 413)
+++ gearbox/trunk/src/gbxsickacfr/gbxiceutilacfr/timer.cpp	2009-05-29 06:58:49 UTC (rev 414)
@@ -13,33 +13,33 @@
 namespace gbxiceutilacfr {
 
 Timer::Timer() :
-    time_( IceUtil::Time::now() )
+    startTime_( IceUtil::Time::now() )
 {
 }
 
 Timer::Timer( const IceUtil::Time& elapsedTime ) :
-    time_( IceUtil::Time::now()-elapsedTime )
+    startTime_( IceUtil::Time::now()-elapsedTime )
 {
 }
 
 void Timer::restart()
 {
-    time_ = IceUtil::Time::now();
+    startTime_ = IceUtil::Time::now();
 }
 
 IceUtil::Time Timer::elapsed() const
 {
-    return IceUtil::Time::now() - time_;
+    return IceUtil::Time::now() - startTime_;
 }
 
 double Timer::elapsedMs() const
 {
-    return ( (IceUtil::Time::now() - time_).toMilliSecondsDouble() );
+    return ( (IceUtil::Time::now() - startTime_).toMilliSecondsDouble() );
 }
 
 double Timer::elapsedSec() const
 {
-    return ( (IceUtil::Time::now() - time_).toSecondsDouble() );
+    return ( (IceUtil::Time::now() - startTime_).toSecondsDouble() );
 }
 
 } // namespace

Modified: gearbox/trunk/src/gbxsickacfr/gbxiceutilacfr/timer.h
===================================================================
--- gearbox/trunk/src/gbxsickacfr/gbxiceutilacfr/timer.h	2009-05-28 04:17:24 UTC (rev 413)
+++ gearbox/trunk/src/gbxsickacfr/gbxiceutilacfr/timer.h	2009-05-29 06:58:49 UTC (rev 414)
@@ -51,7 +51,7 @@
     double elapsedSec() const;
 
 private:
-    IceUtil::Time time_;
+    IceUtil::Time startTime_;
 
 };
 

Modified: gearbox/trunk/src/gbxsmartbatteryacfr/oceanserverhealthchecks.cpp
===================================================================
--- gearbox/trunk/src/gbxsmartbatteryacfr/oceanserverhealthchecks.cpp	2009-05-28 04:17:24 UTC (rev 413)
+++ gearbox/trunk/src/gbxsmartbatteryacfr/oceanserverhealthchecks.cpp	2009-05-29 06:58:49 UTC (rev 414)
@@ -99,9 +99,7 @@
     
         int numCycles = bat.cycleCount();
         
-        // There's a bug in the Oceanserver system which sometimes produces an FFFF record for this field.
-        // According to Kevin Ludlam (lu...@oc...), "caused by a collision on the SMBus"
-        if ( (numCycles > numCyclesThreshhold) && (numCycles!=65535) )
+        if ( numCycles > numCyclesThreshhold )
         {
             haveWarning = true;
             stringstream ssWarnShort;

Modified: gearbox/trunk/src/gbxsmartbatteryacfr/smartbatteryparsing.cpp
===================================================================
--- gearbox/trunk/src/gbxsmartbatteryacfr/smartbatteryparsing.cpp	2009-05-28 04:17:24 UTC (rev 413)
+++ gearbox/trunk/src/gbxsmartbatteryacfr/smartbatteryparsing.cpp	2009-05-29 06:58:49 UTC (rev 414)
@@ -47,6 +47,11 @@
 {    
     if (str.size()!=4) 
         throw ParsingException( ERROR_INFO, "readUnsignedInt16 called with string size != 4" );
+    
+    // There's a known bug in the Oceanserver system which sometimes produces an FFFF record
+    // According to Kevin Ludlam (lu...@oc...), "caused by a collision on the SMBus"
+    if (str=="FFFF")
+        throw ParsingException( ERROR_INFO, "Read FFFF as a value. May be caused by a collision on the SMBus" );
 
     return readUnsignedInt( str );
 }
@@ -55,6 +60,11 @@
 {    
     if (str.size()!=2) 
         throw ParsingException( ERROR_INFO, "readUnsignedInt8 called with string size != 2" );
+    
+    // There's a known bug in the Oceanserver system which sometimes produces an FF record
+    // According to Kevin Ludlam (lu...@oc...), "caused by a collision on the SMBus"
+    if (str=="FF")
+        throw ParsingException( ERROR_INFO, "Read FF as a value. May be caused by a collision on the SMBus" );
 
     return readUnsignedInt( str );
 }
@@ -63,6 +73,11 @@
 {
     if (str.size()!=4) 
         throw ParsingException( ERROR_INFO, "readSignedInt16 called with string size != 4" );
+    
+    // There's a known bug in the Oceanserver system which sometimes produces an FFFF record
+    // According to Kevin Ludlam (lu...@oc...), "caused by a collision on the SMBus"
+    if (str=="FFFF")
+        throw ParsingException( ERROR_INFO, "Read FFFF as a value. May be caused by a collision on the SMBus" );
    
     stringstream ss(str);
     int value;

Modified: gearbox/trunk/src/hokuyo_aist/python/test/CMakeLists.txt
===================================================================
--- gearbox/trunk/src/hokuyo_aist/python/test/CMakeLists.txt	2009-05-28 04:17:24 UTC (rev 413)
+++ gearbox/trunk/src/hokuyo_aist/python/test/CMakeLists.txt	2009-05-29 06:58:49 UTC (rev 414)
@@ -1 +1 @@
-install(FILES hokuyo_aist_example.py DESTINATION share/${PROJECT_NAME}/hokuyo_aist/example)
+GBX_ADD_SHARED_FILES(hokuyo_aist hokuyo_aist_example.py)


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