X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosuilib%2FAltosUSBDevice.java;h=50ec4c03bc843399d380df97b6645926d9c6fd83;hb=ff3a2de3223f5cf3fd87f40cd9961e2c2890a867;hp=f43d6befda46e57ec9ee26f0d105452308afe9b9;hpb=ba285ecf51e317917858740504a7d691b9839588;p=fw%2Faltos

diff --git a/altosuilib/AltosUSBDevice.java b/altosuilib/AltosUSBDevice.java
index f43d6bef..50ec4c03 100644
--- a/altosuilib/AltosUSBDevice.java
+++ b/altosuilib/AltosUSBDevice.java
@@ -16,10 +16,11 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_13;
+package org.altusmetrum.altosuilib_14;
 
 import java.util.*;
 import libaltosJNI.*;
+import org.altusmetrum.altoslib_14.*;
 
 public class AltosUSBDevice  extends altos_device implements AltosDevice {
 
@@ -73,13 +74,13 @@ public class AltosUSBDevice  extends altos_device implements AltosDevice {
 
 		if (want_product == AltosUILib.product_basestation)
 			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 have_product == AltosUILib.product_telemetrum ||
 				have_product == AltosUILib.product_telemega ||
+				have_product == AltosUILib.product_easytimer ||
 				have_product == AltosUILib.product_easymega ||
 				have_product == AltosUILib.product_telegps ||
 				have_product == AltosUILib.product_easymini ||
@@ -98,6 +99,14 @@ public class AltosUSBDevice  extends altos_device implements AltosDevice {
 		return getVendor() ^ getProduct() ^ getSerial() ^ getPath().hashCode();
 	}
 
+	public AltosUsbId usb_id() {
+		return new AltosUsbId(getVendor(), getProduct());
+	}
+
+	public String usb_product() {
+		return getName();
+	}
+
 	public boolean equals(Object o) {
 		if (o == null)
 			return false;