altosui: Add debug dongle API, split flash UI out

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

diff --git a/ao-tools/altosui/AltosSerial.java b/ao-tools/altosui/AltosSerial.java
index 96e8b61f599d2329678dbe547b3edc3eb3389f11..a62f122550fd5240bb57e4feac2b46a7eb200e5c 100644 (file)
--- a/ao-tools/altosui/AltosSerial.java
+++ b/ao-tools/altosui/AltosSerial.java
@@ -51,8 +51,6 @@ public class AltosSerial implements Runnable {
 
                try {
                        for (;;) {
-                               if (altos == null)
-                                       break;
                                c = libaltos.altos_getchar(altos, 0);
                                if (Thread.interrupted())
                                        break;
@@ -81,6 +79,10 @@ public class AltosSerial implements Runnable {
                }
        }
 
+       public void flush_reply() {
+               reply_queue.clear();
+       }
+
        public String get_reply() throws InterruptedException {
                return reply_queue.take();
        }
@@ -106,10 +108,8 @@ public class AltosSerial implements Runnable {
        }
 
        public void close() {
-               if (altos != null) {
+               if (altos != null)
                        libaltos.altos_close(altos);
-                       altos = null;
-               }
                if (input_thread != null) {
                        try {
                                input_thread.interrupt();
@@ -118,6 +118,10 @@ public class AltosSerial implements Runnable {
                        }
                        input_thread = null;
                }
+               if (altos != null) {
+                       libaltos.altos_free(altos);
+                       altos = null;
+               }
        }
 
        public void putc(char c) {
@@ -154,6 +158,11 @@ public class AltosSerial implements Runnable {
                        printf("m 0\nc r %d\nm 1\n", channel);
        }
 
+       public void set_callsign(String callsign) {
+               if (altos != null)
+                       printf ("c c %s\n", callsign);
+       }
+
        public AltosSerial() {
                altos = null;
                input_thread = null;