altosui: Handle Monitor Idle errors better

[fw/altos] / altoslib / AltosLink.java

diff --git a/altoslib/AltosLink.java b/altoslib/AltosLink.java
index d59e73ba6eca2a690da98f0d46e9db7e6c870919..fd5db7e977fd7092ee7a79077a7343abb3905029 100644 (file)
--- a/altoslib/AltosLink.java
+++ b/altoslib/AltosLink.java
@@ -101,15 +101,23 @@ public abstract class AltosLink {
                try {
                        for (;;) {
                                c = getchar();
-                               if (Thread.interrupted())
+                               if (Thread.interrupted()) {
+                                       if (debug)
+                                               System.out.printf("INTERRUPTED\n");
                                        break;
+                               }
                                if (c == ERROR) {
+                                       if (debug)
+                                               System.out.printf("ERROR\n");
                                        add_telem (new AltosLine());
                                        add_reply (new AltosLine());
                                        break;
                                }
-                               if (c == TIMEOUT)
+                               if (c == TIMEOUT) {
+                                       if (debug)
+                                               System.out.printf("TIMEOUT\n");
                                        continue;
+                               }
                                if (c == '\r')
                                        continue;
                                synchronized(this) {
@@ -180,6 +188,14 @@ public abstract class AltosLink {
                reply_queue.put (line);
        }
 
+       public void abort_reply() {
+               try {
+                       add_telem (new AltosLine());
+                       add_reply (new AltosLine());
+               } catch (InterruptedException e) {
+               }
+       }
+
        public void add_string(String line) throws InterruptedException {
                if (line.startsWith("TELEM") || line.startsWith("VERSION") || line.startsWith("CRC")) {
                        add_telem(new AltosLine(line));