X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosEepromDownload.java;h=912ff476df8bbb69013db1d872f06384da09ebd8;hp=1f4a278f33bde2a959ae845f9e8fcbb9b262f3f0;hb=9ffc2eb53a47e435f39b02896b0e43ae5f47f450;hpb=1c3b2fe357d6acf28f48aeddd91693f10381be51

diff --git a/ao-tools/altosui/AltosEepromDownload.java b/ao-tools/altosui/AltosEepromDownload.java
index 1f4a278f..912ff476 100644
--- a/ao-tools/altosui/AltosEepromDownload.java
+++ b/ao-tools/altosui/AltosEepromDownload.java
@@ -26,18 +26,7 @@ import java.io.*;
 import java.util.*;
 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 java.util.concurrent.*;
 
 import libaltosJNI.*;
 
@@ -83,13 +72,13 @@ public class AltosEepromDownload implements Runnable {
 	}
 
 	JFrame			frame;
-	altos_device		device;
+	AltosDevice		device;
 	AltosSerial		serial_line;
 	boolean			remote;
 	Thread			eeprom_thread;
 	AltosEepromMonitor	monitor;
 
-	void CaptureLog() throws IOException, InterruptedException {
+	void CaptureLog() throws IOException, InterruptedException, TimeoutException {
 		int			serial = 0;
 		int			block, state_block = 0;
 		int			addr;
@@ -108,8 +97,10 @@ public class AltosEepromDownload implements Runnable {
 		/* Pull the serial number out of the version information */
 
 		for (;;) {
-			String	line = serial_line.get_reply();
+			String	line = serial_line.get_reply(1000);
 
+			if (line == null)
+				throw new TimeoutException();
 			if (line.startsWith("serial-number")) {
 				try {
 					serial = Integer.parseInt(line.substring(13).trim());
@@ -136,11 +127,14 @@ public class AltosEepromDownload implements Runnable {
 			any_valid = false;
 			monitor.set_value(state_names[state], state, block - state_block);
 			for (addr = 0; addr < 0x100;) {
-				String	line = serial_line.get_reply();
+				String	line = serial_line.get_reply(1000);
+				if (line == null)
+					throw new TimeoutException();
 				int[] values = ParseHex(line);
 
 				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]);
@@ -222,9 +216,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);
@@ -237,40 +232,52 @@ public class AltosEepromDownload implements Runnable {
 			CaptureLog();
 		} catch (IOException ee) {
 			JOptionPane.showMessageDialog(frame,
-						      device.getPath(),
+						      device.toString(),
 						      ee.getLocalizedMessage(),
 						      JOptionPane.ERROR_MESSAGE);
 		} catch (InterruptedException ie) {
+		} catch (TimeoutException te) {
+			JOptionPane.showMessageDialog(frame,
+						      String.format("Connection to \"%s\" failed",
+								    device.toString()),
+						      "Connection Failed",
+						      JOptionPane.ERROR_MESSAGE);
 		}
 		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();
 			} catch (FileNotFoundException ee) {
 				JOptionPane.showMessageDialog(frame,
 							      String.format("Cannot open device \"%s\"",
-									    device.getPath()),
+									    device.toString()),
 							      "Cannot open target device",
 							      JOptionPane.ERROR_MESSAGE);
+			} catch (AltosSerialInUseException si) {
+				JOptionPane.showMessageDialog(frame,
+							      String.format("Device \"%s\" already in use",
+									    device.toString()),
+							      "Device in use",
+							      JOptionPane.ERROR_MESSAGE);
 			} catch (IOException ee) {
 				JOptionPane.showMessageDialog(frame,
-							      device.getPath(),
+							      device.toString(),
 							      ee.getLocalizedMessage(),
 							      JOptionPane.ERROR_MESSAGE);
 			}