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 0e7d01da757cf1f7e2729c6a4be038c2133fb873..9ae522c28452b42a1e42fb0abfc5116663f5c269 100644 (file)
--- a/ao-tools/altosui/AltosDevice.java
+++ b/ao-tools/altosui/AltosDevice.java
@@ -22,16 +22,114 @@ 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_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_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;
+
        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());
        }
 
-       static {
-               System.loadLibrary("altos");
-               libaltos.altos_init();
+       public boolean isAltusMetrum() {
+               if (getVendor() != AltusMetrum)
+                       return false;
+               if (getProduct() < AltusMetrumMin)
+                       return false;
+               if (getProduct() > AltusMetrumMax)
+                       return false;
+               return true;
        }
-       static AltosDevice[] list(String product) {
+
+       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);
+
+               int have_product = getProduct();
+
+               if (have_product == AltusMetrum)        /* old devices match any request */
+                       return true;
+
+               if (want_product == have_product)
+                       return true;
+
+               return false;
+       }
+
+       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 +140,8 @@ public class AltosDevice extends altos_device {
                                AltosDevice device = new AltosDevice();
                                if (libaltos.altos_list_next(list, device) == 0)
                                        break;
-                               device_list.add(device);
+                               if (device.matchProduct(product))
+                                       device_list.add(device);
                        }
                        libaltos.altos_list_finish(list);
                }