X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosSerial.java;h=073bfb783bff4d3ca7c87c5390af02058026850b;hb=b51497597868a40df039dd3ca11b35a6258bbbb3;hp=e4cedde22b6d6b9c0deedc6c2a506a94f32d0516;hpb=e064d05da87926c19fb665b40fb280fb59328183;p=fw%2Faltos

diff --git a/ao-tools/altosui/AltosSerial.java b/ao-tools/altosui/AltosSerial.java
index e4cedde2..073bfb78 100644
--- a/ao-tools/altosui/AltosSerial.java
+++ b/ao-tools/altosui/AltosSerial.java
@@ -26,8 +26,11 @@ import java.io.*;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.LinkedList;
 import java.util.Iterator;
-import gnu.io.*;
 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
@@ -35,8 +38,8 @@ import altosui.AltosSerialMonitor;
  * threads.
  */
 class AltosSerialReader implements Runnable {
-	InputStream	serial_in;
-	LinkedBlockingQueue<String> monitor_queue;
+	SWIGTYPE_p_altos_file altos;
+	LinkedList<LinkedBlockingQueue<String>> monitors;
 	LinkedBlockingQueue<String> reply_queue;
 	Thread input_thread;
 	String line;
@@ -46,7 +49,7 @@ class AltosSerialReader implements Runnable {
 
 		try {
 			for (;;) {
-				c = serial_in.read();
+				c = libaltos.altos_getchar(altos, 0);
 				if (Thread.interrupted())
 					break;
 				if (c == -1)
@@ -56,9 +59,12 @@ class AltosSerialReader implements Runnable {
 				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
 								reply_queue.put(line);
 							line = "";
 						}
@@ -67,21 +73,22 @@ class AltosSerialReader implements Runnable {
 					}
 				}
 			}
-		} catch (IOException e) {
 		} catch (InterruptedException e) {
 		}
 	}
 
-	public String get_telem() throws InterruptedException {
-		String s = monitor_queue.take();
-		System.out.println(s);
-		return s;
-	}
-
 	public String get_reply() throws InterruptedException {
 		return reply_queue.take();
 	}
 
+	public void add_monitor(LinkedBlockingQueue<String> q) {
+		monitors.add(q);
+	}
+
+	public void remove_monitor(LinkedBlockingQueue<String> q) {
+		monitors.remove(q);
+	}
+
 	public void flush () {
 		synchronized(this) {
 			if (!"VERSION".startsWith(line) && !line.startsWith("VERSION"))
@@ -91,16 +98,13 @@ 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);
+			altos = null;
 		}
 		if (input_thread != null) {
 			try {
@@ -112,83 +116,50 @@ class AltosSerialReader implements Runnable {
 		}
 	}
 
-	public void open(File name) throws FileNotFoundException {
+	public void open(altos_device device) throws FileNotFoundException {
 		close();
-		serial_in = new FileInputStream(name);
-		input_thread = new Thread(this);
-		input_thread.start();
-	}
-	public void open(CommPort c) throws IOException {
-		close();
-		try {
-		c.enableReceiveTimeout(1000);	/* icky. the read method cannot be interrupted */
-		} catch (UnsupportedCommOperationException ee) {
-		}
-		serial_in = c.getInputStream();
+		altos = libaltos.altos_open(device);
 		input_thread = new Thread(this);
 		input_thread.start();
 	}
 	public AltosSerialReader () {
-		serial_in = null;
+		altos = null;
 		input_thread = null;
 		line = "";
-		monitor_queue = new LinkedBlockingQueue<String> ();
+		monitors = new LinkedList<LinkedBlockingQueue<String>> ();
 		reply_queue = new LinkedBlockingQueue<String> ();
 	}
-
 }
 
 public class AltosSerial {
-	OutputStream serial_out = null;
 	AltosSerialReader reader = null;
 
-	public String get_telem() throws InterruptedException {
-		return reader.get_telem();
-	}
-
-	CommPort comm_port = null;
-
 	public void close() {
-		try {
-			serial_out.close();
-		} catch (IOException ee) {
-		}
 		reader.close();
-		if (comm_port != null) {
-			comm_port.close();
-		}
 	}
 
-	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 {
+		reader.open(device);
 	}
 
-	public void open(CommPort c) throws IOException {
-		reader.open(c);
-		serial_out = c.getOutputStream();
+	void init() {
+		reader = new AltosSerialReader();
 	}
 
-	public void connect(String port_name) throws IOException, NoSuchPortException, PortInUseException {
-		comm_port = new RXTXPort(port_name);
-		open(comm_port);
+	public void add_monitor(LinkedBlockingQueue<String> q) {
+		reader.add_monitor(q);
 	}
 
-	void init() {
-		reader = new AltosSerialReader();
+	public void remove_monitor(LinkedBlockingQueue<String> q) {
+		reader.remove_monitor(q);
 	}
 
 	public AltosSerial() {
 		init();
 	}
 
-	public AltosSerial(File serial_name) throws FileNotFoundException {
-		init();
-		open(serial_name);
-	}
-
-	public AltosSerial(CommPort comm_port) throws IOException {
+	public AltosSerial(altos_device device) throws FileNotFoundException {
 		init();
-		open(comm_port);
+		open(device);
 	}
 }