We don't have to collect cycle-time and start-of-cycle...

Information manually any more, the cycle_analyzer can mine that for us.

27 files changed, 2 insertions, 90 deletions

diff --git a/test/README b/test/README
index 492f844a..65beb9eb 100644
--- a/test/README
+++ b/test/README
@@ -8,7 +8,6 @@ Structured headers are as follows:
 # Chipset: chipset name and (if possible) firmware revision level.
 # Description: product description (optional)
 # Cycle time: sampling interval, time to repeat a sentence in seconds
-# Start-of-cycle: sentence that begins each cycle
 # Submitted-by: who sent it
 # Date: when it was received
 # Location: city, state/province, country, approximate lat/lon
diff --git a/test/stable/blumax-gps009.log b/test/stable/blumax-gps009.log
index 737257fc..002a1bb1 100644
--- a/test/stable/blumax-gps009.log
+++ b/test/stable/blumax-gps009.log
@@ -1,7 +1,5 @@
 # Name: Blumax GPS-009
 # Chipset: SiRF Star III (according to data sheet)
-# Cycle-time: 1-second
-# Start-of-cycle: $GPZDA
 # Submitted-by: Hartmut Holzgraefe <hartmut@php.net>
 # Date: 18 July 2008
 # Location: Bielefeld, DE,  52=B0 01' N, 08=B0 31' O
diff --git a/test/stable/com-1289.log b/test/stable/com-1289.log
index 8943e23d..a41d9829 100644
--- a/test/stable/com-1289.log
+++ b/test/stable/com-1289.log
@@ -1,7 +1,5 @@
 # Name: Eurotech Com-1289
 # Chipset: Fastrax iTrax03
-# Cycle-time: 1s
-# Start-of-cycle: GPRMC
 # Submitted-by: Simon Le Pape <simon.le-pape@hotmail.fr>
 # Date: 10 Dec 2007
 # Location: Rennes, Ile-etVilaine, France
diff --git a/test/stable/eXplorist210.log b/test/stable/eXplorist210.log
index 5f881b8b..dc7cdeaa 100644
--- a/test/stable/eXplorist210.log
+++ b/test/stable/eXplorist210.log
@@ -1,7 +1,5 @@
 # Name: Magellan eXplorist 210
 # Chipset: unknown
-# Cycle-time: 1s
-# Start-of-cycle: $GPGLL
 # Submitted-by: "Paul B van den Berg" <paulberg@wanadoo.nl>
 # Date: 20 May 2006
 # Location: Groningen, NL, 53.2N6.6E
diff --git a/test/stable/garmin-geko201.log b/test/stable/garmin-geko201.log
index b8d896ad..9641a925 100644
--- a/test/stable/garmin-geko201.log
+++ b/test/stable/garmin-geko201.log
@@ -1,7 +1,5 @@
 # Name: Garmin Geko 201
 # Chipset: Garmin proprietary
-# Cycle-time: 2s
-# Start-of-cycle: GPRMC
 # Submitted-by: "Jose Luis Domingo Lopez" <gps@24x7linux.com>
 # Date: 14 Jun 2005
 # Location: Madrid, Madrid, Spain (ES), 40.39N 03.64E
diff --git a/test/stable/garmin17n.log b/test/stable/garmin17n.log
index 3b8b1d00..f36aa092 100644
--- a/test/stable/garmin17n.log
+++ b/test/stable/garmin17n.log
@@ -1,7 +1,5 @@
 # Name: Garmin 17N
 # Chipset: 
-# Cycle-time: 1s
-# Start-of-cycle: GPRMC
 # Submitted-by: Wojciech Kazubski <wk@ire.pw.edu.pl>
 # Comment: Only emits GPRMC when it has a fix.
 # Date: 12 Mar 2005
diff --git a/test/stable/garmin25lp.log b/test/stable/garmin25lp.log
index 223880bf..0724e59d 100644
--- a/test/stable/garmin25lp.log
+++ b/test/stable/garmin25lp.log
@@ -1,7 +1,5 @@
 # Name: Garmin 25LP
 # Chipset: Garmin proprietary, emits NMEA 2.0
-# Cycle-time: 1s
-# Start-of-cycle: GPRMC
 # Submitted-by: Daniele Giangrazi <daniele.giangrazi@elital.net>
 # Date: 22 Mar 2005
 $GPRMC,120316,V,4221.4394,N,01321.9948,E,000.0,000.0,150305,001.4,E*63
diff --git a/test/stable/garmin38.log b/test/stable/garmin38.log
index 42d7c4b8..3b42cb29 100644
--- a/test/stable/garmin38.log
+++ b/test/stable/garmin38.log
@@ -1,6 +1,4 @@
 # Name: Garmin 38
