[prev in list] [next in list] [prev in thread] [next in thread] 

List:       gpsd-commit-watch
Subject:    [Gpsd-commit-watch] r3413 - in trunk: . www
From:       esr () mail ! berlios ! de (esr at BerliOS)
Date:       2006-08-21 16:23:31
Message-ID: 200608211623.k7LGNVWI023672 () sheep ! berlios ! de
[Download RAW message or body]

Author: esr
Date: 2006-08-21 18:23:31 +0200 (Mon, 21 Aug 2006)
New Revision: 3413

Modified:
   trunk/nmea_parse.c
   trunk/www/NMEA.txt
Log:
Channels member is no longer used by the NMEA parser.  
All regression tests pass.


Modified: trunk/nmea_parse.c
===================================================================
--- trunk/nmea_parse.c	2006-08-21 16:05:48 UTC (rev 3412)
+++ trunk/nmea_parse.c	2006-08-21 16:23:31 UTC (rev 3413)
@@ -349,7 +349,8 @@
     session->gpsdata.vdop = atof(field[count-1]);
     session->gpsdata.satellites_used = 0;
     memset(session->gpsdata.used,0,sizeof(session->gpsdata.used));
-    for (i = 0; i < session->device_type->channels; i++) {
+    /* the magic 6 here counts the tag, two mode fields, and the DOP fields */
+    for (i = 0; i < count - 6; i++) {
         int prn = atoi(field[i+3]);
         if (prn > 0)
 	    session->gpsdata.used[session->gpsdata.satellites_used++] = prn;

Modified: trunk/www/NMEA.txt
===================================================================
--- trunk/www/NMEA.txt	2006-08-21 16:05:48 UTC (rev 3412)
+++ trunk/www/NMEA.txt	2006-08-21 16:23:31 UTC (rev 3413)
@@ -750,6 +750,8 @@
 
  Field Number: 
   1) Selection mode
+	       M=Manual, forced to operate in 2D or 3D
+	       A=Automatic, 3D/2D
   2) Mode (1 = no fix, 2 = 2D fix, 3 = 3D fix)
   3) ID of 1st satellite used for fix
   4) ID of 2nd satellite used for fix


[prev in list] [next in list] [prev in thread] [next in thread]