Set telegps USB id to 0025

It was accidentally using the same ID as megadongle...

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/altoslib/AltosLib.java b/altoslib/AltosLib.java
index 192da0a9d765982aedb019eaadb3f33aeecbd149..0b5475f790a38600f29862e609adc39aadbf1c07 100644 (file)
--- a/altoslib/AltosLib.java
+++ b/altoslib/AltosLib.java
@@ -91,8 +91,9 @@ public class AltosLib {
        public final static int product_telepyro =0x0012;
        public final static int product_megametrum = 0x0023;
        public final static int product_megadongle = 0x0024;
+       public final static int product_telegps = 0x0025;
        public final static int product_altusmetrum_min = 0x000a;
-       public final static int product_altusmetrum_max = 0x0024;
+       public final static int product_altusmetrum_max = 0x0025;
 
        public final static int product_any = 0x10000;
        public final static int product_basestation = 0x10000 + 1;

diff --git a/altosuilib/AltosUSBDevice.java b/altosuilib/AltosUSBDevice.java
index a54965977cacd1903c103465aa3559ef3b89682a..5268927c52d7ed6cb2073c65e8b3ecb35c373304 100644 (file)
--- a/altosuilib/AltosUSBDevice.java
+++ b/altosuilib/AltosUSBDevice.java
@@ -76,7 +76,8 @@ public class AltosUSBDevice  extends altos_device implements AltosDevice {
 
                if (want_product == AltosUILib.product_altimeter)
                        return matchProduct(AltosUILib.product_telemetrum) ||
-                               matchProduct(AltosUILib.product_megametrum);
+                               matchProduct(AltosUILib.product_megametrum) ||
+                               matchProduct(AltosUILib.product_telegps);
 
                int have_product = getProduct();
 

diff --git a/src/telegps-v0.1/Makefile b/src/telegps-v0.1/Makefile
index 1e551e15e665872affd4c9f178855146b8930385..aae3766077acf78ce9343ed35a03414b6e8facc8 100644 (file)
--- a/src/telegps-v0.1/Makefile
+++ b/src/telegps-v0.1/Makefile
@@ -67,7 +67,7 @@ ALTOS_SRC = \
 
 PRODUCT=TeleGPS-v0.1
 PRODUCT_DEF=-DTELEGPS
-IDPRODUCT=0x0024
+IDPRODUCT=0x0025
 
 CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) $(SAMPLE_PROFILE_DEF) $(STACK_GUARD_DEF) -Os -g