[Gearbox-commit] SF.net SVN: gearbox: [225] gearbox/trunk/submitted/gbxsmartbatteryacfr

[<to...@us...>]

Revision: 225
          http://gearbox.svn.sourceforge.net/gearbox/?rev=225&view=rev
Author:   tobasco
Date:     2008-06-26 01:46:20 -0700 (Thu, 26 Jun 2008)

Log Message:
-----------
little things

Modified Paths:
--------------
    gearbox/trunk/submitted/gbxsmartbatteryacfr/oceanserverreader.cpp
    gearbox/trunk/submitted/gbxsmartbatteryacfr/oceanserverreader.h
    gearbox/trunk/submitted/gbxsmartbatteryacfr/test/fancytest.cpp
    gearbox/trunk/submitted/gbxsmartbatteryacfr/test/simpletest.cpp

Modified: gearbox/trunk/submitted/gbxsmartbatteryacfr/oceanserverreader.cpp
===================================================================
--- gearbox/trunk/submitted/gbxsmartbatteryacfr/oceanserverreader.cpp	2008-06-26 08:20:16 UTC (rev 224)
+++ gearbox/trunk/submitted/gbxsmartbatteryacfr/oceanserverreader.cpp	2008-06-26 08:46:20 UTC (rev 225)
@@ -39,9 +39,7 @@
 
     // send the command to start reading data
     serial_.flush();
-    
     const char startReading = 'X';
-    
     serial_.write(&startReading, 1);
 }
 
@@ -94,10 +92,6 @@
             throw HardwareReadingException( ERROR_INFO, "Connected to the wrong serial port. Didn't recognize any of the strings.");
         }
     }
-}
-
-OceanServerReader::~OceanServerReader()
-{
 }    
 
 void 
@@ -143,7 +137,6 @@
     }
     else
     {
-        
         tracer_.debug( "OceanServerReader: We already have the first line from the previous record", 5 );
         stringList.push_back( beginningRecordLine_ );
     }
@@ -163,8 +156,7 @@
             stringList.push_back(serialData);
         }
         
-        // (4) Save the last line for next time, it's the S-record
-        //     Otherwise we'd miss a record
+        // (4) Save the last line: it is the beginning of the next record
         beginningRecordLine_ = serialData;
         if (firstTime_) {
             firstTime_ = false;

Modified: gearbox/trunk/submitted/gbxsmartbatteryacfr/oceanserverreader.h
===================================================================
--- gearbox/trunk/submitted/gbxsmartbatteryacfr/oceanserverreader.h	2008-06-26 08:20:16 UTC (rev 224)
+++ gearbox/trunk/submitted/gbxsmartbatteryacfr/oceanserverreader.h	2008-06-26 08:46:20 UTC (rev 225)
@@ -35,7 +35,7 @@
     OceanServerReader( const std::string   &device,
                        gbxutilacfr::Tracer &tracer );
 
-    ~OceanServerReader();
+    ~OceanServerReader() {};
     
     //! May throw HardwareReadingException
     void read( OceanServerSystem &system );

Modified: gearbox/trunk/submitted/gbxsmartbatteryacfr/test/fancytest.cpp
===================================================================
--- gearbox/trunk/submitted/gbxsmartbatteryacfr/test/fancytest.cpp	2008-06-26 08:20:16 UTC (rev 224)
+++ gearbox/trunk/submitted/gbxsmartbatteryacfr/test/fancytest.cpp	2008-06-26 08:46:20 UTC (rev 225)
@@ -70,7 +70,7 @@
         }
     }
     
-    unsigned int numRecords=10;
+    const unsigned int numRecords = 5;
     MyClass myClass( port, debug );
     
     for (unsigned int i=0; i<=numRecords; i++)

Modified: gearbox/trunk/submitted/gbxsmartbatteryacfr/test/simpletest.cpp
===================================================================
--- gearbox/trunk/submitted/gbxsmartbatteryacfr/test/simpletest.cpp	2008-06-26 08:20:16 UTC (rev 224)
+++ gearbox/trunk/submitted/gbxsmartbatteryacfr/test/simpletest.cpp	2008-06-26 08:46:20 UTC (rev 225)
@@ -28,7 +28,7 @@
         }
     }
     
-    const unsigned int numRecords = 10;
+    const unsigned int numRecords = 5;
     cout << "INFO(simple_test): The plan is to read " << numRecords << " records from the oceanserver system and display the results." << endl << endl;
 
     // instantiate reader


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