[Gearbox-commit] SF.net SVN: gearbox: [148] gearbox/trunk/submitted/gbxgarminacfr

[<rus...@us...>]

Revision: 148
          http://gearbox.svn.sourceforge.net/gearbox/?rev=148&view=rev
Author:   russo2503v
Date:     2008-06-03 07:55:22 -0700 (Tue, 03 Jun 2008)

Log Message:
-----------
tested with hardware

Modified Paths:
--------------
    gearbox/trunk/submitted/gbxgarminacfr/driver.cpp
    gearbox/trunk/submitted/gbxgarminacfr/driver.h
    gearbox/trunk/submitted/gbxgarminacfr/test/test.cpp

Modified: gearbox/trunk/submitted/gbxgarminacfr/driver.cpp
===================================================================
--- gearbox/trunk/submitted/gbxgarminacfr/driver.cpp	2008-06-03 13:53:43 UTC (rev 147)
+++ gearbox/trunk/submitted/gbxgarminacfr/driver.cpp	2008-06-03 14:55:22 UTC (rev 148)
@@ -152,8 +152,12 @@
 bool
 Config::isValid() const
 {
-    if ( device.empty() ) return false;
+    if ( device.empty() ) 
+        return false;
 
+    if ( !( readGga || readVtg || readRme ) )
+        return false;
+
     return true;
 }
 

Modified: gearbox/trunk/submitted/gbxgarminacfr/driver.h
===================================================================
--- gearbox/trunk/submitted/gbxgarminacfr/driver.h	2008-06-03 13:53:43 UTC (rev 147)
+++ gearbox/trunk/submitted/gbxgarminacfr/driver.h	2008-06-03 14:55:22 UTC (rev 148)
@@ -26,8 +26,12 @@
         readGga(true),
         readVtg(true),
         readRme(true) {};
-    //! Returns true if the configuration is sane.
+
+    //! Returns true if the configuration is sane. Checks include:
+    //! - a non-empty device name
+    //! - at least one read-sentence flag set to TRUE
     bool isValid() const;
+
     //! Returns human-readable configuration description.
     std::string toString() const;
 

Modified: gearbox/trunk/submitted/gbxgarminacfr/test/test.cpp
===================================================================
--- gearbox/trunk/submitted/gbxgarminacfr/test/test.cpp	2008-06-03 13:53:43 UTC (rev 147)
+++ gearbox/trunk/submitted/gbxgarminacfr/test/test.cpp	2008-06-03 14:55:22 UTC (rev 148)
@@ -51,8 +51,8 @@
     gbxgarminacfr::Config config;
     config.device = port;
     config.readGga = true;
-    config.readVtg = true;
-    config.readRme = true;
+    config.readVtg = false;
+    config.readRme = false;
     if ( !config.isValid() ) {
         cout << "Test: Invalid device configuration structure: " << config.toString() << endl;
         exit(1);
@@ -80,13 +80,31 @@
     std::auto_ptr<gbxgarminacfr::GenericData> data;
 
     // Read a few times
-    const int numReads = 3;
+    const int numReads = 30;
     for ( int i=0; i < numReads; i++ )
     {
         try 
         {
             data = device->read();
+            
+            // find out which data type it is
+            switch ( data->type() )
+            {
+                case gbxgarminacfr::GpGga :
+                    cout<<"GPGGA"<<endl;
+                    break;
+                case gbxgarminacfr::GpVtg :
+                    cout<<"GPVTG"<<endl;
+                    break;
+                case gbxgarminacfr::PgRme :
+                    cout<<"PGRME"<<endl;
+                    break;
+                default :
+                    cout<<"?????"<<endl;
+            }
 
+            // no need to delete the message, the auto pointer will delete it automatically
+
             cout<<"Test: Got data "<<i+1<<" of "<<numReads<<endl;
         }
         catch ( const std::exception& e )


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