More ALtosUI changes

[fw/altos] / ao-tools / altosui / AltosSerial.java

diff --git a/ao-tools/altosui/AltosSerial.java b/ao-tools/altosui/AltosSerial.java
index 9537f19073074df88e03736285b03a9962c0134a..03ab28c55376ff635c4c7b964304f0ab7cd1b269 100644 (file)
--- a/ao-tools/altosui/AltosSerial.java
+++ b/ao-tools/altosui/AltosSerial.java
@@ -26,6 +26,7 @@ import java.io.*;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.LinkedList;
 import java.util.Iterator;
+import gnu.io.*;
 import altosui.AltosSerialMonitor;
 
 /*
@@ -34,8 +35,8 @@ import altosui.AltosSerialMonitor;
  * threads.
  */
 class AltosSerialReader implements Runnable {
-       FileInputStream serial_in;
-       LinkedBlockingQueue<String> monitor_queue;
+       InputStream     serial_in;
+       LinkedList<LinkedBlockingQueue<String>> monitors;
        LinkedBlockingQueue<String> reply_queue;
        Thread input_thread;
        String line;
@@ -44,15 +45,23 @@ class AltosSerialReader implements Runnable {
                int c;
 
                try {
-                       while ((c = serial_in.read()) != -1) {
+                       for (;;) {
+                               c = serial_in.read();
+                               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
                                                                reply_queue.put(line);
                                                        line = "";
                                                }
@@ -66,14 +75,18 @@ class AltosSerialReader implements Runnable {
                }
        }
 
-       public String get_telem() throws InterruptedException {
-               return monitor_queue.take();
-       }
-
        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"))
@@ -96,6 +109,7 @@ class AltosSerialReader implements Runnable {
                }
                if (input_thread != null) {
                        try {
+                               input_thread.interrupt();
                                input_thread.join();
                        } catch (InterruptedException e) {
                        }
@@ -109,95 +123,68 @@ class AltosSerialReader implements Runnable {
                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();
+               input_thread = new Thread(this);
+               input_thread.start();
+       }
        public AltosSerialReader () {
                serial_in = null;
                input_thread = null;
                line = "";
-               monitor_queue = new LinkedBlockingQueue<String> ();
+               monitors = new LinkedList<LinkedBlockingQueue<String>> ();
                reply_queue = new LinkedBlockingQueue<String> ();
        }
 
 }
 
-public class AltosSerial implements Runnable {
-       FileOutputStream serial_out = null;
-       Thread monitor_thread = null;
+public class AltosSerial {
+       OutputStream serial_out = null;
        AltosSerialReader reader = null;
-       LinkedList<AltosSerialMonitor> callbacks;
 
-       public void run() {
+       CommPort comm_port = null;
+
+       public void close() {
                try {
-                       for (;;) {
-                               String s = reader.get_telem();
-                               synchronized(callbacks) {
-                                       Iterator<AltosSerialMonitor> i = callbacks.iterator();
-                                       while (i.hasNext()) {
-                                               i.next().data(s);
-                                       }
-                               }
-                       }
-               } catch (InterruptedException e) {
+                       serial_out.close();
+               } catch (IOException ee) {
                }
-       }
-
-       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;
-                       }
+               reader.close();
+               if (comm_port != null) {
+                       comm_port.close();
                }
        }
 
-       void maybe_start_monitor() {
-               if (need_monitor() && monitor_thread == null) {
-                       monitor_thread = new Thread(this);
-                       monitor_thread.start();
-               }
+       public void open(File serial_name) throws FileNotFoundException {
+               reader.open(serial_name);
+               serial_out = new FileOutputStream(serial_name);
        }
 
-       public void monitor(AltosSerialMonitor monitor) {
-               synchronized(callbacks) {
-                       callbacks.add(monitor);
-                       maybe_start_monitor();
-               }
+       public void open(CommPort c) throws IOException {
+               reader.open(c);
+               serial_out = c.getOutputStream();
        }
 
-
-       public void unmonitor(AltosSerialMonitor monitor) {
-               synchronized(callbacks) {
-                       callbacks.remove(monitor);
-                       maybe_stop_monitor();
-               }
+       public void connect(String port_name) throws IOException, NoSuchPortException, PortInUseException {
+               comm_port = new RXTXPort(port_name);
+               open(comm_port);
        }
 
-       public void close() {
-               synchronized(callbacks) {
-                       reader.close();
-                       maybe_stop_monitor();
-               }
+       void init() {
+               reader = new AltosSerialReader();
        }
 
-       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 add_monitor(LinkedBlockingQueue<String> q) {
+               reader.add_monitor(q);
        }
 
-       void init() {
-               reader = new AltosSerialReader();
-               callbacks = new LinkedList<AltosSerialMonitor>();
+       public void remove_monitor(LinkedBlockingQueue<String> q) {
+               reader.remove_monitor(q);
        }
 
        public AltosSerial() {
@@ -208,4 +195,9 @@ public class AltosSerial implements Runnable {
                init();
                open(serial_name);
        }
+
+       public AltosSerial(CommPort comm_port) throws IOException {
+               init();
+               open(comm_port);
+       }
 }