altosui: Eliminate unncessary import altosui lines

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

diff --git a/ao-tools/altosui/AltosSerial.java b/ao-tools/altosui/AltosSerial.java
index c4a7ad76a9437117f25091caf9038ced7df1abd0..6787e0c82de78026566159eda85a1c51e513c770 100644 (file)
--- a/ao-tools/altosui/AltosSerial.java
+++ b/ao-tools/altosui/AltosSerial.java
@@ -26,11 +26,8 @@ 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 libaltosJNI.*;
 
 /*
  * This class reads from the serial port and places each received
@@ -41,8 +38,8 @@ import libaltosJNI.SWIGTYPE_p_altos_list;
 public class AltosSerial implements Runnable {
 
        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;
@@ -57,7 +54,15 @@ 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;
@@ -73,12 +78,12 @@ public class AltosSerial implements Runnable {
                                                        }
                                                        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 {
 //                                                             System.out.printf("GOT: %s\n", line);
-                                                               reply_queue.put(line);
+                                                               reply_queue.put(new AltosLine (line));
                                                        }
                                                        line_count = 0;
                                                        line = "";
@@ -101,7 +106,8 @@ public class AltosSerial implements Runnable {
        }
 
        public void flush_output() {
-               libaltos.altos_flush(altos);
+               if (altos != null)
+                       libaltos.altos_flush(altos);
        }
 
        public void flush_input() {
@@ -120,16 +126,16 @@ public class AltosSerial implements Runnable {
 
        public String get_reply() throws InterruptedException {
                flush_output();
-               String line = reply_queue.take();
-               return line;
+               AltosLine line = reply_queue.take();
+               return line.line;
        }
 
-       public void add_monitor(LinkedBlockingQueue<String> q) {
+       public void add_monitor(LinkedBlockingQueue<AltosLine> q) {
                set_monitor(true);
                monitors.add(q);
        }
 
-       public void remove_monitor(LinkedBlockingQueue<String> q) {
+       public void remove_monitor(LinkedBlockingQueue<AltosLine> q) {
                monitors.remove(q);
                if (monitors.isEmpty())
                        set_monitor(false);
@@ -180,20 +186,19 @@ public class AltosSerial implements Runnable {
                input_thread = new Thread(this);
                input_thread.start();
                print("~\nE 0\n");
+               flush_output();
                set_monitor(monitor_mode);
-               flush_input();
+               set_channel(AltosPreferences.channel(device.getSerial()));
+               set_callsign(AltosPreferences.callsign());
        }
 
        public void set_channel(int channel) {
                if (altos != null) {
-                       if (monitor_mode) {
-                               printf("m 0\n");
-                               flush_input();
-                       }
-                       printf("c r %d\n", channel);
                        if (monitor_mode)
-                               printf("m 1\n");
-                       flush_input();
+                               printf("m 0\nc r %d\nm 1\n", channel);
+                       else
+                               printf("c r %d\n", channel);
+                       flush_output();
                }
        }
 
@@ -202,16 +207,17 @@ public class AltosSerial implements Runnable {
                if (altos != null) {
                        if (monitor)
                                printf("m 1\n");
-                       else {
+                       else
                                printf("m 0\n");
-                               flush_input();
-                       }
+                       flush_output();
                }
        }
 
        public void set_callsign(String callsign) {
-               if (altos != null)
+               if (altos != null) {
                        printf ("c c %s\n", callsign);
+                       flush_output();
+               }
        }
 
        public AltosSerial() {
@@ -219,7 +225,7 @@ public class AltosSerial implements Runnable {
                input_thread = null;
                line = "";
                monitor_mode = false;
-               monitors = new LinkedList<LinkedBlockingQueue<String>> ();
-               reply_queue = new LinkedBlockingQueue<String> ();
+               monitors = new LinkedList<LinkedBlockingQueue<AltosLine>> ();
+               reply_queue = new LinkedBlockingQueue<AltosLine> ();
        }
 }