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

diff --git a/ao-tools/altosui/AltosDevice.java b/ao-tools/altosui/AltosDevice.java
index 9ae522c2..f646305b 100644
--- a/ao-tools/altosui/AltosDevice.java
+++ b/ao-tools/altosui/AltosDevice.java
@@ -39,6 +39,12 @@ public class AltosDevice extends altos_device {
 		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;
@@ -65,26 +71,27 @@ public class AltosDevice extends altos_device {
 
 	static int usb_product_teledongle() {
 		if (load_library())
-			return libaltosConstants.USB_PRODUCT_ALTUSMETRUM;
+			return libaltosConstants.USB_PRODUCT_TELEDONGLE;
 		return 0x000c;
 	}
 
 	static int usb_product_teleterra() {
 		if (load_library())
-			return libaltosConstants.USB_PRODUCT_ALTUSMETRUM;
+			return libaltosConstants.USB_PRODUCT_TELETERRA;
 		return 0x000d;
 	}
 
-	public final static int AltusMetrum = usb_product_altusmetrum();
-	public final static int TeleMetrum = usb_product_telemetrum();
-	public final static int TeleDongle = usb_product_teledongle();
-	public final static int TeleTerra = usb_product_teleterra();
-	public final static int AltusMetrumMin = usb_product_altusmetrum_min();
-	public final static int AltusMetrumMax = usb_product_altusmetrum_max();
+	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 Any = 0x10000;
-	public final static int BaseStation = 0x10000 + 1;
+	public final static int product_any = 0x10000;
+	public final static int product_basestation = 0x10000 + 1;
 
 	public String toString() {
 		String	name = getName();
@@ -95,11 +102,11 @@ public class AltosDevice extends altos_device {
 	}
 
 	public boolean isAltusMetrum() {
-		if (getVendor() != AltusMetrum)
+		if (getVendor() != vendor_altusmetrum)
 			return false;
-		if (getProduct() < AltusMetrumMin)
+		if (getProduct() < product_altusmetrum_min)
 			return false;
-		if (getProduct() > AltusMetrumMax)
+		if (getProduct() > product_altusmetrum_max)
 			return false;
 		return true;
 	}
@@ -109,15 +116,15 @@ public class AltosDevice extends altos_device {
 		if (!isAltusMetrum())
 			return false;
 
-		if (want_product == Any)
+		if (want_product == product_any)
 			return true;
 
-		if (want_product == BaseStation)
-			return matchProduct(TeleDongle) || matchProduct(TeleTerra);
+		if (want_product == product_basestation)
+			return matchProduct(product_teledongle) || matchProduct(product_teleterra);
 
 		int have_product = getProduct();
 
-		if (have_product == AltusMetrum)	/* old devices match any request */
+		if (have_product == product_altusmetrum)	/* old devices match any request */
 			return true;
 
 		if (want_product == have_product)