Fix a mismatch between gppscap.py and the report CGI.

2 files changed, 65 insertions, 63 deletions

diff --git a/gpscap.ini b/gpscap.ini
index f6f24c4b..894cda3b 100644
--- a/gpscap.ini
+++ b/gpscap.ini
@@ -23,7 +23,7 @@
 # tested       = last gpsd tested, or "regression" if we have a test load
 # nmea	       = NMEA version this emits, if known
 # notes	       = Miscellaneous notes on this item.  To be interpreted as HTML.
-# status       = excellent, good, fair, poor, broken, other
+# rating       = excellent, good, fair, poor, broken, other
 # discontinued = If present, product has been discontinued
 #
 # Capability strings:
@@ -58,7 +58,7 @@
 #   A "handset" is a standalone GPS with a display and human-usable
 #   controls. A "handsfree" is a hands-free unit with display designed for 
 #   mounting on a car windshield or boat dash.
-# * In the status field:
+# * In the rating field:
 #    "excellent" - gpsd recognizes the GPS rapidly and reliably,
 #		  reports are complete and correct.
 #    "good" -- gpsd has minor problems or lag recognizing the device,
@@ -87,7 +87,7 @@ engine = SiRF-1
 nmea = 2.2
 uses = GenericSiRF
 tested = 2.34
-status = good
+rating = good
 logs = uBlox-sirf1.log
 notes = uBlox-sirf1.log was made from a devixcce with uBlox firmware and 
       may not be typical of SirF-1 chips.
@@ -100,7 +100,7 @@ engine = SiRF-2
 nmea = 2.2
 uses = GenericSiRF
 tested = 2.37
-status = good
+rating = good
 logs = bu303b-nofix.log, bu303-climbing.log, bu303-moving.log, 
      bu303-nofix.log, bu303-stillfix.log, haicom-305N.log, holux-gm-210.log, 
      pharos-360.log, tn200-all.log, tn200.log, tn204.log
@@ -116,7 +116,7 @@ engine = SiRF-3
 nmea = 3.01
 uses = GenericSiRF
 tested = 2.37
-status = good
+rating = good
 logs = blumax-gps009.log, gpslim236.log, motorola-t805.log, rgm3800.log
 notes = The Blumax log is in NMEA mode.  Start of cycle is GGA, End of cycle 
       is RMC. Some variants (like the Blumax) emit ZDA before GGA; others 
@@ -126,7 +126,7 @@ notes = The Blumax log is in NMEA mode.  Start of cycle is GGA, End of cycle
 type = engine
 engine = MSB2122
 nmea = 2.3
-status = good
+rating = good
 techdoc = http://www.mstar-europe.com/products.php
 notes = Code-named "Poseidon 2", this appears to be a MIPS core. May
 	ship with serious bugs that cause bogus fixes or hard crashes.
@@ -135,7 +135,7 @@ notes = Code-named "Poseidon 2", this appears to be a MIPS core. May
 type = engine
 engine = ANTARIS
 nmea = 2.3
-status = good
+rating = good
 techdoc = http://www.u-blox.com/products/tim_lp.html
 discontinued = True
 notes = The ANTARIS chipset has been end-of-lifed.
@@ -145,9 +145,9 @@ type = engine
 engine = ANTARIS4
 techdoc = http://www.u-blox.com/products/a4products.html
 nmea = 2.3
-status = good
+rating = good
 notes = Sends 'E' in second field of GSA record, not an NMEA value.
-      Actually sends '6' in the GGA status record for dead-reckoning fixes.
+      Actually sends '6' in the GGA rating record for dead-reckoning fixes.
       (This behavior reported on the 4H chipset.)
 logs = uBlox-lea-4h.log, uBlox-lea-4s.log, uBlox-lea-4t.log
 
@@ -155,7 +155,7 @@ logs = uBlox-lea-4h.log, uBlox-lea-4s.log, uBlox-lea-4t.log
 type = engine
 techdoc = http://www.fastraxgps.com/products/gpsmodules/index.cfm?template=products.show.cfm&productGuid=4594da1a-503c-469c-91b2-6948043189be
 engine = FastraX iTrax03
-status = good
+rating = good
 logs = com-1289.log
 notes = Start of fix cycle is RMC, end is GGA (GSVs may come after).
 
@@ -164,19 +164,19 @@ type = engine
 engine = Garmin
 description = There are several versions; the differences are not clear.
 techdoc = http://www.garmin.com/support/commProtocol.html
