summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2011-07-16 21:06:37 -0700
committerKeith Packard <keithp@keithp.com>2011-07-16 21:06:37 -0700
commitabb8510b97ce9cbbff0275cc31f74780fe1ce138 (patch)
tree8a83ffd5f4c79c48be09be1f3b638a1b4b5e69fe
parent0929ee32f753255cbe1474988cb41a5a86d29a0e (diff)
parent00e6981c2e0a668864fcf391932855cd8942140c (diff)
Merge branch 'scan-telemetry' into preload-maps
-rw-r--r--altosui/AltosScanUI.java5
-rw-r--r--altosui/AltosTelemetryReader.java4
2 files changed, 9 insertions, 0 deletions
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();