Revert "altosui: Deal with altos bug setting radio channel while monitoring"

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

diff --git a/ao-tools/altosui/AltosSerial.java b/ao-tools/altosui/AltosSerial.java
index f12b31b3187e9b253b4a3560080db9d8e2966d7e..c3daf3b93cd8c00188ddff48563995d079b65cf0 100644 (file)
--- a/ao-tools/altosui/AltosSerial.java
+++ b/ao-tools/altosui/AltosSerial.java
@@ -45,6 +45,9 @@ public class AltosSerial implements Runnable {
        LinkedBlockingQueue<String> reply_queue;
        Thread input_thread;
        String line;
+       byte[] line_bytes;
+       int line_count;
+       boolean monitor_mode;
 
        public void run () {
                int c;
@@ -60,18 +63,36 @@ public class AltosSerial implements Runnable {
                                        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);
                                                                }
-                                                       } else
+                                                       } else {
+//                                                             System.out.printf("GOT: %s\n", line);
                                                                reply_queue.put(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,24 +100,39 @@ public class AltosSerial implements Runnable {
                }
        }
 
+       public void flush_output() {
+               libaltos.altos_flush(altos);
+       }
+
+       public void flush_input() {
+               flush_output();
+               try {
+                       Thread.sleep(200);
+               } catch (InterruptedException ie) {
+               }
+               synchronized(this) {
+                       if (!"VERSION".startsWith(line) &&
+                           !line.startsWith("VERSION"))
+                               line = "";
+                       reply_queue.clear();
+               }
+       }
+
        public String get_reply() throws InterruptedException {
-               return reply_queue.take();
+               flush_output();
+               String line = reply_queue.take();
+               return line;
        }
 
        public void add_monitor(LinkedBlockingQueue<String> q) {
+               set_monitor(true);
                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"))
-                               line = "";
-                       reply_queue.clear();
-               }
+               if (monitors.isEmpty())
+                       set_monitor(false);
        }
 
        public boolean opened() {
@@ -106,7 +142,6 @@ public class AltosSerial implements Runnable {
        public void close() {
                if (altos != null) {
                        libaltos.altos_close(altos);
-                       altos = null;
                }
                if (input_thread != null) {
                        try {
@@ -116,6 +151,10 @@ public class AltosSerial implements Runnable {
                        }
                        input_thread = null;
                }
+               if (altos != null) {
+                       libaltos.altos_free(altos);
+                       altos = null;
+               }
        }
 
        public void putc(char c) {
@@ -124,6 +163,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));
        }
@@ -139,23 +179,40 @@ public class AltosSerial implements Runnable {
                        throw new FileNotFoundException(device.getPath());
                input_thread = new Thread(this);
                input_thread.start();
-               print("\nE 0\nm 1\n");
-               try {
-                       Thread.sleep(200);
-               } catch (InterruptedException e) {
-               }
-               flush();
+               print("~\nE 0\n");
+               set_monitor(monitor_mode);
+               flush_input();
        }
 
        public void set_channel(int channel) {
+               if (altos != null) {
+                       if (monitor_mode)
+                               printf("m 0\nc r %d\nm 1\n", channel);
+                       else
+                               printf("c r %d\n", channel);
+               }
+       }
+
+       void set_monitor(boolean monitor) {
+               monitor_mode = monitor;
+               if (altos != null) {
+                       if (monitor)
+                               printf("m 1\n");
+                       else
+                               printf("m 0\n");
+               }
+       }
+
+       public void set_callsign(String callsign) {
                if (altos != null)
-                       printf("m 0\nc r %d\nm 1\n", channel);
+                       printf ("c c %s\n", callsign);
        }
 
        public AltosSerial() {
                altos = null;
                input_thread = null;
                line = "";
+               monitor_mode = false;
                monitors = new LinkedList<LinkedBlockingQueue<String>> ();
                reply_queue = new LinkedBlockingQueue<String> ();
        }