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

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

Revision: 157
          http://gearbox.svn.sourceforge.net/gearbox/?rev=157&view=rev
Author:   russo2503v
Date:     2008-06-04 22:31:00 -0700 (Wed, 04 Jun 2008)

Log Message:
-----------
added more fields to test output. improved docco

Modified Paths:
--------------
    gearbox/trunk/submitted/gbxgarminacfr/doc.dox
    gearbox/trunk/submitted/gbxgarminacfr/driver.cpp
    gearbox/trunk/submitted/gbxgarminacfr/test/example.readme
    gearbox/trunk/submitted/gbxgarminacfr/test/test.cpp

Modified: gearbox/trunk/submitted/gbxgarminacfr/doc.dox
===================================================================
--- gearbox/trunk/submitted/gbxgarminacfr/doc.dox	2008-06-04 14:15:46 UTC (rev 156)
+++ gearbox/trunk/submitted/gbxgarminacfr/doc.dox	2008-06-05 05:31:00 UTC (rev 157)
@@ -24,9 +24,6 @@
 #include <gbxgarminacfr/driver.h>
 @endverbatim
 
-@par Example
-  See test/test.cpp
-
 @par Style
   See http://orca-robotics.sourceforge.net/orca/orca_doc_style.html
 
@@ -46,6 +43,17 @@
 
 - @ref gbx_library_gbxserialacfr
 
+@par Example
+
+See test/test.cpp and test/example.readme on how to compile the test program.
+
+To run the test program (assuming the GPS device is connected to /dev/ttyS0) :
+@verbatim
+$ gbxgarminacfrtest -p /dev/ttyS0
+@endverbatim
+
+The test program reports back all messages received from the driver and prints out a few data fields for each message. When the fix type is reported as 0 ("Invalid"), only the number of satellites and the time stamp are meaningful.
+
 @section gbx_library_gbxgarminacfr What is EPE?
 
 Bits of information assembled by Duncan Mercer.

Modified: gearbox/trunk/submitted/gbxgarminacfr/driver.cpp
===================================================================
--- gearbox/trunk/submitted/gbxgarminacfr/driver.cpp	2008-06-04 14:15:46 UTC (rev 156)
+++ gearbox/trunk/submitted/gbxgarminacfr/driver.cpp	2008-06-05 05:31:00 UTC (rev 157)
@@ -42,6 +42,9 @@
     sscanf(msg.getDataToken(UTC).c_str(),"%02d%02d%lf",
            &data->utcTimeHrs, &data->utcTimeMin, &data->utcTimeSec );
 
+    //number of satellites in use
+    data->satellites = atoi(msg.getDataToken(NSatsUsed).c_str());
+
     // fix type
     switch ( msg.getDataToken(FixType)[0] )
     {
@@ -51,7 +54,6 @@
         data->latitude = 0.0;
         data->longitude = 0.0;
         data->altitude = 0.0;
-        data->satellites = 0;
         data->geoidalSeparation = 0.0;
         return data;
     case '1': 
@@ -76,9 +78,6 @@
     dir = (*msg.getDataToken(LonDir).c_str()=='E') ? 1.0 : -1.0;
     data->longitude=dir*(deg+(min/60.0));
     
-    //number of satellites in use
-    data->satellites = atoi(msg.getDataToken(NSatsUsed).c_str());
-    
     //altitude
     data->altitude=atof(msg.getDataToken(Hgt).c_str());
     

Modified: gearbox/trunk/submitted/gbxgarminacfr/test/example.readme
===================================================================
--- gearbox/trunk/submitted/gbxgarminacfr/test/example.readme	2008-06-04 14:15:46 UTC (rev 156)
+++ gearbox/trunk/submitted/gbxgarminacfr/test/example.readme	2008-06-05 05:31:00 UTC (rev 157)
@@ -10,3 +10,5 @@
 $ mkdir gbxgarminacfr_example
 $ cd gbxgarminacfr_example
 $ ccmake /usr/local/share/gearbox/gbxgarminacfr
+
+For more information, see driver documentation.

Modified: gearbox/trunk/submitted/gbxgarminacfr/test/test.cpp
===================================================================
--- gearbox/trunk/submitted/gbxgarminacfr/test/test.cpp	2008-06-04 14:15:46 UTC (rev 156)
+++ gearbox/trunk/submitted/gbxgarminacfr/test/test.cpp	2008-06-05 05:31:00 UTC (rev 157)
@@ -93,23 +93,29 @@
                 case gbxgarminacfr::GpGga :
                 {
                     gbxgarminacfr::GgaData* d = (gbxgarminacfr::GgaData*)data.get();
-                    cout<<"GPGGA: fix type="<<d->fixType<<endl;
+                    cout<<"GPGGA:"<<endl
+                        <<"  satellites     = "<<d->satellites<<endl
+                        <<"  fix type       = "<<d->fixType<<endl
+                        <<"  longitude      = "<<d->longitude<<endl
+                        <<"  latitude       = "<<d->latitude<<endl;
                     break;
                 }
                 case gbxgarminacfr::GpVtg :
                 {
                     gbxgarminacfr::VtgData* d = (gbxgarminacfr::VtgData*)data.get();
-                    cout<<"GPVTG: speed="<<d->speed<<endl;
+                    cout<<"GPVTG:"<<endl
+                        <<"   speed         = "<<d->speed<<endl;
                     break;
                 }
                 case gbxgarminacfr::PgRme :
                 {
                     gbxgarminacfr::RmeData* d = (gbxgarminacfr::RmeData*)data.get();
-                    cout<<"PGRME: herror="<<d->horizontalPositionError<<endl;
+                    cout<<"PGRME:"<<endl
+                        <<"   horiz error   = "<<d->horizontalPositionError<<endl;
                     break;
                 }
                 default :
-                    cout<<"?????"<<endl;
+                    cout<<"Unknown message"<<endl;
             }
 
             // no need to delete the data object, the auto pointer will delete it automatically


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