altoslib: Clean up random rebase failures

[fw/altos] / altosui / AltosSerial.java

diff --git a/altosui/AltosSerial.java b/altosui/AltosSerial.java
index 161f0e905995bab3bac4389432ca52034daa82c8..3abdb645393bc55621eddcf9d0665055c39cb536 100644 (file)
--- a/altosui/AltosSerial.java
+++ b/altosui/AltosSerial.java
@@ -41,33 +41,22 @@ import libaltosJNI.*;
  * threads.
  */
 
-public class AltosSerial implements Runnable, AltosLink {
+public class AltosSerial extends AltosLink implements Runnable {
 
        static java.util.List<String> devices_opened = Collections.synchronizedList(new LinkedList<String>());
 
        AltosDevice device;
        SWIGTYPE_p_altos_file altos;
-       LinkedList<LinkedBlockingQueue<AltosLine>> monitors;
-       LinkedBlockingQueue<AltosLine> reply_queue;
        Thread input_thread;
        String line;
        byte[] line_bytes;
        int line_count;
-       boolean monitor_mode;
-       int telemetry;
-       double frequency;
-       public static boolean debug;
-       boolean remote;
-       LinkedList<String> pending_output = new LinkedList<String>();
        Frame frame;
-       AltosConfigData config_data;
-
-       static void set_debug(boolean new_debug) {
-               debug = new_debug;
-       }
 
        public void run () {
                int c;
+               byte[] line_bytes = null;
+               int line_count = 0;
 
                try {
                        for (;;) {
@@ -75,11 +64,8 @@ public class AltosSerial implements Runnable, AltosLink {
                                if (Thread.interrupted())
                                        break;
                                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());
+                                       add_telem (new AltosLine());
+                                       add_reply (new AltosLine());
                                        break;
                                }
                                if (c == libaltosConstants.LIBALTOS_TIMEOUT)
@@ -89,25 +75,8 @@ public class AltosSerial implements Runnable, AltosLink {
                                synchronized(this) {
                                        if (c == '\n') {
                                                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 (debug)
-                                                               System.out.printf("\t\t\t\t\t%s\n", line);
-                                                       if (line.startsWith("TELEM") || line.startsWith("VERSION") || line.startsWith("CRC")) {
-                                                               for (int e = 0; e < monitors.size(); e++) {
-                                                                       LinkedBlockingQueue<AltosLine> q = monitors.get(e);
-                                                                       q.put(new AltosLine (line));
-                                                               }
-                                                       } else {
-                                                               reply_queue.put(new AltosLine (line));
-                                                       }
+                                                       add_bytes(line_bytes, line_count);
                                                        line_count = 0;
-                                                       line = "";
                                                }
                                        } else {
                                                if (line_bytes == null) {
@@ -127,10 +96,8 @@ public class AltosSerial implements Runnable, AltosLink {
        }
 
        public void flush_output() {
+               super.flush_output();
                if (altos != null) {
-                       for (String s : pending_output)
-                               System.out.print(s);
-                       pending_output.clear();
                        libaltos.altos_flush(altos);
                }
        }
@@ -189,22 +156,10 @@ public class AltosSerial implements Runnable, AltosLink {
        }
 
        public void flush_input() throws InterruptedException {
-               flush_output();
-               boolean got_some;
-
-               int timeout = 100;
                if (remote)
-                       timeout = 500;
-               do {
-                       Thread.sleep(timeout);
-                       got_some = !reply_queue.isEmpty();
-                       synchronized(this) {
-                               if (!"VERSION".startsWith(line) &&
-                                   !line.startsWith("VERSION"))
-                                       line = "";
-                               reply_queue.clear();
-                       }
-               } while (got_some);
+                       flush_input(500);
+               else
+                       flush_input(100);
        }
 
        int     in_reply;
@@ -245,29 +200,6 @@ public class AltosSerial implements Runnable, AltosLink {
                return reply;
        }
 
-       public String get_reply() throws InterruptedException {
-               return get_reply(5000);
-       }
-
-       public String get_reply_no_dialog(int timeout) throws InterruptedException, TimeoutException {
-               flush_output();
-               AltosLine line = reply_queue.poll(timeout, TimeUnit.MILLISECONDS);
-               if (line != null)
-                       return line.line;
-               return 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 (remote) {
                        try {
@@ -306,16 +238,10 @@ public class AltosSerial implements Runnable, AltosLink {
        }
 
        public void print(String data) {
-               if (debug)
-                       pending_output.add(data);
                for (int i = 0; i < data.length(); i++)
                        putc(data.charAt(i));
        }
 
-       public void printf(String format, Object ... arguments) {
-               print(String.format(format, arguments));
-       }
-
        private void open() throws FileNotFoundException, AltosSerialInUseException {
                synchronized (devices_opened) {
                        if (devices_opened.contains(device.getPath()))
@@ -465,12 +391,9 @@ public class AltosSerial implements Runnable, AltosLink {
 
        public AltosSerial(AltosDevice in_device) throws FileNotFoundException, AltosSerialInUseException {
                device = in_device;
-               line = "";
-               monitor_mode = false;
                frame = null;
-               telemetry = Altos.ao_telemetry_standard;
-               monitors = new LinkedList<LinkedBlockingQueue<AltosLine>> ();
-               reply_queue = new LinkedBlockingQueue<AltosLine> ();
+               serial = device.getSerial();
+               name = device.toShortString();
                open();
        }
 }