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

diff --git a/altosuilib/AltosUSBDevice.java b/altosuilib/AltosUSBDevice.java
index f43d6bef..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 ||
@@ -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;