X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosTelemetryReader.java;h=f2d6929009972e4453945e181eef38c46c11141b;hb=426bacbbd6e0573b143e7c48d71db977e53181fc;hp=5ed501348b07174bb0debee09d499ada26bffb56;hpb=55e6558fa7cb23fb1363a86c83fbd6abf67ea324;p=fw%2Faltos diff --git a/altoslib/AltosTelemetryReader.java b/altoslib/AltosTelemetryReader.java index 5ed50134..f2d69290 100644 --- a/altoslib/AltosTelemetryReader.java +++ b/altoslib/AltosTelemetryReader.java @@ -32,9 +32,12 @@ public class AltosTelemetryReader extends AltosFlightReader { LinkedBlockingQueue telem; public AltosState read() throws InterruptedException, ParseException, AltosCRCException, IOException { - 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(); @@ -50,9 +53,11 @@ public class AltosTelemetryReader extends AltosFlightReader { public void reset() { flush(); + state = null; } public void close(boolean interrupted) { + link.remove_monitor(telem); log.close(); try {