TD reports "not-connected" when GPS has 0 sats

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

diff --git a/ao-tools/altosui/AltosSerial.java b/ao-tools/altosui/AltosSerial.java
index 9537f19073074df88e03736285b03a9962c0134a..e4cedde22b6d6b9c0deedc6c2a506a94f32d0516 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,7 +35,7 @@ import altosui.AltosSerialMonitor;
  * threads.
  */
 class AltosSerialReader implements Runnable {
-       FileInputStream serial_in;
+       InputStream     serial_in;
        LinkedBlockingQueue<String> monitor_queue;
        LinkedBlockingQueue<String> reply_queue;
        Thread input_thread;
@@ -44,7 +45,12 @@ 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) {
@@ -67,7 +73,9 @@ class AltosSerialReader implements Runnable {
        }
 
        public String get_telem() throws InterruptedException {
-               return monitor_queue.take();
+               String s = monitor_queue.take();
+               System.out.println(s);
+               return s;
        }
 
        public String get_reply() throws InterruptedException {
@@ -96,6 +104,7 @@ class AltosSerialReader implements Runnable {
                }
                if (input_thread != null) {
                        try {
+                               input_thread.interrupt();
                                input_thread.join();
                        } catch (InterruptedException e) {
                        }
@@ -109,6 +118,16 @@ 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;
@@ -119,85 +138,44 @@ class AltosSerialReader implements Runnable {
 
 }
 
-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() {
-               try {
-                       for (;;) {
-                               String s = reader.get_telem();
-                               synchronized(callbacks) {
-                                       Iterator<AltosSerialMonitor> i = callbacks.iterator();
-                                       while (i.hasNext()) {
-                                               i.next().data(s);
-                                       }
-                               }
-                       }
-               } catch (InterruptedException e) {
-               }
+       public String get_telem() throws InterruptedException {
+               return reader.get_telem();
        }
 
-       boolean need_monitor() {
-               return reader.opened() && !callbacks.isEmpty();
-       }
+       CommPort comm_port = null;
 
-       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();
+       public void close() {
+               try {
+                       serial_out.close();
+               } catch (IOException ee) {
                }
-       }
-
-       public void monitor(AltosSerialMonitor monitor) {
-               synchronized(callbacks) {
-                       callbacks.add(monitor);
-                       maybe_start_monitor();
+               reader.close();
+               if (comm_port != null) {
+                       comm_port.close();
                }
        }
 
-
-       public void unmonitor(AltosSerialMonitor monitor) {
-               synchronized(callbacks) {
-                       callbacks.remove(monitor);
-                       maybe_stop_monitor();
-               }
+       public void open(File serial_name) throws FileNotFoundException {
+               reader.open(serial_name);
+               serial_out = new FileOutputStream(serial_name);
        }
 
-       public void close() {
-               synchronized(callbacks) {
-                       reader.close();
-                       maybe_stop_monitor();
-               }
+       public void open(CommPort c) throws IOException {
+               reader.open(c);
+               serial_out = c.getOutputStream();
        }
 
-       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 connect(String port_name) throws IOException, NoSuchPortException, PortInUseException {
+               comm_port = new RXTXPort(port_name);
+               open(comm_port);
        }
 
        void init() {
                reader = new AltosSerialReader();
-               callbacks = new LinkedList<AltosSerialMonitor>();
        }
 
        public AltosSerial() {
@@ -208,4 +186,9 @@ public class AltosSerial implements Runnable {
                init();
                open(serial_name);
        }
+
+       public AltosSerial(CommPort comm_port) throws IOException {
+               init();
+               open(comm_port);
+       }
 }