X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosuilib%2FAltosUSBDevice.java;h=50ec4c03bc843399d380df97b6645926d9c6fd83;hb=b07ca2827a498e6dd3c6b62819f71679291f9acc;hp=16a0e7709dd5be7c3793bd3eb42c86c481164d6c;hpb=91bb344a74a413f7dcee379c4d760c34599749bc;p=fw%2Faltos

diff --git a/altosuilib/AltosUSBDevice.java b/altosuilib/AltosUSBDevice.java
index 16a0e770..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 ||
@@ -95,7 +96,15 @@ public class AltosUSBDevice  extends altos_device implements AltosDevice {
 	}
 
 	public int hashCode() {
-		return getVendor() ^ getProduct() ^ getSerial();
+		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) {
@@ -108,7 +117,8 @@ public class AltosUSBDevice  extends altos_device implements AltosDevice {
 
 		return getVendor() == other.getVendor() &&
 			getProduct() == other.getProduct() &&
-			getSerial() == other.getSerial();
+			getSerial() == other.getSerial() &&
+			getPath().equals(other.getPath());
 	}
 
 	static public java.util.List<AltosDevice> list(int product) {