gpscap.py now runs polyglot under Python 2 or Python 3.

This required a few tweaks to the database, because the Python 3 version
of configparser does some validation that the Python 2 version did not.

1 files changed, 13 insertions, 18 deletions

diff --git a/gpscap.ini b/gpscap.ini
index 68d9a411..31ec50ae 100644
--- a/gpscap.ini
+++ b/gpscap.ini
@@ -118,7 +118,7 @@ rating = good
 logs = com-1289.log
 notes = Start of fix cycle is RMC, end is GGA (GSVs may come after).
 
-[Garmin]
+[Garmin-Native]
 type = engine
 engine = Garmin
 description = There are several versions; the differences are not clear.
@@ -467,10 +467,6 @@ vendor_site = http://www.navcomtech.com/
 type = vendor
 vendor_site = http://navis.ru/
 
-[Navisys]
-type = vendor
-vendor_site = http://www.navisys.com.tw/
-
 [Navius]
 type = vendor
 vendor_site = http://www.navius.biz/
@@ -887,7 +883,6 @@ submitter = David Ludlow <davel@adsllc.com>
 techdoc = http://www.garmin.com/manuals/GarminMobile10forlaptops_PDAs_TechnicalSpecifications.pdf
 tested = 2.95
 vendor = Garmin
-uses = Garmin
 logs = garmin-10x.log
 
 [Garmin GPS-15]
@@ -895,7 +890,7 @@ type = device
 packaging = OEM module
 vendor = Garmin
 techdoc = http://www.garmin.com/products/gps15/spec.html
-uses = Garmin
+uses = Garmin-Native
 interfaces = RS-232
 tested = 2.33
 nmea = 2.0
@@ -910,7 +905,7 @@ type = device
 packaging = mouse
 vendor = Garmin
 techdoc = http://www.garmin.com/products/gps16/spec.html
-uses = Garmin
+uses = Garmin-Native
 interfaces = RS-232
 tested = 2.38
 nmea = 2.0
@@ -928,7 +923,7 @@ type = device
 packaging = mouse
 vendor = Garmin
 techdoc = http://www.garmin.com/products/gps17/spec.html
-uses = Garmin
+uses = Garmin-Native
 interfaces = RS-232
 tested = regression
 nmea = 2.0 or 3.0
@@ -957,7 +952,7 @@ submitter = Gary E. Miller <gem@rellim.com>
 techdoc = http://www.garmin.com/manuals/GPS18_TechnicalSpecification.pdf
 tested = 2.38
 type = device
-uses = Garmin
+uses = Garmin-Native
 vendor = Garmin
 notes = The USB version requires the Linux kernel garmin_usb driver.
       usbfs is not required after gpsd version 2.39.
@@ -978,7 +973,7 @@ submitter = Gary E. Miller <gem@rellim.com>
 techdoc = http://www.garmin.com/manuals/GPS18_TechnicalSpecification.pdf
 tested = 2.5
 type = device
-uses = Garmin
+uses = Garmin-Native
 vendor = Garmin
 notes = The RS-232 versions can emit NMEA and are found by normal autoconfiguration.
       GPS-18 LVC and GPS-18 LVC/5m have PPS outputs. WAAS is supported.
@@ -991,7 +986,7 @@ type = device
 packaging = OEM module
 vendor = Garmin
 techdoc = http://www8.garmin.com/products/gps25/spec.html
-uses = Garmin
+uses = Garmin-Native
 interfaces = RS-232
 nmea = 2.0
 tested = regression
@@ -1005,7 +1000,7 @@ type = device
 vendor = Garmin
 packaging = handset
 techdoc = http://au.geocities.com/glennbaddeley/gps/data/GPS38_OwnersManualAndTechdoc_June1997_RevB.pdf
-uses = Garmin
+uses = Garmin-Native
 interfaces = RS-232
 rating = excellent
 tested = regression
@@ -1020,7 +1015,7 @@ type = device
 vendor = Garmin
 packaging = handset
 techdoc = https://buy.garmin.com/shop/shop.do?pID=85
-uses = Garmin
+uses = Garmin-Native
 interfaces = RS-232
 nmea = 2.0
 discontinued = True
@@ -1037,7 +1032,7 @@ type = device
 vendor = Garmin
 packaging = handset
 techdoc = http://www.garmin.com/manuals/GPS60_OwnersManual.pdf
-uses = Garmin
+uses = Garmin-Native
 interfaces = USB, RS-232
 tested = 2.33
 nmea = 3.01
@@ -1048,7 +1043,7 @@ type = device
 vendor = Garmin
 packaging = handset
 techdoc = http://www.garmin.com/manuals/GPS76_OwnersManual.pdf
-uses = Garmin
+uses = Garmin-Native
 interfaces = RS-232
 tested = 2.39
 nmea = 2.3
@@ -1066,7 +1061,7 @@ type = device
 vendor = Garmin
 packaging = handset
 techdoc = http://www.garmin.com/manuals/Geko201_OwnersManual.pdf
-uses = Garmin
+uses = Garmin-Native
 interfaces = RS-232
 tested = regression
 nmea = 3.0
@@ -1079,7 +1074,7 @@ type = device
 vendor = Garmin
 packaging = handset
 techdoc = http://www.garmin.com/manuals/eTrexVista_OwnersManual.pdf
-uses = Garmin
+uses = Garmin-Native
 interfaces = RS-232
 tested = 2.32
 nmea = 3.0