X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosTelemetryReader.java;h=9611361310a229b614cf8d9d6c734bc5e6e207d0;hb=222158581887b5f9e8b9843d14321c313fa023fa;hp=5ed501348b07174bb0debee09d499ada26bffb56;hpb=55e6558fa7cb23fb1363a86c83fbd6abf67ea324;p=fw%2Faltos

diff --git a/altoslib/AltosTelemetryReader.java b/altoslib/AltosTelemetryReader.java
index 5ed50134..96113613 100644
--- 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,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_5;
+package org.altusmetrum.altoslib_11;
 
 import java.text.*;
 import java.io.*;
@@ -27,20 +28,24 @@ public class AltosTelemetryReader extends AltosFlightReader {
 	double		frequency;
 	int		telemetry;
 	int		telemetry_rate;
-	AltosState	state = null;
+	public AltosState	state = null;
+	public AltosCalData	cal_data = null;
 
 	LinkedBlockingQueue<AltosLine> 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 (cal_data == null)
+			cal_data = new AltosCalData();
 		if (state == null)
-			state = new AltosState();
-		else
-			state = state.clone();
-		telem.update_state(state);
+			state = new AltosState(cal_data);
+		telem.provide_data(state, cal_data);
 		return state;
 	}
 
@@ -50,9 +55,12 @@ public class AltosTelemetryReader extends AltosFlightReader {
 
 	public void reset() {
 		flush();
+		state = null;
+		cal_data = null;
 	}
 
 	public void close(boolean interrupted) {
+
 		link.remove_monitor(telem);
 		log.close();
 		try {