From: Keith Packard <keithp@keithp.com>
Date: Sun, 17 Jul 2011 04:05:06 +0000 (-0700)
Subject: altosui: Flush telemetry lines before starting to watch for scan results
X-Git-Tag: 0.9.4.5~18^2~3^2
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=00e6981c2e0a668864fcf391932855cd8942140c;ds=sidebyside

altosui: Flush telemetry lines before starting to watch for scan results

This prevents pending telemetry lines from being incorrectly
attributed to the wrong channel/telemetry.

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

diff --git a/altosui/AltosScanUI.java b/altosui/AltosScanUI.java
index bc1638ed..96cab73b 100644
--- a/altosui/AltosScanUI.java
+++ b/altosui/AltosScanUI.java
@@ -280,6 +280,11 @@ public class AltosScanUI
 			reader = new AltosTelemetryReader(device);
 			reader.serial.set_channel(channel);
 			reader.serial.set_telemetry(telemetry);
+			try {
+				Thread.sleep(100);
+			} catch (InterruptedException ie) {
+			}
+			reader.flush();
 			handler = new TelemetryHandler();
 			thread = new Thread(handler);
 			thread.start();
diff --git a/altosui/AltosTelemetryReader.java b/altosui/AltosTelemetryReader.java
index 18f17841..23524b2c 100644
--- a/altosui/AltosTelemetryReader.java
+++ b/altosui/AltosTelemetryReader.java
@@ -39,6 +39,10 @@ class AltosTelemetryReader extends AltosFlightReader {
 		return next;
 	}
 
+	void flush() {
+		telem.clear();
+	}
+
 	void close(boolean interrupted) {
 		serial.remove_monitor(telem);
 		log.close();