X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosDevice.java;h=f0fda57bc0b825c71d4af0dfa08180e4b3d4899e;hb=74cab8503b51ba6fb05a4d12a031c749e870b0ef;hp=3daf0742311b254ccfc35360391847c466c3b807;hpb=22800dc094797e1e0ad99124198809d0360f7556;p=fw%2Faltos

diff --git a/ao-tools/altosui/AltosDevice.java b/ao-tools/altosui/AltosDevice.java
index 3daf0742..f0fda57b 100644
--- a/ao-tools/altosui/AltosDevice.java
+++ b/ao-tools/altosui/AltosDevice.java
@@ -22,21 +22,76 @@ import libaltosJNI.*;
 
 public class AltosDevice extends altos_device {
 
-	static boolean initialized = false;
-	static {
-		try {
-			System.loadLibrary("altos");
-			libaltos.altos_init();
+	static public boolean initialized = false;
+	static public boolean loaded_library = false;
+
+	public static boolean load_library() {
+		if (!initialized) {
+			try {
+				System.loadLibrary("altos");
+				libaltos.altos_init();
+				loaded_library = true;
+			} catch (UnsatisfiedLinkError e) {
+				loaded_library = false;
+			}
 			initialized = true;
-		} catch (UnsatisfiedLinkError e) {
-			System.err.println("Native library failed to load.\n" + e);
 		}
+		return loaded_library;
+	}
+
+	static int usb_vendor_altusmetrum() {
+		if (load_library())
+			return libaltosConstants.USB_VENDOR_ALTUSMETRUM;
+		return 0x000a;
+	}
+
+	static int usb_product_altusmetrum() {
+		if (load_library())
+			return libaltosConstants.USB_PRODUCT_ALTUSMETRUM;
+		return 0x000a;
 	}
-	public final static int TeleMetrum = libaltosConstants.USB_PRODUCT_TELEMETRUM;
-	public final static int TeleDongle = libaltosConstants.USB_PRODUCT_TELEDONGLE;
-	public final static int TeleTerra = libaltosConstants.USB_PRODUCT_TELETERRA;
-	public final static int Any = 0x10000;
-	public final static int BaseStation = 0x10000 + 1;
+
+	static int usb_product_altusmetrum_min() {
+		if (load_library())
+			return libaltosConstants.USB_PRODUCT_ALTUSMETRUM_MIN;
+		return 0x000a;
+	}
+
+	static int usb_product_altusmetrum_max() {
+		if (load_library())
+			return libaltosConstants.USB_PRODUCT_ALTUSMETRUM_MAX;
+		return 0x000d;
+	}
+
+	static int usb_product_telemetrum() {
+		if (load_library())
+			return libaltosConstants.USB_PRODUCT_TELEMETRUM;
+		return 0x000b;
+	}
+
+	static int usb_product_teledongle() {
+		if (load_library())
+			return libaltosConstants.USB_PRODUCT_TELEDONGLE;
+		return 0x000c;
+	}
+
+	static int usb_product_teleterra() {
+		if (load_library())
+			return libaltosConstants.USB_PRODUCT_TELETERRA;
+		return 0x000d;
+	}
+
+	public final static int vendor_altusmetrum = usb_vendor_altusmetrum();
+	public final static int product_altusmetrum = usb_product_altusmetrum();
+	public final static int product_telemetrum = usb_product_telemetrum();
+	public final static int product_teledongle = usb_product_teledongle();
+	public final static int product_teleterra = usb_product_teleterra();
+	public final static int product_altusmetrum_min = usb_product_altusmetrum_min();
+	public final static int product_altusmetrum_max = usb_product_altusmetrum_max();
+
+
+	public final static int product_any = 0x10000;
+	public final static int product_basestation = 0x10000 + 1;
 
 	public String toString() {
 		String	name = getName();
@@ -46,50 +101,49 @@ public class AltosDevice extends altos_device {
 				     getName(), getSerial(), getPath());
 	}
 
+	public String toShortString() {
+		String	name = getName();
+		if (name == null)
+			name = "Altus Metrum";
+		return String.format("%s %d %s",
+				     name, getSerial(), getPath());
+
+	}
+
 	public boolean isAltusMetrum() {
-		if (getVendor() != libaltosConstants.USB_VENDOR_ALTUSMETRUM)
+		if (getVendor() != vendor_altusmetrum)
 			return false;
-		if (getProduct() < libaltosConstants.USB_PRODUCT_ALTUSMETRUM_MIN)
+		if (getProduct() < product_altusmetrum_min)
 			return false;
-		if (getProduct() > libaltosConstants.USB_PRODUCT_ALTUSMETRUM_MAX)
+		if (getProduct() > product_altusmetrum_max)
 			return false;
 		return true;
 	}
 
 	public boolean matchProduct(int want_product) {
 
-		if (want_product == Any)
-			return true;
-
-		if (want_product == BaseStation)
-			return matchProduct(TeleDongle) || matchProduct(TeleTerra);
-
 		if (!isAltusMetrum())
 			return false;
 
+		if (want_product == product_any)
+			return true;
+
+		if (want_product == product_basestation)
+			return matchProduct(product_teledongle) || matchProduct(product_teleterra);
+
 		int have_product = getProduct();
 
-		if (want_product == have_product)
+		if (have_product == product_altusmetrum)	/* old devices match any request */
 			return true;
 
-		if (have_product != libaltosConstants.USB_PRODUCT_ALTUSMETRUM)
-			return false;
-
-		String name = getName();
+		if (want_product == have_product)
+			return true;
 
-		if (name == null)
-			return false;
-		if (want_product == libaltosConstants.USB_PRODUCT_TELEMETRUM)
-			return name.startsWith("TeleMetrum");
-		if (want_product == libaltosConstants.USB_PRODUCT_TELEDONGLE)
-			return name.startsWith("TeleDongle");
-		if (want_product == libaltosConstants.USB_PRODUCT_TELETERRA)
-			return name.startsWith("TeleTerra");
 		return false;
 	}
 
 	static AltosDevice[] list(int product) {
-		if (!initialized)
+		if (!load_library())
 			return null;
 
 		SWIGTYPE_p_altos_list list = libaltos.altos_list_start();