-status = good
+rating = good
 
 [MTK]
 type = engine
 nmea = 3.01
 engine = MTK
-status = good
+rating = good
 
 [Nemerix]
 type = engine
 engine = Nemerix
 nmea = 3.01
-status = good
+rating = good
 notes = NemeriX has gone into liquidation as of Jan 2009).  It's funny, they
 	didn't understand why they should give me an unencumbered protocol
 	techdoc.
@@ -186,19 +186,19 @@ type = engine
 engine = NovAtel-L1
 techdoc = http://www.novatel.com/Documents/Manuals/om-20000086.pdf
 nmea = 2.20
-status = good
+rating = good
 notes = Seems to be built around the Zarlink GP4020.
 
 [Sony CXD2951]
 type = engine
 techdoc = http://gpsd.berlios.de/vendor-docs/cxd2951-commands.pdf
 engine = Sony CXD2951
-status = good
+rating = good
 
 [Touchstone ASIC]
 type = engine
 engine = Touchstone ASIC
-status = good
+rating = good
 techdoc = http://www.navcomtech.com/Products/GPS/Touchstone.cfm
 
 [uNav]
@@ -207,7 +207,7 @@ engine = uN3010
 nmea = 3.01
 notes = uNav was acquired by Atheros in 2007.  They have inherited
       one GPS product, now designated uN3010.
-status = good
+rating = good
 
 [Zodiac]
 type = engine
@@ -217,7 +217,7 @@ tested = 2.0
 techdoc = http://www.gpskit.nl/downloads-en.htm
 notes = This chip was made by Rockwell International.  It was
       also known as the Jupiter. It has been EOLed.
-status = good
+rating = good
 logs = zodiac.log
 
 [BD960]
@@ -229,7 +229,7 @@ notes = Spec sheet says it emits GSV, AVR, RMC, HDT, VGK, VHD, GGLK, GGA, GSA,
       ZDA, VTG, GST, and PIT in NMEA mode. Many of these are nonstandard.
       Also says: "JK and Binary: Trimble GSOF".  Other web sources say
       it has RTK capability.
-status = good
+rating = good
 
 #
 # Vendors (alphabetical by vendor)
@@ -474,7 +474,7 @@ engine = SKYTRAK
 interfaces = USB
 nmea = 3.01
 packaging = mouse
-status = good
+rating = good
 submitter = Rene Warren <warrenlr@gmail.com>
 techdoc = http://www.canmore.com.tw/pdf/English%20user%20manual_GT-730F_L.pdf
 tested = 2.33
@@ -565,7 +565,7 @@ techdoc = http://www.yachtronics.com/yachtronics/manuals/DIGITAL%20YACHT%20AIT25
 interfaces = RS232C
 discontinued = False
 tested = regression
-status = good
+rating = good
 submitter = Jan Veninga <veninga@familiemail.nl>
 notes = Both a Class B AIS transceiver and a GPS.
 logs = ait250.log
@@ -580,7 +580,7 @@ techdoc = http://www.eurotech.fi/products/COM-1289.html
 engine = FastraX iTrax03
 interfaces = RS232
 tested = regression
-status = good
+rating = good
 submitter = Simon Le Pape <simon.le-pape@hotmail.fr>
 notes = 
 
@@ -657,7 +657,7 @@ techdoc = https://buy.garmin.com/shop/shop.do?cID=158&pID=8630
 engine = unknown
 interfaces = RS232
 tested = 2.37
-status = good
+rating = good
 nmea = 2.0 or 3.0
 notes = Reported by Ulrich Voigt (no email address)
 
@@ -713,7 +713,7 @@ packaging = handset
 techdoc = http://au.geocities.com/glennbaddeley/gps/data/GPS38_OwnersManualAndTechdoc_June1997_RevB.pdf
 uses = Garmin
 interfaces = RS232
-status = excellent
+rating = excellent
 tested = regression
 nmea = 2.0
 discontinued = True
@@ -730,7 +730,7 @@ uses = Garmin
 interfaces = RS232
 nmea = 2.0
 discontinued = True
-status = excellent
+rating = excellent
 tested = regression
 notes = Start-of-cycle is RMC. 2-second cycle time, 2 fixes per cycle, GLL 
       reports second fix. The 48 has been discontinued.  The Garmin
@@ -801,7 +801,7 @@ uses = SiRF-3
 interfaces = USB
 tested = *
 nmea = 3.0
