altosui: Use shared AltosDeviceDialog

[fw/altos] / altosui / AltosUSBDevice.java

diff --git a/altosui/AltosUSBDevice.java b/altosui/AltosUSBDevice.java
index b11a3934b1376906974eab03cdf02b8c698f3817..5c6a89766cdac20f800a20e43b6e194b952727ce 100644 (file)
--- a/altosui/AltosUSBDevice.java
+++ b/altosui/AltosUSBDevice.java
@@ -16,9 +16,9 @@
  */
 
 package altosui;
-import java.lang.*;
 import java.util.*;
 import libaltosJNI.*;
+import org.altusmetrum.altosuilib.*;
 
 public class AltosUSBDevice  extends altos_device implements AltosDevice {
 
@@ -71,7 +71,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();