Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / ao-tools / altosui / AltosDevice.java

diff --git a/ao-tools/altosui/AltosDevice.java b/ao-tools/altosui/AltosDevice.java
index 3daf0742311b254ccfc35360391847c466c3b807..9ae522c28452b42a1e42fb0abfc5116663f5c269 100644 (file)
--- a/ao-tools/altosui/AltosDevice.java
+++ b/ao-tools/altosui/AltosDevice.java
@@ -22,19 +22,67 @@ 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_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;
        }
-       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;
+
+       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_ALTUSMETRUM;
+               return 0x000c;
+       }
+
+       static int usb_product_teleterra() {
+               if (load_library())
+                       return libaltosConstants.USB_PRODUCT_ALTUSMETRUM;
+               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 Any = 0x10000;
        public final static int BaseStation = 0x10000 + 1;
 
@@ -47,49 +95,39 @@ public class AltosDevice extends altos_device {
        }
 
        public boolean isAltusMetrum() {
-               if (getVendor() != libaltosConstants.USB_VENDOR_ALTUSMETRUM)
+               if (getVendor() != AltusMetrum)
                        return false;
-               if (getProduct() < libaltosConstants.USB_PRODUCT_ALTUSMETRUM_MIN)
+               if (getProduct() < AltusMetrumMin)
                        return false;
-               if (getProduct() > libaltosConstants.USB_PRODUCT_ALTUSMETRUM_MAX)
+               if (getProduct() > AltusMetrumMax)
                        return false;
                return true;
        }
 
        public boolean matchProduct(int want_product) {
 
+               if (!isAltusMetrum())
+                       return false;
+
                if (want_product == Any)
                        return true;
 
                if (want_product == BaseStation)
                        return matchProduct(TeleDongle) || matchProduct(TeleTerra);
 
-               if (!isAltusMetrum())
-                       return false;
-
                int have_product = getProduct();
 
-               if (want_product == have_product)
+               if (have_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();