-status = broken
+rating = broken
 notes = This device does not have real-time data output, and is incompatible with GPSD.
 
 #% GlobalSat
@@ -849,7 +849,7 @@ uses = SiRF-2
 interfaces = USB
 usbchip = pl2303
 tested = regression
-status = excellent
+rating = excellent
 eval_unit = esr
 nmea = 2.2
 notes = Older versions of the BU-303 had a
@@ -887,15 +887,17 @@ tested = 2.37
 [BT-451]
 type = device
 chipset = ANTARIS ATR062x
+engine= ANTARIS4
 date = 9 Dec 2009
 location = Lithuania, 55.8N 23.6E
 model = BT-451
 packaging = mouse
+interfaces = USB
 rating = good
 submitter = Mindaugas <mindedie@zebra.lt>
         techdoc =http://www.navilock.de/produkte/gruppen/28/Nicht_mehr_lieferbare_Artikel/60307_BT-451.html?show=spec
 tested = 2.39
-vendor = Navilock
+vendor = NaviLock
 logs = bt451.log
 
 [TripNav TN-200]
@@ -907,7 +909,7 @@ uses = SiRF-2
 interfaces = USB
 usbchip = FTDI FT232
 tested = regression
-status = excellent
+rating = excellent
 notes = We tested a version with SiRF Firmware level 231ES. The <a
       href='http://ftdi-usb-sio.sourceforge.net/'>FTDI USB-to-serial
       chip</a> is supported only as alpha software not yet
@@ -923,7 +925,7 @@ packaging = mouse
 uses = SiRF-2
 interfaces = CF
 tested = regression
-status = excellent
+rating = excellent
 submitter = Pascal F. Martin <pascal.martin@cox.net>
 notes = Sometimes sold under the brand name "Rayming", but that vendor
       seems to have disappeared.  Chipset said ton be SiRF 2 but the
@@ -936,7 +938,7 @@ interfaces = USB
 usbchip = pl2303
 nmea = 3.0
 packaging = mouse
-status = excellent
+rating = excellent
 submitter = Arnaud Le Meur <arnaudlemeur@free.fr>
 techdoc = http://www.globalsat.com.tw/eng/product_detail_00000124.htm
 tested = 2.38
@@ -956,7 +958,7 @@ uses = SiRF-2
 interfaces = USB
 usbchip = pl2303
 tested = 2.24
-status = excellent
+rating = excellent
 eval_unit = esr
 nmea = 2.2
 notes = SiRF firmware level 231ES (XTrac). Haicom provided a test unit. Manual
@@ -970,7 +972,7 @@ techdoc = http://www.haicom.com.tw/gps204E.shtml
 engine = Evermore BBP1202
 interfaces = USB
 tested = 2.6
-status = excellent
+rating = excellent
 nmea = 2.2
 notes = Probably uses PL2303 but we have not verified this.
 
@@ -1028,7 +1030,7 @@ tested = 2.19
 nmea = 2.2
 discontinued = True
 notes = 4 color LED showing: Bluetooth, Navigation Update and Battery
-      and Charger Status Indication. FLASH based program
+      and Charger Rating Indication. FLASH based program
       memory. Firmware upgradeable through serial interface. Water
       resistant.
 
@@ -1040,7 +1042,7 @@ techdoc = http://en.holux.com.cn/product/search.htm?filename=gpsreceiver_bluetoo
 uses = SiRF-3
 interfaces = Bluetooth
 tested = regression
-status = poor
+rating = poor
 nmea = 2.2
 submitter = K&eacute;vin Redon <kevredon@gmail.com>
 notes = Does not report altitude reliably.
@@ -1061,7 +1063,7 @@ uses = SiRF-3
 interfaces = Bluetooth, USB
 noconfigure = True
 tested = 2.36
-status = poor
+rating = poor
 nmea = 2.2
 notes = Bluetooth operation requires -b option.  Powered from a car
       cigarette-lighter.
@@ -1095,7 +1097,7 @@ engine = unknown
 interfaces = RS232
 discontinued = True
 tested = regression
-status = good
+rating = good
 submitter = Carl Brown <cbsled@verizon.net>
 notes = Depth finder and water-temperature sensor.
 logs = humminbird-M37.log
@@ -1127,7 +1129,7 @@ interfaces = RS-232
 nmea = 2.3
 notes = Only outputs GGA and RMC NMEA strings. There are other proprietary commands. 2.39 was patched to a unique NMEA termination of /r/r/n. See gpsd-developers list for patches
 packaging = OEM module
