altosui: Make AltosSerial.flush_input keep reading while non-empty
[fw/altos] / ao-tools / altosui / AltosSerial.java
index a5566ab898d4f3eb096f2d131e925e585bf8a499..8a6ad05e823cfac824121a8afc08ca6e804f18c2 100644 (file)
@@ -23,14 +23,10 @@ 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 libaltosJNI.libaltos;
-import libaltosJNI.altos_device;
-import libaltosJNI.SWIGTYPE_p_altos_file;
-import libaltosJNI.SWIGTYPE_p_altos_list;
+import java.util.concurrent.*;
+import java.util.*;
+
+import libaltosJNI.*;
 
 /*
  * This class reads from the serial port and places each received
@@ -40,11 +36,17 @@ import libaltosJNI.SWIGTYPE_p_altos_list;
 
 public class AltosSerial implements Runnable {
 
+       static List<String> devices_opened = Collections.synchronizedList(new LinkedList<String>());
+
+       AltosDevice device;
        SWIGTYPE_p_altos_file altos;
-       LinkedList<LinkedBlockingQueue<String>> monitors;
-       LinkedBlockingQueue<String> reply_queue;
+       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;
@@ -54,24 +56,50 @@ public class AltosSerial implements Runnable {
                                c = libaltos.altos_getchar(altos, 0);
                                if (Thread.interrupted())
                                        break;
-                               if (c == -1)
+                               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")) {
+                                               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<String> q = monitors.get(e);
-                                                                       q.put(line);
+                                                                       LinkedBlockingQueue<AltosLine> q = monitors.get(e);
+                                                                       q.put(new AltosLine (line));
                                                                }
-                                                       } else
-                                                               reply_queue.put(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++;
                                        }
                                }
                        }
@@ -79,34 +107,57 @@ public class AltosSerial implements Runnable {
                }
        }
 
-       public String get_reply() throws InterruptedException {
-               return reply_queue.take();
+       public void flush_output() {
+               if (altos != null)
+                       libaltos.altos_flush(altos);
        }
 
-       public void add_monitor(LinkedBlockingQueue<String> q) {
-               monitors.add(q);
+       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 void remove_monitor(LinkedBlockingQueue<String> q) {
-               monitors.remove(q);
+       public String get_reply() throws InterruptedException {
+               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 boolean opened() {
-               return altos != null;
+       public void add_monitor(LinkedBlockingQueue<AltosLine> q) {
+               set_monitor(true);
+               monitors.add(q);
+       }
+
+       public void remove_monitor(LinkedBlockingQueue<AltosLine> q) {
+               monitors.remove(q);
+               if (monitors.isEmpty())
+                       set_monitor(false);
        }
 
        public void close() {
                if (altos != null) {
                        libaltos.altos_close(altos);
-                       altos = null;
                }
                if (input_thread != null) {
                        try {
@@ -116,6 +167,13 @@ public class AltosSerial implements Runnable {
                        }
                        input_thread = null;
                }
+               if (altos != null) {
+                       libaltos.altos_free(altos);
+                       altos = null;
+               }
+               synchronized (devices_opened) {
+                       devices_opened.remove(device.getPath());
+               }
        }
 
        public void putc(char c) {
@@ -124,6 +182,7 @@ public class AltosSerial implements Runnable {
        }
 
        public void print(String data) {
+//             System.out.printf("\"%s\" ", data);
                for (int i = 0; i < data.length(); i++)
                        putc(data.charAt(i));
        }
@@ -132,31 +191,58 @@ public class AltosSerial implements Runnable {
                print(String.format(format, arguments));
        }
 
-       public void open(altos_device device) throws FileNotFoundException {
-               close();
+       private void open() throws FileNotFoundException, AltosSerialInUseException {
+               synchronized (devices_opened) {
+                       if (devices_opened.contains(device.getPath()))
+                               throw new AltosSerialInUseException(device);
+                       devices_opened.add(device.getPath());
+               }
                altos = libaltos.altos_open(device);
                if (altos == null)
-                       throw new FileNotFoundException(device.getPath());
+                       throw new FileNotFoundException(device.toShortString());
                input_thread = new Thread(this);
                input_thread.start();
-               print("\nE 0\n");
-               try {
-                       Thread.sleep(200);
-               } catch (InterruptedException e) {
-               }
-               flush();
+               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)
-                       printf("m 0\nc r %d\nm 1\n", 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();
+               }
+       }
+
+       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 set_callsign(String callsign) {
+               if (altos != null) {
+                       printf ("c c %s\n", callsign);
+                       flush_output();
+               }
        }
 
-       public AltosSerial() {
-               altos = null;
-               input_thread = null;
+       public AltosSerial(AltosDevice in_device) throws FileNotFoundException, AltosSerialInUseException {
+               device = in_device;
                line = "";
-               monitors = new LinkedList<LinkedBlockingQueue<String>> ();
-               reply_queue = new LinkedBlockingQueue<String> ();
+               monitor_mode = false;
+               monitors = new LinkedList<LinkedBlockingQueue<AltosLine>> ();
+               reply_queue = new LinkedBlockingQueue<AltosLine> ();
+               open();
        }
 }