diff options
| author | Keith Packard <keithp@keithp.com> | 2013-04-02 16:43:53 -0700 | 
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2013-04-02 16:43:53 -0700 | 
| commit | 0cd203e418e73a1f11460425985b7575c2f0a76c (patch) | |
| tree | 6ccd344f8d755e1bd19f0af2c4b7fa7d8a2e60bf | |
| parent | 96c32125a780ad6b39c015f4abbae07fead68582 (diff) | |
Set telegps USB id to 0025
It was accidentally using the same ID as megadongle...
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | altoslib/AltosLib.java | 3 | ||||
| -rw-r--r-- | altosuilib/AltosUSBDevice.java | 3 | ||||
| -rw-r--r-- | src/telegps-v0.1/Makefile | 2 | 
3 files changed, 5 insertions, 3 deletions
| diff --git a/altoslib/AltosLib.java b/altoslib/AltosLib.java index 192da0a9..0b5475f7 100644 --- 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 a5496597..5268927c 100644 --- 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 1e551e15..aae37660 100644 --- 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 | 
