From: Keith Packard <keithp@keithp.com>
Date: Thu, 7 Jul 2011 04:36:38 +0000 (-0700)
Subject: altosui: Build device constants into .java code
X-Git-Tag: 0.9.4.3~3
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=80ca066a825646f833ca609190c76c5252118d9a

altosui: Build device constants into .java code

This eliminates a depedency on updates to the system helper library,
which means we don't have to provide a new library on all platforms
just to support a new USB id.

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

diff --git a/altosui/Altos.java b/altosui/Altos.java
index 36490844..96263797 100644
--- a/altosui/Altos.java
+++ b/altosui/Altos.java
@@ -324,50 +324,42 @@ public class Altos {
 	}
 
 	static int usb_vendor_altusmetrum() {
-		if (load_library())
-			return libaltosConstants.USB_VENDOR_ALTUSMETRUM;
-		return 0x000a;
+		load_library();
+		return 0xfffe;
 	}
 
 	static int usb_product_altusmetrum() {
-		if (load_library())
-			return libaltosConstants.USB_PRODUCT_ALTUSMETRUM;
+		load_library();
 		return 0x000a;
 	}
 
 	static int usb_product_altusmetrum_min() {
-		if (load_library())
-			return libaltosConstants.USB_PRODUCT_ALTUSMETRUM_MIN;
+		load_library();
 		return 0x000a;
 	}
 
 	static int usb_product_altusmetrum_max() {
-		if (load_library())
-			return libaltosConstants.USB_PRODUCT_ALTUSMETRUM_MAX;
-		return 0x000d;
+		load_library();
+		return 0x0013;
 	}
 
 	static int usb_product_telemetrum() {
-		if (load_library())
-			return libaltosConstants.USB_PRODUCT_TELEMETRUM;
+		load_library();
 		return 0x000b;
 	}
 
 	static int usb_product_teledongle() {
-		if (load_library())
-			return libaltosConstants.USB_PRODUCT_TELEDONGLE;
+		load_library();
 		return 0x000c;
 	}
 
 	static int usb_product_teleterra() {
-		if (load_library())
-			return libaltosConstants.USB_PRODUCT_TELETERRA;
+		load_library();
 		return 0x000d;
 	}
 
 	static int usb_product_telebt() {
-		if (load_library())
-			return libaltosConstants.USB_PRODUCT_TELEBT;
+		load_library();
 		return 0x000e;
 	}
 
@@ -384,8 +376,7 @@ public class Altos {
 	public final static int product_basestation = 0x10000 + 1;
 
 	static String bt_product_telebt() {
-		if (load_library())
-			return libaltosConstants.BLUETOOTH_PRODUCT_TELEBT;
+		load_library();
 		return "TeleBT";
 	}