X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosuilib%2FAltosScanUI.java;h=bfe7ef365d443d388aca31d1697279f73c2d6399;hb=9d5a6914982a29d22103e0202735c9e01ee9e831;hp=7e51a55a757d174d8dce0a1ac6566cefbbaf5d8d;hpb=fb914d37018a585a879161483609d3c0be556d1e;p=fw%2Faltos

diff --git a/altosuilib/AltosScanUI.java b/altosuilib/AltosScanUI.java
index 7e51a55a..bfe7ef36 100644
--- a/altosuilib/AltosScanUI.java
+++ b/altosuilib/AltosScanUI.java
@@ -159,6 +159,8 @@ public class AltosScanUI
 	Thread				thread;
 	AltosFrequency[]		frequencies;
 	int				frequency_index;
+	int				packet_count;
+	int				tick_count;
 
 	void scan_exception(Exception e) {
 		if (e instanceof FileNotFoundException) {
@@ -200,6 +202,7 @@ public class AltosScanUI
 						AltosState	state = reader.read();
 						if (state == null)
 							continue;
+						packet_count++;
 						if (state.flight != AltosLib.MISSING) {
 							final AltosScanResult	result = new AltosScanResult(state.callsign,
 													     state.serial,
@@ -251,9 +254,6 @@ public class AltosScanUI
 	void next() throws InterruptedException, TimeoutException {
 		reader.set_monitor(false);
 
-		/* Let any pending input from the last configuration drain out */
-		Thread.sleep(100);
-
 		if (select_rate) {
 			boolean	wrapped = false;
 			do {
@@ -284,6 +284,8 @@ public class AltosScanUI
 				return;
 			}
 		}
+		packet_count = 0;
+		tick_count = 0;
 		++frequency_index;
 		if (frequency_index >= frequencies.length)
 			frequency_index = 0;
@@ -308,7 +310,9 @@ public class AltosScanUI
 	}
 
 	void tick_timer() throws InterruptedException, TimeoutException {
-		next();
+		++tick_count;
+		if (packet_count == 0 || tick_count > 5)
+			next();
 	}
 
 	public void actionPerformed(ActionEvent e) {
@@ -356,7 +360,6 @@ public class AltosScanUI
 				if (r != null) {
 					if (device != null) {
 						if (reader != null) {
-							System.out.printf("frequency %g rate %d\n", r.frequency.frequency, r.rate);
 							reader.set_telemetry(r.telemetry);
 							reader.set_telemetry_rate(r.rate);
 							reader.set_frequency(r.frequency.frequency);