From: Keith Packard <keithp@keithp.com>
Date: Fri, 3 Sep 2010 08:21:57 +0000 (-0700)
Subject: altosui: Deal with altos bug setting radio channel while monitoring
X-Git-Tag: debian/0.7+53+g59798c6~5
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=ba65e4aeb952a1cf49a77f1e24e235508fcea71f

altosui: Deal with altos bug setting radio channel while monitoring

If the monitoring thread is active, then setting the radio channel can
sometimes cause the monitoring thread to get stuck. I'm not entirely
sure why though. For now, work around the issue by making sure
monitoring is off, and the monitoring thread has stopped, before
changing the radio channel.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/ao-tools/altosui/AltosSerial.java b/ao-tools/altosui/AltosSerial.java
index c3daf3b9..c4a7ad76 100644
--- a/ao-tools/altosui/AltosSerial.java
+++ b/ao-tools/altosui/AltosSerial.java
@@ -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();
+			}
 		}
 	}