altosuilib: Don't match product_altusmetrum for product_basestation or product_altimeter

[fw/altos] / altoslib / AltosTelemetryReader.java

diff --git a/altoslib/AltosTelemetryReader.java b/altoslib/AltosTelemetryReader.java
index b1cc009c12814f336bf56b9b3d86be1a460fc4ef..aea978445578e536b3daf3a5b1ffc73ffaf3675d 100644 (file)
--- a/altoslib/AltosTelemetryReader.java
+++ b/altoslib/AltosTelemetryReader.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_1;
+package org.altusmetrum.altoslib_2;
 
 import java.text.*;
 import java.io.*;
@@ -24,7 +24,6 @@ import java.util.concurrent.*;
 public class AltosTelemetryReader extends AltosFlightReader {
        AltosLink       link;
        AltosLog        log;
-       AltosRecord     previous;
        double          frequency;
        int             telemetry;
        AltosState      state = null;
@@ -35,7 +34,7 @@ public class AltosTelemetryReader extends AltosFlightReader {
                AltosLine l = telem.take();
                if (l.line == null)
                        throw new IOException("IO error");
-               AltosTelemetry  telem = AltosTelemetryLegacy.parse(l.line);
+               AltosTelemetry  telem = AltosTelemetry.parse(l.line);
                if (state == null)
                        state = new AltosState();
                else
@@ -49,7 +48,6 @@ public class AltosTelemetryReader extends AltosFlightReader {
        }
 
        public void reset() {
-               previous = null;
                flush();
        }
 
@@ -126,7 +124,6 @@ public class AltosTelemetryReader extends AltosFlightReader {
                try {
                        log = new AltosLog(link);
                        name = link.name;
-                       previous = null;
                        telem = new LinkedBlockingQueue<AltosLine>();
                        frequency = AltosPreferences.frequency(link.serial);
                        set_frequency(frequency);