X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosDevice.java;h=f646305b3dc178da98433012ef24adabe1cb8136;hp=f488174cf7677e3dc345b1a6875b78d2f5e41d7a;hb=72a5c1258db92d0ddd660bfa875e8e55cab47af7;hpb=e76b9cc32bbcc5176d9bdd6f8d79778024627382

diff --git a/ao-tools/altosui/AltosDevice.java b/ao-tools/altosui/AltosDevice.java
index f488174c..f646305b 100644
--- a/ao-tools/altosui/AltosDevice.java
+++ b/ao-tools/altosui/AltosDevice.java
@@ -22,16 +22,121 @@ import libaltosJNI.*;
 
 public class AltosDevice extends altos_device {
 
+	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;
+		}
+		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;
+	}
+
+	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();
+		if (name == null)
+			name = "Altus Metrum";
 		return String.format("%-20.20s %4d %s",
-				     getProduct(), getSerial(), getPath());
+				     getName(), getSerial(), getPath());
+	}
+
+	public boolean isAltusMetrum() {
+		if (getVendor() != vendor_altusmetrum)
+			return false;
+		if (getProduct() < product_altusmetrum_min)
+			return false;
+		if (getProduct() > product_altusmetrum_max)
+			return false;
+		return true;
 	}
 
-	static {
-		System.loadLibrary("altos");
-		libaltos.altos_init();
+	public boolean matchProduct(int want_product) {
+
+		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 (have_product == product_altusmetrum)	/* old devices match any request */
+			return true;
+
+		if (want_product == have_product)
+			return true;
+
+		return false;
 	}
-	static AltosDevice[] list(String product) {
+
+	static AltosDevice[] list(int product) {
+		if (!load_library())
+			return null;
+
 		SWIGTYPE_p_altos_list list = libaltos.altos_list_start();
 
 		ArrayList<AltosDevice> device_list = new ArrayList<AltosDevice>();
@@ -42,7 +147,7 @@ public class AltosDevice extends altos_device {
 				AltosDevice device = new AltosDevice();
 				if (libaltos.altos_list_next(list, device) == 0)
 					break;
-				if (product == null || device.getProduct().startsWith(product))
+				if (device.matchProduct(product))
 					device_list.add(device);
 			}
 			libaltos.altos_list_finish(list);