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 99ba3324e623fbd3d3fe3c82c0323b6b3587c9f3..c4a7ad76a9437117f25091caf9038ced7df1abd0 100644 (file)
--- a/ao-tools/altosui/AltosSerial.java
+++ b/ao-tools/altosui/AltosSerial.java
@@ -71,7 +71,7 @@ public class AltosSerial implements Runnable {
                                                                for (int i = 0; i < line_count; i++)
                                                                        line = line + line_bytes[i];
                                                        }
-                                                       if (line.startsWith("VERSION")) {
+                                                       if (line.startsWith("VERSION") || line.startsWith("CRC")) {
                                                                for (int e = 0; e < monitors.size(); e++) {
                                                                        LinkedBlockingQueue<String> q = monitors.get(e);
                                                                        q.put(line);
@@ -186,10 +186,14 @@ public class AltosSerial implements Runnable {
 
        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 0\nc r %d\nm 1\n", channel);
-                       else
-                               printf("c r %d\n", channel);
+                               printf("m 1\n");
+                       flush_input();
                }
        }
 
@@ -198,8 +202,10 @@ public class AltosSerial implements Runnable {
                if (altos != null) {
                        if (monitor)
                                printf("m 1\n");
-                       else
+                       else {
                                printf("m 0\n");
+                               flush_input();
+                       }
                }
        }