X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosuilib%2FAltosFlashUI.java;h=c717e47c1840a30cc07c3d8e50830e9896a2f6fa;hp=ace8fbe5b3f8dc6488a51772124f786b295ce4ef;hb=b95db5819885da89504d5e11decfda98cfac37aa;hpb=4af4e36cda96d053458eeb040e35886890917385

diff --git a/altosuilib/AltosFlashUI.java b/altosuilib/AltosFlashUI.java
index ace8fbe5..c717e47c 100644
--- a/altosuilib/AltosFlashUI.java
+++ b/altosuilib/AltosFlashUI.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_6;
+package org.altusmetrum.altosuilib_12;
 
 import java.awt.*;
 import java.awt.event.*;
@@ -23,7 +24,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_12.*;
 
 public class AltosFlashUI
 	extends AltosUIDialog
@@ -275,8 +276,37 @@ public class AltosFlashUI
 		return true;
 	}
 
-	boolean update_rom_config_info(AltosRomconfig existing_config) {
+	boolean rom_config_matches (AltosRomconfig a, AltosRomconfig b) {
+		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 = 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;
@@ -334,13 +364,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();
 						}
 					});