diff options
| author | Keith Packard <keithp@keithp.com> | 2015-02-07 17:35:15 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2015-02-07 17:35:15 -0800 |
| commit | 9d5a6914982a29d22103e0202735c9e01ee9e831 (patch) | |
| tree | 47f0312c811da5eb627b4929b59da6af33499c84 | |
| parent | cbc9ecd960d0dd27a2275b4550c30c5c88ccf5bb (diff) | |
altoslib: Clear saved TelemetryReader state instead of resetting in ScanUI
Instead of attempting to mash the saved state from AltosScanUI, just
throw it away in AltosTelemetryReader.reset. Much cleaner, and more reliable.
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | altoslib/AltosTelemetryReader.java | 1 | ||||
| -rw-r--r-- | altosuilib/AltosScanUI.java | 2 | ||||
| -rw-r--r-- | configure.ac | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/altoslib/AltosTelemetryReader.java b/altoslib/AltosTelemetryReader.java index b3b97fae..f2d69290 100644 --- a/altoslib/AltosTelemetryReader.java +++ b/altoslib/AltosTelemetryReader.java @@ -53,6 +53,7 @@ public class AltosTelemetryReader extends AltosFlightReader { public void reset() { flush(); + state = null; } public void close(boolean interrupted) { diff --git a/altosuilib/AltosScanUI.java b/altosuilib/AltosScanUI.java index a20a7e14..bfe7ef36 100644 --- a/altosuilib/AltosScanUI.java +++ b/altosuilib/AltosScanUI.java @@ -210,8 +210,6 @@ public class AltosScanUI frequencies[frequency_index], telemetry, rate); - /* Reset the state so we don't get this data for another channel */ - state.init(); Runnable r = new Runnable() { public void run() { results.add(result); diff --git a/configure.ac b/configure.ac index 5186016b..62aea765 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ(2.57) -AC_INIT([altos], 1.5.9.1) +AC_INIT([altos], 1.6) AC_CONFIG_SRCDIR([src/kernel/ao.h]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE |