*
* 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
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altosuilib;
+package org.altusmetrum.altosuilib_12;
import java.util.*;
import libaltosJNI.*;
return libaltos.altos_open(this);
}
- private boolean isAltusMetrum() {
+ public boolean isAltusMetrum() {
if (getVendor() != AltosUILib.vendor_altusmetrum)
return false;
if (getProduct() < AltosUILib.product_altusmetrum_min)
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;
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;
return device_list;
}
-}
\ No newline at end of file
+}