X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosUSBDevice.java;h=3af7a7fa4895d952af6dd60328c91cb6cb90b187;hb=22a58b0f9b82ea8c7abeda79ca7a4cd21c3dc93c;hp=dc746a64fb4aa7de038872bbf18f5fde13d7d523;hpb=17f38e045fcd8ca0224095c0b2b7b098df77a8d8;p=fw%2Faltos

diff --git a/altosui/AltosUSBDevice.java b/altosui/AltosUSBDevice.java
index dc746a64..3af7a7fa 100644
--- a/altosui/AltosUSBDevice.java
+++ b/altosui/AltosUSBDevice.java
@@ -16,7 +16,6 @@
  */
 
 package altosui;
-import java.lang.*;
 import java.util.*;
 import libaltosJNI.*;
 
@@ -39,6 +38,13 @@ public class AltosUSBDevice  extends altos_device implements AltosDevice {
 
 	}
 
+	public String getErrorString() {
+		altos_error	error = new altos_error();
+
+		libaltos.altos_get_last_error(error);
+		return String.format("%s (%d)", error.getString(), error.getCode());
+	}
+
 	public SWIGTYPE_p_altos_file open() {
 		return libaltos.altos_open(this);
 	}
@@ -64,7 +70,12 @@ public class AltosUSBDevice  extends altos_device implements AltosDevice {
 		if (want_product == Altos.product_basestation)
 			return matchProduct(Altos.product_teledongle) ||
 				matchProduct(Altos.product_teleterra) ||
-				matchProduct(Altos.product_telebt);
+				matchProduct(Altos.product_telebt) ||
+				matchProduct(Altos.product_megadongle);
+
+		if (want_product == Altos.product_altimeter)
+			return matchProduct(Altos.product_telemetrum) ||
+				matchProduct(Altos.product_megametrum);
 
 		int have_product = getProduct();