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>

diff --git a/altoslib/AltosTelemetryReader.java b/altoslib/AltosTelemetryReader.java
index b3b97faea349f7212dd724d647fba46ff9cca142..f2d6929009972e4453945e181eef38c46c11141b 100644 (file)
--- 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 a20a7e141f501911857373f1cb4109f6685df2a4..bfe7ef365d443d388aca31d1697279f73c2d6399 100644 (file)
--- 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 5186016bfa12143be29a1c6b40b9f31a4110cbe6..62aea76598b365b1df061e8446ff179cd9aa9acf 100644 (file)
--- 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