X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosuilib%2FAltosFlashUI.java;h=6dc80272a6772089517ef07bf9da02b0551efd19;hp=da36397abc7f7bda1c46ab3e81482d1a8cba2f0c;hb=75420fecbc76ab718661718ada249673e139a29d;hpb=1085ec5d57e0ed5d132f2bbdac1a0b6a32c0ab4a

diff --git a/altosuilib/AltosFlashUI.java b/altosuilib/AltosFlashUI.java
index da36397a..6dc80272 100644
--- a/altosuilib/AltosFlashUI.java
+++ b/altosuilib/AltosFlashUI.java
@@ -16,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_11;
+package org.altusmetrum.altosuilib_13;
 
 import java.awt.*;
 import java.awt.event.*;
@@ -24,7 +24,7 @@ import javax.swing.*;
 import javax.swing.filechooser.FileNameExtensionFilter;
 import java.io.*;
 import java.util.concurrent.*;
-import org.altusmetrum.altoslib_11.*;
+import org.altusmetrum.altoslib_13.*;
 
 public class AltosFlashUI
 	extends AltosUIDialog
@@ -59,10 +59,10 @@ public class AltosFlashUI
 		"teleballoon",
 		"telebt-v1",
 		"teledongle-v0",
-		"telefire",
+		"telefire-v0",
 		"telemetrum-v0",
 		"telemetrum-v1",
-		"telemini",
+		"telemini-v1",
 		"telenano",
 		"teleshield",
 		"teleterra"
@@ -72,10 +72,11 @@ public class AltosFlashUI
 		"TeleBalloon",
 		"TeleBT-v1",
 		"TeleDongle-v0",
+		"TeleFire-v0",
 		"TeleFire",
 		"TeleMetrum-v0",
 		"TeleMetrum-v1",
-		"TeleMini",
+		"TeleMini-v1",
 		"TeleNano",
 		"TeleShield",
 		"TeleTerra"
@@ -276,8 +277,54 @@ public class AltosFlashUI
 		return true;
 	}
 
-	boolean update_rom_config_info(AltosRomconfig existing_config) {
+	boolean rom_config_matches (AltosRomconfig a, AltosRomconfig b) {
+		if (a == null || b == null)
+			return (a == null && b == null);
+
+		if (!a.valid || !b.valid)
+			return false;
+
+		if (a.usb_id != null && b.usb_id != null &&
+		    (a.usb_id.vid != b.usb_id.vid ||
+		     a.usb_id.pid != b.usb_id.pid))
+			return false;
+
+		if (a.usb_product != null && b.usb_product != null &&
+		    !a.usb_product.equals(b.usb_product))
+			return false;
+
+		return true;
+	}
+
+	boolean update_rom_config_info(AltosRomconfig existing_config, AltosRomconfig image_config) {
 		AltosRomconfig	new_config;
+
+		if (!rom_config_matches(existing_config, image_config)) {
+			int ret;
+			if (existing_config == null || !existing_config.valid) {
+				ret = JOptionPane.showConfirmDialog(this,
+								    String.format("Cannot determine target device type\nImage is %04x:%04x %s\nFlash anyways?",
+										  image_config.usb_id.vid,
+										  image_config.usb_id.pid,
+										  image_config.usb_product),
+								    "Unknown Target Device",
+								    JOptionPane.YES_NO_OPTION);
+			} else {
+				ret = JOptionPane.showConfirmDialog(this,
+								    String.format("Device is %04x:%04x %s\nImage is %04x:%04x %s\nFlash anyways?",
+										  existing_config.usb_id.vid,
+										  existing_config.usb_id.pid,
+										  existing_config.usb_product,
+										  image_config.usb_id.vid,
+										  image_config.usb_id.pid,
+										  image_config.usb_product),
+								    "Image doesn't match Device",
+								    JOptionPane.YES_NO_OPTION);
+			}
+			if (ret != JOptionPane.YES_OPTION)
+				return false;
+		}
+
 		new_config = AltosRomconfigUI.show(frame, existing_config);
 		if (new_config == null)
 			return false;
@@ -335,13 +382,15 @@ public class AltosFlashUI
 				else
 					programmer = new AltosSelfFlash(ui.file, link, this);
 
-				final AltosRomconfig	current_config = programmer.romconfig();
+				final AltosRomconfig	current_config = programmer.target_romconfig();
+
+				final AltosRomconfig	image_config = programmer.image_romconfig();
 
 				final Semaphore await_rom_config = new Semaphore(0);
 				SwingUtilities.invokeLater(new Runnable() {
 						public void run() {
 							ui.programmer = programmer;
-							ui.update_rom_config_info(current_config);
+							ui.update_rom_config_info(current_config, image_config);
 							await_rom_config.release();
 						}
 					});