-status = excellent
+rating = excellent
 submitter = Don Weeks <don.l.weeks.jr@gmail.com>
 techdoc = http://jackson-labs.com/docs/FireFly_quickstart.pdf
 tested = 2.39
@@ -1159,7 +1161,7 @@ techdoc = https://www.magellangps.com/assets/manuals/gps_310_315_en.pdf
 engine = unknown
 interfaces = RS232
 tested = regression
-status = good
+rating = good
 submitter = Ángel Marqués Mateu <amarques@cgf.upv.es>
 notes = 
 logs = magellan315.log
@@ -1172,7 +1174,7 @@ techdoc = http://www.amazon.com/Magellan-Meridian-Platinum-Handheld-GPS/dp/B0000
 engine = Motorola
 interfaces = RS232
 tested = 2.21
-status = excellent
+rating = excellent
 nmea = v1.5 APA, v1.5 XTE, v2.1 GSA
 discontinued = true
 submitter = Chris S. Newell <chris@newellfamily.net>
@@ -1185,7 +1187,7 @@ techdoc = http://www.magellangps.com/assets/manuals/newprod/eXplorist%20210_US.p
 engine = unknown
 interfaces = USB
 tested = regression
-status = good
+rating = good
 nmea = 2.1
 submitter = Paul van den Berg <paulberg@wanadoo.nl>
 notes = USB has 3 modes &mdash; NMEA data comm (3 submodes): outputs GPS data
@@ -1204,7 +1206,7 @@ engine = unknown
 interfaces = TTL
 nmea = 3.0
 tested = regression
-status = good
+rating = good
 pps = True
 submitter = Chris Kuethe <chris.kuethe@gmail.com>
 notes = Receiver comes up in silent mode, you may need to use ashctl to turn
@@ -1223,7 +1225,7 @@ interfaces = RS232 or TTL
 tested = 2.20
 nmea = 2.2
 pps = True
-status = good
+rating = good
 discontinued = True
 submitter = Wojciech Kazubski <wk@ire.pw.edu.pl>
 notes = The Motorola Oncore product family has been discontinued.
@@ -1254,7 +1256,7 @@ techdoc = http://www.navcomtech.com/Products/GPS/sf2040g.cfm
 uses = Touchstone ASIC
 interfaces = RS232, Bluetooth, Radio (untested)
 tested = 2.35
-status = good
+rating = good
 nmea = 3.0
 submitter = Diego Berge <gpsd@nippur.net>
 
@@ -1269,7 +1271,7 @@ uses = SiRF-2
 interfaces = USB
 usbchip = pl2303
 tested = 2.24
-status = excellent
+rating = excellent
 submitter = Jeff Francis <jeff@gritch.org>
 notes = Included with the horrible Windows navigation software from
       Rand McNally.
@@ -1318,7 +1320,7 @@ location = Neustadt / Holstein 54.05N 10.49 E
 model = NL-402U USB Empfänger
 interfaces = USB
 packaging = mouse
-status = excellent
+rating = excellent
 submitter = Klaus Plöger <k.ploeger@gastradata.de>
 techdoc = http://www.navilock.de/download/PDFs/60095_-_NL-402U_Datenblatt/531
 tested = regression
@@ -1355,7 +1357,7 @@ nmea = 3.0?
 packaging = mouse
 interfaces = USB
 usbchip = FTDI FT232
-status = good
+rating = good
 submitter = walkie@mail.ru
 techdoc = http://www.navis.ru/downloads/CH-4711_USB/
 logs = ch-4711.log
@@ -1377,13 +1379,13 @@ location = East Haddon, Northampton, England, UK, 53.3N, 1.02W
 model = GR-300
 nmea = 3.0
 packaging = mouse
-status = excellent
+rating = excellent
 submitter = sk1ppy14@yahoo.co.uk
 techdoc = http://www.navisys.com.tw/products/image/GR-300_flyer-080409.pdf
 tested = 2.38
 vendor = Navisys
 notes = Also includes an (untested) Bluetooth interface. Has two LEDs: 
-      blue for bluetooth, green for status. Solid green = on and searching 
+      blue for bluetooth, green for rating. Solid green = on and searching 
       for satellite fixes. Blinking green = on and has 3D fix.
       Also a similar GR-310 version available. It is possible that only GR-310 
       supports Bluetooth. Programs only seem to be able to communicate 
@@ -1441,7 +1443,7 @@ techdoc = http://www.parrot.biz/uk/products/ck3300gps
 engine = unknown
 interfaces = Bluetooth
 tested = 2.35
