X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosEepromDownload.java;h=8996b9243a5284cc8a5b2606a6d15abc648e653b;hp=756b82d188d552308a857b274d71413b0fd319c0;hb=939be6793238a275b7682ecc376fed14379cf044;hpb=e286eb61ad2a90746c1c31f95d26d5edb48738d3

diff --git a/ao-tools/altosui/AltosEepromDownload.java b/ao-tools/altosui/AltosEepromDownload.java
index 756b82d1..8996b924 100644
--- a/ao-tools/altosui/AltosEepromDownload.java
+++ b/ao-tools/altosui/AltosEepromDownload.java
@@ -28,17 +28,6 @@ import java.text.*;
 import java.util.prefs.*;
 import java.util.concurrent.LinkedBlockingQueue;
 
-import altosui.Altos;
-import altosui.AltosSerial;
-import altosui.AltosSerialMonitor;
-import altosui.AltosTelemetry;
-import altosui.AltosState;
-import altosui.AltosDeviceDialog;
-import altosui.AltosPreferences;
-import altosui.AltosLog;
-import altosui.AltosVoice;
-import altosui.AltosEepromMonitor;
-
 import libaltosJNI.*;
 
 public class AltosEepromDownload implements Runnable {
@@ -83,7 +72,7 @@ public class AltosEepromDownload implements Runnable {
 	}
 
 	JFrame			frame;
-	altos_device		device;
+	AltosDevice		device;
 	AltosSerial		serial_line;
 	boolean			remote;
 	Thread			eeprom_thread;
@@ -103,7 +92,7 @@ public class AltosEepromDownload implements Runnable {
 		AltosFile		eeprom_name;
 		LinkedList<String>	eeprom_pending = new LinkedList<String>();
 
-		serial_line.printf("v\n");
+		serial_line.printf("\nc s\nv\n");
 
 		/* Pull the serial number out of the version information */
 
@@ -113,12 +102,13 @@ public class AltosEepromDownload implements Runnable {
 			if (line.startsWith("serial-number")) {
 				try {
 					serial = Integer.parseInt(line.substring(13).trim());
-					eeprom_pending.add(String.format("%s\n", line));
 				} catch (NumberFormatException ne) {
 					serial = 0;
 				}
 			}
 
+			eeprom_pending.add(String.format("%s\n", line));
+
 			/* signals the end of the version info */
 			if (line.startsWith("software-version"))
 				break;
@@ -140,6 +130,7 @@ public class AltosEepromDownload implements Runnable {
 
 				if (values == null) {
 					System.out.printf("invalid line: %s\n", line);
+					continue;
 				} else if (values[0] != addr) {
 					System.out.printf("data address out of sync at 0x%x\n",
 							  block * 256 + values[0]);
@@ -221,9 +212,10 @@ public class AltosEepromDownload implements Runnable {
 
 	public void run () {
 		if (remote) {
-			serial_line.printf("m 0\n");
-			serial_line.set_channel(AltosPreferences.channel());
-			serial_line.printf("p\n");
+			serial_line.set_channel(AltosPreferences.channel(device.getSerial()));
+			serial_line.set_callsign(AltosPreferences.callsign());
+			serial_line.printf("p\nE 0\n");
+			serial_line.flush_input();
 		}
 
 		monitor = new AltosEepromMonitor(frame, Altos.ao_flight_boost, Altos.ao_flight_landed);
@@ -244,20 +236,20 @@ public class AltosEepromDownload implements Runnable {
 		if (remote)
 			serial_line.printf("~");
 		monitor.done();
+		serial_line.flush_output();
 		serial_line.close();
 	}
 
 	public AltosEepromDownload(JFrame given_frame) {
 		frame = given_frame;
-		device = AltosDeviceDialog.show(frame, null);
+		device = AltosDeviceDialog.show(frame, AltosDevice.product_any);
 
-		serial_line = new AltosSerial();
 		remote = false;
 
 		if (device != null) {
 			try {
-				serial_line.open(device);
-				if (!device.getProduct().startsWith("TeleMetrum"))
+				serial_line = new AltosSerial(device);
+				if (!device.matchProduct(AltosDevice.product_telemetrum))
 					remote = true;
 				eeprom_thread = new Thread(this);
 				eeprom_thread.start();
@@ -267,6 +259,12 @@ public class AltosEepromDownload implements Runnable {
 									    device.getPath()),
 							      "Cannot open target device",
 							      JOptionPane.ERROR_MESSAGE);
+			} catch (AltosSerialInUseException si) {
+				JOptionPane.showMessageDialog(frame,
+							      String.format("Device \"%s\" already in use",
+									    device.getPath()),
+							      "Device in use",
+							      JOptionPane.ERROR_MESSAGE);
 			} catch (IOException ee) {
 				JOptionPane.showMessageDialog(frame,
 							      device.getPath(),