altoslib: Drop telemetry packets processed while monitoring is disabled

[fw/altos] / altoslib / AltosTelemetryReader.java

diff --git a/altoslib/AltosTelemetryReader.java b/altoslib/AltosTelemetryReader.java
index 7539452d4ad9cf3cb609a48b58292b197e128911..b3b97faea349f7212dd724d647fba46ff9cca142 100644 (file)
--- a/altoslib/AltosTelemetryReader.java
+++ b/altoslib/AltosTelemetryReader.java
@@ -28,20 +28,16 @@ public class AltosTelemetryReader extends AltosFlightReader {
        int             telemetry;
        int             telemetry_rate;
        AltosState      state = null;
-       AltosFlightReader       stacked;
 
        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();
@@ -61,11 +57,6 @@ public class AltosTelemetryReader extends AltosFlightReader {
 
        public void close(boolean interrupted) {
 
-               if (stacked != null) {
-                       stacked.close(interrupted);
-                       stacked = null;
-               }
-
                link.remove_monitor(telem);
                log.close();
                try {
@@ -161,10 +152,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 +173,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));
-       }
 }