X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosSerial.java;h=9b2180baf6fea2a2ee1f4db343f9ae0155cbe350;hp=2e8ce8702ad557a0d691067caf5dc4f02754d20b;hb=02e657e45e217dc483a81f28020cfe65a826e9be;hpb=941b90a4905e34936d24a25ca90ac04eb6f5a792

diff --git a/altosui/AltosSerial.java b/altosui/AltosSerial.java
index 2e8ce870..9b2180ba 100644
--- a/altosui/AltosSerial.java
+++ b/altosui/AltosSerial.java
@@ -21,15 +21,12 @@
 
 package altosui;
 
-import java.lang.*;
 import java.io.*;
-import java.util.concurrent.*;
 import java.util.*;
 import java.awt.*;
-import java.awt.event.*;
 import javax.swing.*;
-import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;
 
 import libaltosJNI.*;
 
@@ -39,121 +36,40 @@ import libaltosJNI.*;
  * threads.
  */
 
-public class AltosSerial implements Runnable {
+public class AltosSerial extends AltosLink  {
 
 	static java.util.List<String> devices_opened = Collections.synchronizedList(new LinkedList<String>());
 
 	AltosDevice device;
 	SWIGTYPE_p_altos_file altos;
-	LinkedList<LinkedBlockingQueue<AltosLine>> monitors;
-	LinkedBlockingQueue<AltosLine> reply_queue;
 	Thread input_thread;
 	String line;
 	byte[] line_bytes;
 	int line_count;
-	boolean monitor_mode;
-	int telemetry;
-	int channel;
-	static boolean debug;
-	boolean remote;
-	LinkedList<String> pending_output = new LinkedList<String>();
 	Frame frame;
 
-	static void set_debug(boolean new_debug) {
-		debug = new_debug;
-	}
-
-	public void run () {
-		int c;
-
-		try {
-			for (;;) {
-				c = libaltos.altos_getchar(altos, 0);
-				if (Thread.interrupted())
-					break;
-				if (c == libaltosConstants.LIBALTOS_ERROR) {
-					for (int e = 0; e < monitors.size(); e++) {
-						LinkedBlockingQueue<AltosLine> q = monitors.get(e);
-						q.put(new AltosLine());
-					}
-					reply_queue.put (new AltosLine());
-					break;
-				}
-				if (c == libaltosConstants.LIBALTOS_TIMEOUT)
-					continue;
-				if (c == '\r')
-					continue;
-				synchronized(this) {
-					if (c == '\n') {
-						if (line_count != 0) {
-							try {
-								line = new String(line_bytes, 0, line_count, "UTF-8");
-							} catch (UnsupportedEncodingException ue) {
-								line = "";
-								for (int i = 0; i < line_count; i++)
-									line = line + line_bytes[i];
-							}
-							if (debug)
-								System.out.printf("\t\t\t\t\t%s\n", line);
-							if (line.startsWith("TELEM") || line.startsWith("VERSION") || line.startsWith("CRC")) {
-								for (int e = 0; e < monitors.size(); e++) {
-									LinkedBlockingQueue<AltosLine> q = monitors.get(e);
-									q.put(new AltosLine (line));
-								}
-							} else {
-								reply_queue.put(new AltosLine (line));
-							}
-							line_count = 0;
-							line = "";
-						}
-					} else {
-						if (line_bytes == null) {
-							line_bytes = new byte[256];
-						} else if (line_count == line_bytes.length) {
-							byte[] new_line_bytes = new byte[line_count * 2];
-							System.arraycopy(line_bytes, 0, new_line_bytes, 0, line_count);
-							line_bytes = new_line_bytes;
-						}
-						line_bytes[line_count] = (byte) c;
-						line_count++;
-					}
-				}
-			}
-		} catch (InterruptedException e) {
-		}
+	public int getchar() {
+		if (altos == null)
+			return ERROR;
+		return libaltos.altos_getchar(altos, 0);
 	}
 
 	public void flush_output() {
+		super.flush_output();
 		if (altos != null) {
-			for (String s : pending_output)
-				System.out.print(s);
-			pending_output.clear();
-			libaltos.altos_flush(altos);
+			if (libaltos.altos_flush(altos) != 0)
+				close_serial();
 		}
 	}
 
-	boolean		abort;
 	JDialog		timeout_dialog;
-	boolean	timeout_started = false;
-
-	private void stop_timeout_dialog() {
-		if (timeout_started) {
-			timeout_started = false;
-			Runnable r = new Runnable() {
-					public void run() {
-						timeout_dialog.setVisible(false);
-					}
-				};
-			SwingUtilities.invokeLater(r);
-		}
-	}
 
 	private void start_timeout_dialog_internal() {
 
 		Object[] options = { "Cancel" };
 
 		JOptionPane	pane = new JOptionPane();
-		pane.setMessage(String.format("Connecting to %s", device.getPath()));
+		pane.setMessage(String.format("Connecting to %s, %7.3f MHz as %s", device.toShortString(), frequency, callsign));
 		pane.setOptions(options);
 		pane.setInitialValue(null);
 
@@ -165,139 +81,99 @@ public class AltosSerial implements Runnable {
 		if (o == null)
 			return;
 		if (options[0].equals(o))
-			abort = true;
+			reply_abort = true;
 		timeout_dialog.dispose();
 		timeout_dialog = null;
 	}
 
-	private boolean check_timeout() {
-		if (!timeout_started && frame != null) {
-			if (!SwingUtilities.isEventDispatchThread()) {
-				timeout_started = true;
-				Runnable r = new Runnable() {
-						public void run() {
-							start_timeout_dialog_internal();
-						}
-					};
-				SwingUtilities.invokeLater(r);
-			}
-		}
-		return abort;
-	}
-
-	public void flush_input() {
-		flush_output();
-		boolean	got_some;
+	/*
+	 * These are required by the AltosLink implementation
+	 */
 
-		int timeout = 100;
-		if (remote)
-			timeout = 500;
-		do {
-			try {
-				Thread.sleep(timeout);
-			} catch (InterruptedException ie) {
-			}
-			got_some = !reply_queue.isEmpty();
-			synchronized(this) {
-				if (!"VERSION".startsWith(line) &&
-				    !line.startsWith("VERSION"))
-					line = "";
-				reply_queue.clear();
-			}
-		} while (got_some);
-	}
-
-	public String get_reply() throws InterruptedException {
-		if (SwingUtilities.isEventDispatchThread())
-			System.out.printf("Uh-oh, reading serial device from swing thread\n");
-		flush_output();
-		AltosLine line = reply_queue.take();
-		return line.line;
+	public boolean can_cancel_reply() {
+		/*
+		 * Can cancel any replies not called from the dispatch thread
+		 */
+		return !SwingUtilities.isEventDispatchThread();
 	}
 
-	int	in_reply;
-
-	public String get_reply(int timeout) throws InterruptedException {
-		boolean	can_cancel = true;
-		++in_reply;
-
-		if (SwingUtilities.isEventDispatchThread()) {
-			can_cancel = false;
-			System.out.printf("Uh-oh, reading serial device from swing thread\n");
-		}
-		flush_output();
-		if (remote && can_cancel) {
-			timeout = 500;
-		}
-		abort = false;
-		timeout_started = false;
-		for (;;) {
-			AltosLine line = reply_queue.poll(timeout, TimeUnit.MILLISECONDS);
-			if (line != null) {
-				stop_timeout_dialog();
-				--in_reply;
-				return line.line;
-			}
-			if (!remote || !can_cancel || check_timeout()) {
-				--in_reply;
-				return null;
-			}
+	public boolean show_reply_timeout() {
+		if (!SwingUtilities.isEventDispatchThread() && frame != null) {
+			Runnable r = new Runnable() {
+					public void run() {
+						start_timeout_dialog_internal();
+					}
+				};
+			SwingUtilities.invokeLater(r);
+			return true;
 		}
+		return false;
 	}
 
-	public void add_monitor(LinkedBlockingQueue<AltosLine> q) {
-		set_monitor(true);
-		monitors.add(q);
+	public void hide_reply_timeout() {
+		Runnable r = new Runnable() {
+				public void run() {
+					timeout_dialog.setVisible(false);
+				}
+			};
+		SwingUtilities.invokeLater(r);
 	}
 
-	public void remove_monitor(LinkedBlockingQueue<AltosLine> q) {
-		monitors.remove(q);
-		if (monitors.isEmpty())
-			set_monitor(false);
+	private void close_serial() {
+		synchronized (devices_opened) {
+			devices_opened.remove(device.getPath());
+		}
+		if (altos != null) {
+			libaltos.altos_free(altos);
+			altos = null;
+		}
+		abort_reply();
 	}
 
 	public void close() {
+		if (remote) {
+			try {
+				stop_remote();
+			} catch (InterruptedException ie) {
+			}
+		}
 		if (in_reply != 0)
 			System.out.printf("Uh-oh. Closing active serial device\n");
 
-		if (altos != null) {
-			libaltos.altos_close(altos);
-		}
+		close_serial();
+
 		if (input_thread != null) {
 			try {
 				input_thread.interrupt();
 				input_thread.join();
-			} catch (InterruptedException e) {
+			} catch (InterruptedException ie) {
 			}
 			input_thread = null;
 		}
-		if (altos != null) {
-			libaltos.altos_free(altos);
-			altos = null;
-		}
-		synchronized (devices_opened) {
-			devices_opened.remove(device.getPath());
-		}
 		if (debug)
 			System.out.printf("Closing %s\n", device.getPath());
 	}
 
 	private void putc(char c) {
 		if (altos != null)
-			libaltos.altos_putchar(altos, c);
+			if (libaltos.altos_putchar(altos, c) != 0)
+				close_serial();
+	}
+
+	public void putchar(byte c) {
+		if (altos != null) {
+			if (debug)
+				System.out.printf(" %02x", (int) c & 0xff);
+			if (libaltos.altos_putchar(altos, (char) c) != 0)
+				close_serial();
+		}
 	}
 
 	public void print(String data) {
-		if (debug)
-			pending_output.add(data);
 		for (int i = 0; i < data.length(); i++)
 			putc(data.charAt(i));
 	}
 
-	public void printf(String format, Object ... arguments) {
-		print(String.format(format, arguments));
-	}
-
 	private void open() throws FileNotFoundException, AltosSerialInUseException {
 		synchronized (devices_opened) {
 			if (devices_opened.contains(device.getPath()))
@@ -306,8 +182,10 @@ public class AltosSerial implements Runnable {
 		}
 		altos = device.open();
 		if (altos == null) {
+			final String	message = device.getErrorString();
 			close();
-			throw new FileNotFoundException(device.toShortString());
+			throw new FileNotFoundException(String.format("%s (%s)",
+								      device.toShortString(), message));
 		}
 		if (debug)
 			System.out.printf("Open %s\n", device.getPath());
@@ -318,89 +196,15 @@ public class AltosSerial implements Runnable {
 		flush_output();
 	}
 
-	public void set_radio() {
-		telemetry = AltosPreferences.telemetry(device.getSerial());
-		channel = AltosPreferences.channel(device.getSerial());
-		set_channel(channel);
-		set_callsign(AltosPreferences.callsign());
-	}
-
-	private int telemetry_len() {
-		return Altos.telemetry_len(telemetry);
-	}
-
-	public void set_channel(int in_channel) {
-		channel = in_channel;
-		if (altos != null) {
-			if (monitor_mode)
-				printf("m 0\nc r %d\nm %x\n",
-				       channel, telemetry_len());
-			else
-				printf("c r %d\n", channel);
-			flush_output();
-		}
-	}
-
-	public void set_telemetry(int in_telemetry) {
-		telemetry = in_telemetry;
-		if (altos != null) {
-			if (monitor_mode)
-				printf("m 0\nm %x\n", telemetry_len());
-			flush_output();
-		}
-	}
-
-	void set_monitor(boolean monitor) {
-		monitor_mode = monitor;
-		if (altos != null) {
-			if (monitor)
-				printf("m %x\n", telemetry_len());
-			else
-				printf("m 0\n");
-			flush_output();
-		}
-	}
-
-	public void set_callsign(String callsign) {
-		if (altos != null) {
-			printf ("c c %s\n", callsign);
-			flush_output();
-		}
-	}
-
-	public void start_remote() {
-		if (debug)
-			System.out.printf("start remote\n");
-		set_radio();
-		printf("p\nE 0\n");
-		flush_input();
-		remote = true;
-	}
-
-	public void stop_remote() {
-		if (debug)
-			System.out.printf("stop remote\n");
-		try {
-			flush_input();
-		} finally {
-			printf ("~\n");
-			flush_output();
-		}
-		remote = false;
-	}
-
 	public void set_frame(Frame in_frame) {
 		frame = in_frame;
 	}
 
 	public AltosSerial(AltosDevice in_device) throws FileNotFoundException, AltosSerialInUseException {
 		device = in_device;
-		line = "";
-		monitor_mode = false;
 		frame = null;
-		telemetry = Altos.ao_telemetry_standard;
-		monitors = new LinkedList<LinkedBlockingQueue<AltosLine>> ();
-		reply_queue = new LinkedBlockingQueue<AltosLine> ();
+		serial = device.getSerial();
+		name = device.toShortString();
 		open();
 	}
 }