Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / altoslib / AltosTelemetryReader.java

diff --git a/altoslib/AltosTelemetryReader.java b/altoslib/AltosTelemetryReader.java
index 7539452d4ad9cf3cb609a48b58292b197e128911..8fb61a4fe32490cbc4a31a6f16dbb71f33d0f643 100644 (file)
--- a/altoslib/AltosTelemetryReader.java
+++ b/altoslib/AltosTelemetryReader.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,57 +16,55 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_5;
+package org.altusmetrum.altoslib_12;
 
 import java.text.*;
 import java.io.*;
 import java.util.concurrent.*;
 
 public class AltosTelemetryReader extends AltosFlightReader {
-       AltosLink       link;
-       AltosLog        log;
-       double          frequency;
-       int             telemetry;
-       int             telemetry_rate;
-       AltosState      state = null;
-       AltosFlightReader       stacked;
+       AltosLink               link;
+       AltosLog                log;
+       double                  frequency;
+       int                     telemetry;
+       int                     telemetry_rate;
+       private AltosState      state = null;
+       private AltosCalData    cal_data = null;
 
        LinkedBlockingQueue<AltosLine> telem;
 
        public AltosState read() throws InterruptedException, ParseException, AltosCRCException, IOException {
-               if (stacked != null) {
-                       state = stacked.read();
-                       if (state != null)
-                               return state;
-                       stacked = null;
-               }
-               AltosLine l = telem.take();
-               if (l.line == null)
-                       throw new IOException("IO error");
+               AltosLine l;
+               do {
+                       l = telem.take();
+                       if (l.line == null)
+                               throw new IOException("IO error");
+               } while (!link.get_monitor());
                AltosTelemetry  telem = AltosTelemetry.parse(l.line);
                if (state == null)
-                       state = new AltosState();
-               else
-                       state = state.clone();
-               telem.update_state(state);
+                       state = new AltosState(cal_data());
+               telem.provide_data(state);
                return state;
        }
 
+       public AltosCalData cal_data() {
+               if (cal_data == null)
+                       cal_data = new AltosCalData();
+               return cal_data;
+       }
+
        public void flush() {
                telem.clear();
        }
 
        public void reset() {
                flush();
+               state = null;
+               cal_data = null;
        }
 
        public void close(boolean interrupted) {
 
-               if (stacked != null) {
-                       stacked.close(interrupted);
-                       stacked = null;
-               }
-
                link.remove_monitor(telem);
                log.close();
                try {
@@ -161,10 +160,9 @@ public class AltosTelemetryReader extends AltosFlightReader {
                return link.monitor_battery();
        }
 
-       public AltosTelemetryReader (AltosLink in_link, AltosFlightReader in_stacked)
+       public AltosTelemetryReader (AltosLink in_link)
                throws IOException, InterruptedException, TimeoutException {
                link = in_link;
-               stacked = in_stacked;
                boolean success = false;
                try {
                        log = new AltosLog(link);
@@ -183,22 +181,4 @@ public class AltosTelemetryReader extends AltosFlightReader {
                                close(true);
                }
        }
-
-       private static AltosFlightReader existing_data(AltosLink link) {
-               if (link == null)
-                       return null;
-
-               File    file = AltosPreferences.logfile(link.serial);
-               if (file != null) {
-                       AltosStateIterable      iterable = AltosStateIterable.iterable(file);
-                       if (iterable != null)
-                               return new AltosReplayReader(iterable.iterator(), file, false);
-               }
-               return null;
-       }
-
-       public AltosTelemetryReader(AltosLink link)
-               throws IOException, InterruptedException, TimeoutException {
-               this(link, existing_data(link));
-       }
 }