X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosSerial.java;h=8a6ad05e823cfac824121a8afc08ca6e804f18c2;hp=9537f19073074df88e03736285b03a9962c0134a;hb=ed7cf7d262fcf7c0c677c2fb981582b571de9e5e;hpb=02f2be90879b682b6e648cf2debc83223d127b9d

diff --git a/ao-tools/altosui/AltosSerial.java b/ao-tools/altosui/AltosSerial.java
index 9537f190..8a6ad05e 100644
--- a/ao-tools/altosui/AltosSerial.java
+++ b/ao-tools/altosui/AltosSerial.java
@@ -23,189 +23,226 @@ package altosui;
 
 import java.lang.*;
 import java.io.*;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.LinkedList;
-import java.util.Iterator;
-import altosui.AltosSerialMonitor;
+import java.util.concurrent.*;
+import java.util.*;
+
+import libaltosJNI.*;
 
 /*
  * This class reads from the serial port and places each received
  * line in a queue. Dealing with that queue is left up to other
  * threads.
  */
-class AltosSerialReader implements Runnable {
-	FileInputStream	serial_in;
-	LinkedBlockingQueue<String> monitor_queue;
-	LinkedBlockingQueue<String> reply_queue;
+
+public class AltosSerial implements Runnable {
+
+	static 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;
 
 	public void run () {
 		int c;
 
 		try {
-			while ((c = serial_in.read()) != -1) {
+			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 != "") {
-							if (line.startsWith("VERSION"))
-								monitor_queue.put(line);
-							else
-								reply_queue.put(line);
+						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 (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 {
+//								System.out.printf("GOT: %s\n", line);
+								reply_queue.put(new AltosLine (line));
+							}
+							line_count = 0;
 							line = "";
 						}
 					} else {
-						line = line + (char) c;
+						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 (IOException e) {
 		} catch (InterruptedException e) {
 		}
 	}
 
-	public String get_telem() throws InterruptedException {
-		return monitor_queue.take();
+	public void flush_output() {
+		if (altos != null)
+			libaltos.altos_flush(altos);
+	}
+
+	public void flush_input() {
+		flush_output();
+		boolean	got_some;
+		do {
+			try {
+				Thread.sleep(100);
+			} 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 {
-		return reply_queue.take();
+		flush_output();
+		AltosLine line = reply_queue.take();
+		return line.line;
 	}
 
-	public void flush () {
-		synchronized(this) {
-			if (!"VERSION".startsWith(line) && !line.startsWith("VERSION"))
-				line = "";
-			reply_queue.clear();
-		}
+	public String get_reply(int timeout) throws InterruptedException {
+		flush_output();
+		AltosLine line = reply_queue.poll(timeout, TimeUnit.MILLISECONDS);
+		if (line == null)
+			return null;
+		return line.line;
+	}
+
+	public void add_monitor(LinkedBlockingQueue<AltosLine> q) {
+		set_monitor(true);
+		monitors.add(q);
 	}
 
-	public boolean opened() {
-		return serial_in != null;
+	public void remove_monitor(LinkedBlockingQueue<AltosLine> q) {
+		monitors.remove(q);
+		if (monitors.isEmpty())
+			set_monitor(false);
 	}
 
 	public void close() {
-		if (serial_in != null) {
-			try {
-				serial_in.close();
-			} catch (IOException e) {
-			}
-			serial_in = null;
+		if (altos != null) {
+			libaltos.altos_close(altos);
 		}
 		if (input_thread != null) {
 			try {
+				input_thread.interrupt();
 				input_thread.join();
 			} catch (InterruptedException e) {
 			}
 			input_thread = null;
 		}
-	}
-
-	public void open(File name) throws FileNotFoundException {
-		close();
-		serial_in = new FileInputStream(name);
-		input_thread = new Thread(this);
-		input_thread.start();
-	}
-	public AltosSerialReader () {
-		serial_in = null;
-		input_thread = null;
-		line = "";
-		monitor_queue = new LinkedBlockingQueue<String> ();
-		reply_queue = new LinkedBlockingQueue<String> ();
-	}
-
-}
-
-public class AltosSerial implements Runnable {
-	FileOutputStream serial_out = null;
-	Thread monitor_thread = null;
-	AltosSerialReader reader = null;
-	LinkedList<AltosSerialMonitor> callbacks;
-
-	public void run() {
-		try {
-			for (;;) {
-				String s = reader.get_telem();
-				synchronized(callbacks) {
-					Iterator<AltosSerialMonitor> i = callbacks.iterator();
-					while (i.hasNext()) {
-						i.next().data(s);
-					}
-				}
-			}
-		} catch (InterruptedException e) {
+		if (altos != null) {
+			libaltos.altos_free(altos);
+			altos = null;
+		}
+		synchronized (devices_opened) {
+			devices_opened.remove(device.getPath());
 		}
 	}
 
-	boolean need_monitor() {
-		return reader.opened() && !callbacks.isEmpty();
+	public void putc(char c) {
+		if (altos != null)
+			libaltos.altos_putchar(altos, c);
 	}
 
-	void maybe_stop_monitor() {
-		if (!need_monitor() && monitor_thread != null) {
-			monitor_thread.interrupt();
-			try {
-				monitor_thread.join();
-			} catch (InterruptedException e) {
-			} finally {
-				monitor_thread = null;
-			}
-		}
+	public void print(String data) {
+//		System.out.printf("\"%s\" ", data);
+		for (int i = 0; i < data.length(); i++)
+			putc(data.charAt(i));
 	}
 
-	void maybe_start_monitor() {
-		if (need_monitor() && monitor_thread == null) {
-			monitor_thread = new Thread(this);
-			monitor_thread.start();
-		}
+	public void printf(String format, Object ... arguments) {
+		print(String.format(format, arguments));
 	}
 
-	public void monitor(AltosSerialMonitor monitor) {
-		synchronized(callbacks) {
-			callbacks.add(monitor);
-			maybe_start_monitor();
+	private void open() throws FileNotFoundException, AltosSerialInUseException {
+		synchronized (devices_opened) {
+			if (devices_opened.contains(device.getPath()))
+				throw new AltosSerialInUseException(device);
+			devices_opened.add(device.getPath());
 		}
-	}
-
-
-	public void unmonitor(AltosSerialMonitor monitor) {
-		synchronized(callbacks) {
-			callbacks.remove(monitor);
-			maybe_stop_monitor();
+		altos = libaltos.altos_open(device);
+		if (altos == null)
+			throw new FileNotFoundException(device.toShortString());
+		input_thread = new Thread(this);
+		input_thread.start();
+		print("~\nE 0\n");
+		flush_output();
+		set_monitor(monitor_mode);
+		set_channel(AltosPreferences.channel(device.getSerial()));
+		set_callsign(AltosPreferences.callsign());
+	}
+
+	public void set_channel(int channel) {
+		if (altos != null) {
+			if (monitor_mode)
+				printf("m 0\nc r %d\nm 1\n", channel);
+			else
+				printf("c r %d\n", channel);
+			flush_output();
 		}
 	}
 
-	public void close() {
-		synchronized(callbacks) {
-			reader.close();
-			maybe_stop_monitor();
+	void set_monitor(boolean monitor) {
+		monitor_mode = monitor;
+		if (altos != null) {
+			if (monitor)
+				printf("m 1\n");
+			else
+				printf("m 0\n");
+			flush_output();
 		}
 	}
 
-	public void open(File serial_name) throws FileNotFoundException {
-		reader.open(serial_name);
-		serial_out = new FileOutputStream(serial_name);
-		try {
-			serial_out.write('?');
-			serial_out.write('\r');
-		} catch (IOException e) {
+	public void set_callsign(String callsign) {
+		if (altos != null) {
+			printf ("c c %s\n", callsign);
+			flush_output();
 		}
 	}
 
-	void init() {
-		reader = new AltosSerialReader();
-		callbacks = new LinkedList<AltosSerialMonitor>();
-	}
-
-	public AltosSerial() {
-		init();
-	}
-
-	public AltosSerial(File serial_name) throws FileNotFoundException {
-		init();
-		open(serial_name);
+	public AltosSerial(AltosDevice in_device) throws FileNotFoundException, AltosSerialInUseException {
+		device = in_device;
+		line = "";
+		monitor_mode = false;
+		monitors = new LinkedList<LinkedBlockingQueue<AltosLine>> ();
+		reply_queue = new LinkedBlockingQueue<AltosLine> ();
+		open();
 	}
 }