Revert "altosui: Deal with altos bug setting radio channel while monitoring"
authorKeith Packard <keithp@keithp.com>
Fri, 3 Sep 2010 18:48:55 +0000 (11:48 -0700)
committerKeith Packard <keithp@keithp.com>
Fri, 3 Sep 2010 18:48:55 +0000 (11:48 -0700)
This reverts commit ba65e4aeb952a1cf49a77f1e24e235508fcea71f.

Testing the old code

ao-tools/altosui/AltosSerial.java

index c4a7ad76a9437117f25091caf9038ced7df1abd0..c3daf3b93cd8c00188ddff48563995d079b65cf0 100644 (file)
@@ -186,14 +186,10 @@ 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 1\n");
-                       flush_input();
+                               printf("m 0\nc r %d\nm 1\n", channel);
+                       else
+                               printf("c r %d\n", channel);
                }
        }
 
@@ -202,10 +198,8 @@ public class AltosSerial implements Runnable {
                if (altos != null) {
                        if (monitor)
                                printf("m 1\n");
-                       else {
+                       else
                                printf("m 0\n");
-                               flush_input();
-                       }
                }
        }