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

diff --git a/altosuilib/AltosUSBDevice.java b/altosuilib/AltosUSBDevice.java
index 349cd3ce..585bd774 100644
--- a/altosuilib/AltosUSBDevice.java
+++ b/altosuilib/AltosUSBDevice.java
@@ -26,7 +26,7 @@ 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());
@@ -34,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());
@@ -74,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 ||