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

diff --git a/altosuilib/AltosUSBDevice.java b/altosuilib/AltosUSBDevice.java
index 16a0e770..585bd774 100644
--- a/altosuilib/AltosUSBDevice.java
+++ b/altosuilib/AltosUSBDevice.java
@@ -16,16 +16,17 @@
  * 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 {
 
 	public String toString() {
 		String	name = getName();
-		if (name == null)
+		if (name == null || "".equals(name))
 			name = "Altus Metrum";
 		return String.format("%-20.20s %4d %s",
 				     name, getSerial(), getPath());
@@ -33,7 +34,7 @@ public class AltosUSBDevice  extends altos_device implements AltosDevice {
 
 	public String toShortString() {
 		String	name = getName();
-		if (name == null)
+		if (name == null || "".equals(name))
 			name = "Altus Metrum";
 		return String.format("%s %d %s",
 				     name, getSerial(), getPath());
@@ -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) {