-# Cycle-time: 2s
-# Start-of-cycle: GPRMC
 # Submitted-by: "Pascal F. Martin" <pascal.martin@cox.net>
 # Date: 18 Mar 2005
 $PGRME,19.2,M,28.7,M,34.6,M*18
diff --git a/test/stable/garmin48.log b/test/stable/garmin48.log
index 1997d54a..8e787b8c 100644
--- a/test/stable/garmin48.log
+++ b/test/stable/garmin48.log
@@ -1,8 +1,6 @@
 # Name: Garmin 48
 # Chipset: Garmin proprietary
 # Description: a handheld from about 2000.
-# Cycle-time: 2s
-# Start-of-cycle: GPRMC
 #
 # Note that the GPGLL timestamp has a 1-second offset
 # from the GPRMC and GPGGA timestamps. Appears to take 2 fixes
diff --git a/test/stable/gps-360.log b/test/stable/gps-360.log
index d512bbc2..6e41b000 100644
--- a/test/stable/gps-360.log
+++ b/test/stable/gps-360.log
@@ -1,7 +1,5 @@
 # Name: Pharos GPS-360
 # Chipset: SiRfII
-# Cycle-time: 1s
-# Start-of-cycle: GPGGA
 # Submitted-by: "Jeff Fisher" <guppy@techmonkeys.org>
 # Date: 27 July 2006
 # Location: Regina, Saskatchewan, Canada, 50N104W
diff --git a/test/stable/gpslim236.log b/test/stable/gpslim236.log
index 5cbe660e..3aa3922d 100644
--- a/test/stable/gpslim236.log
+++ b/test/stable/gpslim236.log
@@ -1,7 +1,5 @@
 # Name: Holux GPSlim 236
 # Chipset: SiRF-III
-# Cycle-time: 1s
-# Start-of-cycle: GGA
 # Submitted-by:  "Kévin REDON" <kevredon@gmail.com>
 # Date: 22 Jul 2006 
 $GPGGA,185244.000,4854.2575,N,00219.9816,E,1,05,1.7,124.4,M,47.3,M,,0000*56
diff --git a/test/stable/holux-gm-210.log b/test/stable/holux-gm-210.log
index d2fcd3f9..e1f4deb9 100644
--- a/test/stable/holux-gm-210.log
+++ b/test/stable/holux-gm-210.log
@@ -1,6 +1,5 @@
 # Name: Holux GM-210
 # Chipset: SiRF-II
-# Start-of-cycle: GPGGA
 # Submitted-by: "Patrick L. McGillan" <pmcgillan@pateri.com>
 # Date: 4 Apr 2005
 $GPGGA,012519.563,4131.7353,N,09336.8150,W,0,00,50.0,280.2,M,-31.6,M,0.0,0000*7D
diff --git a/test/stable/humminbird-M37.log b/test/stable/humminbird-M37.log
index a9f8a388..ba192bfe 100644
--- a/test/stable/humminbird-M37.log
+++ b/test/stable/humminbird-M37.log
@@ -1,6 +1,4 @@
 # Name: Humminbird Matrix 37 Fishing System, Humminbird GR16 Receiver
-# Cycle-time: 4s
-# Start-of-cycle: ?
 # Submitted-by: "Carl Brown"<cbsled@verizon.net>
 # Date: 16 September 2006
 # Location: Connecticut River, New Hampshire, USA, 44N71W
diff --git a/test/stable/iTrek.log b/test/stable/iTrek.log
index 1e6fa744..faddf180 100644
--- a/test/stable/iTrek.log
+++ b/test/stable/iTrek.log
@@ -1,6 +1,4 @@
 # Name: i.Trek M3
-# Cycle-time: 1s
-# Start-of-cycle: ?
 # Submitted-by: "Lance Fetters" <ashikase@users.sourceforge.net>
 # Date: 27 Jul 2005
 # Location: Anpachi, Gifu, JP, 35N136E
diff --git a/test/stable/magellan-ec10.log b/test/stable/magellan-ec10.log
index f22afdcc..03a30c17 100644
--- a/test/stable/magellan-ec10.log
+++ b/test/stable/magellan-ec10.log
@@ -1,6 +1,4 @@
 # Name: Magellan EC-10X
-# Cycle-time: 2s
-# Start-of-cycle: GPMRC on odd seconds, GPRMB on even seconds
 # Submitted-by: "Gary E. Miller" <gem@rellim.com>
 # Date: 9 Jun 2005, 20:52 UTC
 # Location: Bend, OR 44N121W
diff --git a/test/stable/magellan315.log b/test/stable/magellan315.log
index 268b0ea4..bed527f7 100644
--- a/test/stable/magellan315.log
+++ b/test/stable/magellan315.log
@@ -1,6 +1,4 @@
 # Name: Magellan 315
