X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosuilib%2FAltosUSBDevice.java;h=49f966f330b56e9f7c3f7fc53bc3dd9c0a161c2c;hp=a54965977cacd1903c103465aa3559ef3b89682a;hb=a61217f0a6d0ef48b6471f632c4600255867e831;hpb=8d1d8d2a3c129cdbd55427bcda0f26715b02f1ee

diff --git a/altosuilib/AltosUSBDevice.java b/altosuilib/AltosUSBDevice.java
index a5496597..49f966f3 100644
--- a/altosuilib/AltosUSBDevice.java
+++ b/altosuilib/AltosUSBDevice.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_1;
+package org.altusmetrum.altosuilib_12;
 
 import java.util.*;
 import libaltosJNI.*;
@@ -68,17 +69,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;
@@ -109,4 +114,4 @@ public class AltosUSBDevice  extends altos_device implements AltosDevice {
 
 		return device_list;
 	}
-}
\ No newline at end of file
+}