altoslib/altosuilib: Add EasyMega support

[fw/altos] / altosuilib / AltosUSBDevice.java

diff --git a/altosuilib/AltosUSBDevice.java b/altosuilib/AltosUSBDevice.java
index 2f4e0dc67b422dc885cdc5ee3f7e2ebc9d042dcb..f4906a73662c4f8f0140c0152ad5e4935f726f78 100644 (file)
--- a/altosuilib/AltosUSBDevice.java
+++ b/altosuilib/AltosUSBDevice.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib;
+package org.altusmetrum.altosuilib_3;
 
 import java.util.*;
 import libaltosJNI.*;
@@ -50,7 +50,7 @@ public class AltosUSBDevice  extends altos_device implements AltosDevice {
                return libaltos.altos_open(this);
        }
 
-       private boolean isAltusMetrum() {
+       public boolean isAltusMetrum() {
                if (getVendor() != AltosUILib.vendor_altusmetrum)
                        return false;
                if (getProduct() < AltosUILib.product_altusmetrum_min)
@@ -68,17 +68,21 @@ public class AltosUSBDevice  extends altos_device implements AltosDevice {
                if (want_product == AltosUILib.product_any)
                        return true;
 
+               int have_product = getProduct();
+
                if (want_product == AltosUILib.product_basestation)
-                       return matchProduct(AltosUILib.product_teledongle) ||
-                               matchProduct(AltosUILib.product_teleterra) ||
-                               matchProduct(AltosUILib.product_telebt) ||
-                               matchProduct(AltosUILib.product_megadongle);
+                       return have_product == AltosUILib.product_teledongle ||
+                               have_product == AltosUILib.product_teleterra ||
+                               have_product == AltosUILib.product_telebt ||
+                               have_product == AltosUILib.product_megadongle;
 
                if (want_product == AltosUILib.product_altimeter)
-                       return matchProduct(AltosUILib.product_telemetrum) ||
-                               matchProduct(AltosUILib.product_megametrum);
-
-               int have_product = getProduct();
+                       return have_product == AltosUILib.product_telemetrum ||
+                               have_product == AltosUILib.product_telemega ||
+                               have_product == AltosUILib.product_easymega ||
+                               have_product == AltosUILib.product_telegps ||
+                               have_product == AltosUILib.product_easymini ||
+                               have_product == AltosUILib.product_telemini;
 
                if (have_product == AltosUILib.product_altusmetrum)     /* old devices match any request */
                        return true;
@@ -89,7 +93,7 @@ public class AltosUSBDevice  extends altos_device implements AltosDevice {
                return false;
        }
 
-       static java.util.List<AltosDevice> list(int product) {
+       static public java.util.List<AltosDevice> list(int product) {
                if (!AltosUILib.load_library())
                        return null;
 
@@ -109,4 +113,4 @@ public class AltosUSBDevice  extends altos_device implements AltosDevice {
 
                return device_list;
        }
-}
\ No newline at end of file
+}