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

diff --git a/ao-tools/altosui/AltosSerial.java b/ao-tools/altosui/AltosSerial.java
index 9537f190..3684f253 100644
--- a/ao-tools/altosui/AltosSerial.java
+++ b/ao-tools/altosui/AltosSerial.java
@@ -27,15 +27,21 @@ import java.util.concurrent.LinkedBlockingQueue;
 import java.util.LinkedList;
 import java.util.Iterator;
 import altosui.AltosSerialMonitor;
+import libaltosJNI.libaltos;
+import libaltosJNI.altos_device;
+import libaltosJNI.SWIGTYPE_p_altos_file;
+import libaltosJNI.SWIGTYPE_p_altos_list;
 
 /*
  * 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;
+
+public class AltosSerial implements Runnable {
+
+	SWIGTYPE_p_altos_file altos;
+	LinkedList<LinkedBlockingQueue<String>> monitors;
 	LinkedBlockingQueue<String> reply_queue;
 	Thread input_thread;
 	String line;
@@ -44,16 +50,26 @@ class AltosSerialReader implements Runnable {
 		int c;
 
 		try {
-			while ((c = serial_in.read()) != -1) {
+			for (;;) {
+				c = libaltos.altos_getchar(altos, 0);
+				if (Thread.interrupted())
+					break;
+				if (c == -1)
+					continue;
 				if (c == '\r')
 					continue;
 				synchronized(this) {
 					if (c == '\n') {
 						if (line != "") {
-							if (line.startsWith("VERSION"))
-								monitor_queue.put(line);
-							else
+							if (line.startsWith("VERSION")) {
+								for (int e = 0; e < monitors.size(); e++) {
+									LinkedBlockingQueue<String> q = monitors.get(e);
+									q.put(line);
+								}
+							} else {
+//								System.out.printf("GOT: %s\n", line);
 								reply_queue.put(line);
+							}
 							line = "";
 						}
 					} else {
@@ -61,17 +77,31 @@ class AltosSerialReader implements Runnable {
 					}
 				}
 			}
-		} catch (IOException e) {
 		} catch (InterruptedException e) {
 		}
 	}
 
-	public String get_telem() throws InterruptedException {
-		return monitor_queue.take();
+	public void flush_reply() {
+		libaltos.altos_flush(altos);
+		try {
+			Thread.sleep(100);
+		} catch (InterruptedException ie) {
+		}
+		reply_queue.clear();
 	}
 
 	public String get_reply() throws InterruptedException {
-		return reply_queue.take();
+		libaltos.altos_flush(altos);
+		String line = reply_queue.take();
+		return line;
+	}
+
+	public void add_monitor(LinkedBlockingQueue<String> q) {
+		monitors.add(q);
+	}
+
+	public void remove_monitor(LinkedBlockingQueue<String> q) {
+		monitors.remove(q);
 	}
 
 	public void flush () {
@@ -83,129 +113,71 @@ class AltosSerialReader implements Runnable {
 	}
 
 	public boolean opened() {
-		return serial_in != null;
+		return altos != null;
 	}
 
 	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) {
-		}
-	}
-
-	boolean need_monitor() {
-		return reader.opened() && !callbacks.isEmpty();
-	}
-
-	void maybe_stop_monitor() {
-		if (!need_monitor() && monitor_thread != null) {
-			monitor_thread.interrupt();
-			try {
-				monitor_thread.join();
-			} catch (InterruptedException e) {
-			} finally {
-				monitor_thread = null;
-			}
-		}
-	}
-
-	void maybe_start_monitor() {
-		if (need_monitor() && monitor_thread == null) {
-			monitor_thread = new Thread(this);
-			monitor_thread.start();
+		if (altos != null) {
+			libaltos.altos_free(altos);
+			altos = null;
 		}
 	}
 
-	public void monitor(AltosSerialMonitor monitor) {
-		synchronized(callbacks) {
-			callbacks.add(monitor);
-			maybe_start_monitor();
-		}
+	public void putc(char c) {
+		if (altos != null)
+			libaltos.altos_putchar(altos, c);
 	}
 
-
-	public void unmonitor(AltosSerialMonitor monitor) {
-		synchronized(callbacks) {
-			callbacks.remove(monitor);
-			maybe_stop_monitor();
-		}
+	public void print(String data) {
+//		System.out.printf("\"%s\" ", data);
+		for (int i = 0; i < data.length(); i++)
+			putc(data.charAt(i));
 	}
 
-	public void close() {
-		synchronized(callbacks) {
-			reader.close();
-			maybe_stop_monitor();
-		}
+	public void printf(String format, Object ... arguments) {
+		print(String.format(format, arguments));
 	}
 
-	public void open(File serial_name) throws FileNotFoundException {
-		reader.open(serial_name);
-		serial_out = new FileOutputStream(serial_name);
+	public void open(altos_device device) throws FileNotFoundException {
+		close();
+		altos = libaltos.altos_open(device);
+		if (altos == null)
+			throw new FileNotFoundException(device.getPath());
+		input_thread = new Thread(this);
+		input_thread.start();
+		print("\nE 0\n");
 		try {
-			serial_out.write('?');
-			serial_out.write('\r');
-		} catch (IOException e) {
+			Thread.sleep(200);
+		} catch (InterruptedException e) {
 		}
+		flush();
 	}
 
-	void init() {
-		reader = new AltosSerialReader();
-		callbacks = new LinkedList<AltosSerialMonitor>();
+	public void set_channel(int channel) {
+		if (altos != null)
+			printf("m 0\nc r %d\nm 1\n", channel);
 	}
 
-	public AltosSerial() {
-		init();
+	public void set_callsign(String callsign) {
+		if (altos != null)
+			printf ("c c %s\n", callsign);
 	}
 
-	public AltosSerial(File serial_name) throws FileNotFoundException {
-		init();
-		open(serial_name);
+	public AltosSerial() {
+		altos = null;
+		input_thread = null;
+		line = "";
+		monitors = new LinkedList<LinkedBlockingQueue<String>> ();
+		reply_queue = new LinkedBlockingQueue<String> ();
 	}
 }