-status = good
+rating = good
 nmea = 2.?
 submitter = Andy Brown <andy@thebmwz3.co.uk>
 notes = In-car hands-free bluetooth phone and GPS device. Outputs NMEA
@@ -1580,7 +1582,7 @@ techdoc = http://www.sanav.com/gps_engine_board/fv-18.htm
 engine = FV-18
 interfaces = UART
 tested = 2.0
-status = good
+rating = good
 nmea = 2.3
 notes = Special gpsd support uses 8N2 and requests sentences that gpsd requires.
       OEM module only, not a retail product.
@@ -1610,7 +1612,7 @@ packaging = OEM module
 techdoc = http://www.sanav.com/gps_engine_board/FV-M7_FV-M11.htm
 interfaces = UART
 nmea = 3.01
-status = good
+rating = good
 tested = regression
 submitter = Henk Fijnvandraat (no email address)
 notes = 
@@ -1626,7 +1628,7 @@ interfaces = RS232
 tested = 2.21
 nmea = 2.x
 discontinued = True
-status = broken
+rating = broken
 notes = Ships bad packet checksums when it does not have a fix.
 
 #% Techway
@@ -1668,7 +1670,7 @@ techdoc = http://www.tomtom.com/products/product.php?ID=475&Category=0&Lid=4
 engine = SiRF-3
 interfaces = USB
 nmea = None
-status = broken
+rating = broken
 notes = This device does not have real-time data output, and is incompatible
       with GPSD.
 
@@ -1682,7 +1684,7 @@ techdoc = http://www.trimble.com/lassensk2.shtml
 engine = Colossus RF ASIC, Scorpion DSP
 interfaces = UART
 tested = 2.26
-status = good
+rating = good
 nmea = 2.1
 notes = Reported by Rob Janssen (no email address)
 
@@ -1696,7 +1698,7 @@ interfaces = USB,RS232
 pps = True
 usbchip = CP2102
 tested = regression
-status = good
+rating = good
 nmea = 3.0
 submitter = Chris Kuethe <chris.kuethe@gmail.com>
 logs = trimble-lassen_iq-3dfix.log, trimble-lassen_iq-playacar.log,
@@ -1710,7 +1712,7 @@ techdoc = http://www.trimble.com/embeddedsystems/pdf/bx960_ds.pdf
 engine = BD960
 interfaces = Ethernet
 tested = regression
-status = good
+rating = good
 submitter = Miika Ojanen <mojanen@hytti.uku.fi>
 notes = Firmware versoon 4.00, dated 2009-03-10
 
@@ -1760,7 +1762,7 @@ interfaces = Bluetooth, USB
 usbchip = CP2101
 tested = regression
 nmea = 3.0
-status = good
+rating = good
 submitter = Chris Kuethe <chris.kuethe@gmail.com>
 notes = This receiver operates correctly as a generic NMEA device,
       iTalk support is also functional, though switching between NMEA
diff --git a/gpscap.py b/gpscap.py
index a57716d2..ff5ca2e5 100644
--- a/gpscap.py
+++ b/gpscap.py
@@ -114,15 +114,15 @@ class GPSDictionary(ConfigParser.RawConfigParser):
                         testfield += tested
                 if self.has_option(dev, "noconfigure"):
                     testfield += "<img title='Requires -b option' src='noconfigure.png'>"
-                if self.get(dev, "status") == "excellent":
+                if self.get(dev, "rating") == "excellent":
                     testfield += "<img src='star.png'/><img src='star.png'/><img src='star.png'/><img src='star.png'/>"
-                elif self.get(dev, "status") == "good":
+                elif self.get(dev, "rating") == "good":
                     testfield += "<img src='star.png'/><img src='star.png'/'><img src='star.png'/>"
-                elif self.get(dev, "status") == "fair":
+                elif self.get(dev, "rating") == "fair":
                     testfield += "<img src='star.png'/><img src='star.png'/>"
-                elif self.get(dev, "status") == "poor":
+                elif self.get(dev, "rating") == "poor":
                     testfield += "<img src='star.png'/>"
-                elif self.get(dev, "status") == "broken":
+                elif self.get(dev, "rating") == "broken":
                     testfield += "<img title='Device is broken' src='bomb.png'/>"
                 if self.has_option(dev, "usbchip") and self.get(dev, "usbchip") in hotpluggables:
                     testfield += "<img src='hotplug.png'/>"