-# Cycle-time: 1s
-# Start-of-cycle: GPGLL
 # Submitted-by: Ángel Marqués Mateu <amarques@cgf.upv.es>
 # Date: 12 Mar 2005
 $GPGLL,3908.8199,N,00023.0832,W,120824.758,A*22
diff --git a/test/stable/mkt-3301.log b/test/stable/mkt-3301.log
index b4fa873c..c856e02c 100644
--- a/test/stable/mkt-3301.log
+++ b/test/stable/mkt-3301.log
@@ -1,7 +1,5 @@
 # Name: San Jose Navigation FV-M11
 # Chipset: MKT-3301
-# Cycle-time: 1-second
-# Start-of-cycle: $GPGGA
 # Submitted-by: "Henk Fijnvandraat" 
 # Date: 23 August 2008
 # Location: Enschede, NL, 52.21N 6.88E
diff --git a/test/stable/nl402u.log b/test/stable/nl402u.log
index 26a71b5d..2724457e 100644
--- a/test/stable/nl402u.log
+++ b/test/stable/nl402u.log
@@ -1,6 +1,5 @@
 # Name: NL-402U USB Empfänger
 # Chipset: u-blox5 GPS & GALILEO SuperSense®
-# Cycle-time: 1s
 # Submitted-by: Klaus Plöger k.ploeger@gastradata.de
 # Date: 2008:07:24
 $GPTXT,01,01,02,u-blox ag - www.u-blox.com*50
diff --git a/test/stable/oncore.log b/test/stable/oncore.log
index b5451b24..7065a0b1 100644
--- a/test/stable/oncore.log
+++ b/test/stable/oncore.log
@@ -1,6 +1,4 @@
 # Name: Oncore GT+
-# Cycle-time: 1s
-# Start-of-cycle: GPGGA
 # Submitted-by: Wojciech Kazubski <wk@ire.pw.edu.pl>
 # Date: 12 Apr 2005
 $GPGSV,3,1,09,02,33,299,27,04,43,242,26,08,12,202,,13,85,356,*70
diff --git a/test/stable/pharos-360.log b/test/stable/pharos-360.log
index 931e526d..492ca2dd 100644
--- a/test/stable/pharos-360.log
+++ b/test/stable/pharos-360.log
@@ -1,7 +1,5 @@
 # Name: Pharos GPS-360
 # Chipset: Sirf-II
-# Cycle-time: 1s
-# Start-of-cycle: GGA
 # Submitted-by: "Jeff Fisher" <guppy@techmonkeys.org>
 # Date: 27 July 2006
 # Location: Regina, Saskatchewan, Canada, 50N104W
diff --git a/test/stable/rgm3800.log b/test/stable/rgm3800.log
index bf88d9a2..fd960b99 100644
--- a/test/stable/rgm3800.log
+++ b/test/stable/rgm3800.log
@@ -1,7 +1,5 @@
 # Name: Royaltek RGM-3800
 # Chipset: Sirf GSC3f/LP ?
-# Cycle-time: 1-second
-# Start-of-cycle: ?
 # Submitted-by: "Philipp Klenze" <hq.ks@web.de>
 # Location: TU Munich, Garching, DE, 48.3N, 11.7E
 #
diff --git a/test/stable/tn200-all.log b/test/stable/tn200-all.log
index 8192d9df..3f69f74d 100644
--- a/test/stable/tn200-all.log
+++ b/test/stable/tn200-all.log
@@ -1,6 +1,5 @@
 # Name: Rayming Tripnav TN-200
 # Chipset: SiRF-II
-# Start-of-cycle: GPGGA
 # Submitted-by: "Chris Kuethe" <chris.kuethe@gmail.com>
 # Date: 8 Jun 2005
 # Location: Edmonton, Alberta, CA 53N113W
diff --git a/test/stable/tn200.log b/test/stable/tn200.log
index dd8ff65b..71fc74bc 100644
--- a/test/stable/tn200.log
+++ b/test/stable/tn200.log
@@ -1,6 +1,5 @@
 # Name: Rayming Tripnav TN-200
 # Chipset: SiRF-II
-# Start-of-cycle: GPGGA
 # Submitted-by: "Chris Kuethe" <chris.kuethe@gmail.com>
 # Date: 8 Jun 2005
 # Location: Edmonton, Alberta, CA 53N113W
diff --git a/test/stable/uBlox-lea-4h.log b/test/stable/uBlox-lea-4h.log
index 3ba96970..70eb9456 100644
--- a/test/stable/uBlox-lea-4h.log
+++ b/test/stable/uBlox-lea-4h.log
@@ -1,8 +1,6 @@
 # Name: uBlox LEA-4H module
 # Chipset: ANTARIS
 # Description: uBlox LEA-4H module
-# Cycle-time: 1s
-# Start-of-cycle: GPRMC
 # Submitted-by: "Dave Hylands" dhylands@gmail.com 
 # Date: 10 Aug 2006
 # Location: Surrey, British Columbia, Canada, 49.126356N 122.710015W
