altoslib: AltosEepromMonitor had false import of altosuilib

[fw/altos] / altosuilib / AltosUSBDevice.java

diff --git a/altosuilib/AltosUSBDevice.java b/altosuilib/AltosUSBDevice.java
index 2f4e0dc67b422dc885cdc5ee3f7e2ebc9d042dcb..005a3e4987d377c330c12efb3a8c8728acb7cbee 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_1;
 
 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)
@@ -76,7 +76,10 @@ public class AltosUSBDevice  extends altos_device implements AltosDevice {
 
                if (want_product == AltosUILib.product_altimeter)
                        return matchProduct(AltosUILib.product_telemetrum) ||
-                               matchProduct(AltosUILib.product_megametrum);
+                               matchProduct(AltosUILib.product_telemega) ||
+                               matchProduct(AltosUILib.product_telegps) ||
+                               matchProduct(AltosUILib.product_easymini) ||
+                               matchProduct(AltosUILib.product_telemini);
 
                int have_product = getProduct();
 
@@ -89,7 +92,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 +112,4 @@ public class AltosUSBDevice  extends altos_device implements AltosDevice {
 
                return device_list;
        }
-}
\ No newline at end of file
+}