X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosuilib%2FAltosFlashUI.java;h=6b4a52389faf72b2fd3fa2628dbc2ace19ec18fa;hb=cb23b992be8ba40c97d8988c134a814a13ccd58c;hp=6e497c429be6bb9cbdc93674e29537e13c3b7e03;hpb=4231d68bae69d9a7d1f52205002db452cd5f986d;p=fw%2Faltos

diff --git a/altosuilib/AltosFlashUI.java b/altosuilib/AltosFlashUI.java
index 6e497c42..6b4a5238 100644
--- a/altosuilib/AltosFlashUI.java
+++ b/altosuilib/AltosFlashUI.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_6;
+package org.altusmetrum.altosuilib_7;
 
 import java.awt.*;
 import java.awt.event.*;
@@ -23,7 +23,7 @@ import javax.swing.*;
 import javax.swing.filechooser.FileNameExtensionFilter;
 import java.io.*;
 import java.util.concurrent.*;
-import org.altusmetrum.altoslib_6.*;
+import org.altusmetrum.altoslib_7.*;
 
 public class AltosFlashUI
 	extends AltosUIDialog
@@ -54,7 +54,7 @@ public class AltosFlashUI
 	// Flash controller
 	AltosProgrammer	programmer;
 
-	private static String[] pair_programmed = {
+	private static final String[] pair_programmed_files = {
 		"teleballoon",
 		"telebt-v1",
 		"teledongle-v0",
@@ -67,20 +67,34 @@ public class AltosFlashUI
 		"teleterra"
 	};
 
+	private static final String[] pair_programmed_devices = {
+		"TeleBalloon",
+		"TeleBT-v1",
+		"TeleDongle-v0",
+		"TeleFire",
+		"TeleMetrum-v0",
+		"TeleMetrum-v1",
+		"TeleMini",
+		"TeleNano",
+		"TeleShield",
+		"TeleTerra"
+	};
+
 	private boolean is_pair_programmed() {
 
 		if (file != null) {
 			String	name = file.getName();
-			for (int i = 0; i < pair_programmed.length; i++) {
-				if (name.startsWith(pair_programmed[i]))
+			for (int i = 0; i < pair_programmed_files.length; i++) {
+				if (name.startsWith(pair_programmed_files[i]))
 					return true;
 			}
 		}
 		if (device != null) {
-			if (!device.matchProduct(AltosLib.product_altusmetrum) &&
-			    (device.matchProduct(AltosLib.product_teledongle) ||
-			     device.matchProduct(AltosLib.product_telebt)))
-				return true;
+			String	name = device.toString();
+			for (int i = 0; i < pair_programmed_devices.length; i++) {
+				if (name.startsWith(pair_programmed_devices[i]))
+					return true;
+			}
 		}
 		return false;
 	}