diff --git a/test/stable/uBlox-lea-4s.log b/test/stable/uBlox-lea-4s.log
index 07d1cd7e..a9f93b5b 100644
--- a/test/stable/uBlox-lea-4s.log
+++ b/test/stable/uBlox-lea-4s.log
@@ -1,7 +1,5 @@
 # Name: LEA-4S
 # Chipset: ANTARIS
-# Cycle-time: 1s
-# Start-of-cycle: ?
 # Submitted-by: "Ali Utku Selen" <selenau@kentkart.com.tr>
 # Date: 11 Dec 2006
 # Location: İzmir, TR, 38N27E
diff --git a/www/faq.html b/www/faq.html
index 45803e45..8cd14928 100644
--- a/www/faq.html
+++ b/www/faq.html
@@ -167,8 +167,6 @@ Here is the beginning of one log file I already have:</p>
 <pre>
 # Name: Magellan eXplorist 210
 # Chipset: unknown
-# Cycle-time: 1-second
-# Start-of-cycle: $GPGLL
 # Submitted-by: "Paul B van den Berg" <paulberg@wanadoo.nl>
 # Date: 20 May 2006
 # Location: Groningen, NL, 53.2N 6.6E
@@ -207,16 +205,12 @@ $GPGSV,3,2,10,29,26,162,,18,24,255,42,22,24,298,44,28,10,056,*75
 $GPGSV,3,3,10,14,09,319,,11,03,016,,136,27,157,,124,28,162,*71
 </pre>
 
-<p>The way to fill in the Name, Cycle-Time, Submitted-by, and Date
+<p>The way to fill in the Name, Submitted-by, and Date
 headers should be pretty obvious.</p>
 
 <p>Chipset should include the name and (if possible) model and/or
 firmware revision  of the chipset in the GPS.</p>
 
-<p>Start-of-cycle should be the name of the NMEA sentence (or, in a
-packet protocol, the numeric type ID of the packet) that is emitted
-first in each cycle.</p>
-
 <p>Please also include a Location header giving your city,
 state/province, country code, and a rough latitude/longitude.</p>
 
diff --git a/www/gps_report.cgi b/www/gps_report.cgi
index 83bebd7c..0eba4e4d 100644
--- a/www/gps_report.cgi
+++ b/www/gps_report.cgi
@@ -50,7 +50,7 @@ if (hasNeededElements($query) && $query->param("action") eq "Send Report"){
 	$msg .= sprintf("type = device\n");
 	foreach $var ( sort qw(submitter vendor model packaging techdoc chipset
                         firmware nmea interface tested rating noconfigure 
-                        location date interval leader notes sample_notes)){
+                        location date notes sample_notes)){
 		$val = $query->param($var);
 		$msg .= sprintf("\t%s = %s\n", $var, $val) if (defined($val) && $val);
 	}
@@ -350,31 +350,6 @@ print"<em>Date:</em>",$query->textfield(-name=>"date", -size=>72);
 
 print <<EOF;
 
-<p>If the receiver is a GPS, the default sampling interval in seconds (not
-relevant for AIS receivers).  This will usually be 1.  For SiRF chips it's
-always 1 and you can leave it blank; it's mainly interesting for NMEA devices
-with unknown chipsets.</p>
-
-EOF
-
-print"<em>Sampling interval:</em>",$query->textfield(-name=>"interval",
-						     -size=>6);
-
-print <<EOF;
-
-<p>First sentence in the GPS's reporting cycle (not relevant or AIS
-receivers).  Leave this blank for SiRF devices; it is mainly interesting for
-NMEA devices with unknown chipsets.  You may be able to read it from the
-manual; if not, slowing the GPS to 4800 will probably make the intercycle pause
-visible.</p>
-
-EOF
-
-print"<em>First sentence:</em>",$query->textfield(-name=>"leader",
-						  -size=>20);
-
-print <<EOF;
-
 <p>Finally, add any notes you want to about how the sample was taken.  One
 good thing to put here would a description of how the unit was moving while the
 log was being captured.  If the sentence mix changes between "fix" and "no fix"
@@ -488,18 +463,6 @@ if ($query->param("date")) {
     print "No sample date specified.<br/>\n";
 }
 
-if ($query->param("interval")) {
-    print "Sampling interval <code>". escapeHTML($query->param("interval")) ."</code><br/>\n";
-} else {
-    print "No sampling interval specified.<br/>\n";
-}
-if ($query->param("leader")) {
-    print "Leading sentence <code>". escapeHTML($query->param("leader")) ."</code><br/>\n";
-} else {
-    print "No leading sentence specified.<br/>\n";
-}
-
-
 if ($query->param("sample_notes")) {
     print "Notes on the sample have been entered.";
 } else {