X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosTelemetryReader.java;h=aea978445578e536b3daf3a5b1ffc73ffaf3675d;hb=3eaaefe6d746a2f53995a2470c5024f37c87c393;hp=3915927c5df0666714af79a3a90700eb15f02f69;hpb=de8d9c5630ae46378c50faf97f7d2e97fe139e30;p=fw%2Faltos

diff --git a/altoslib/AltosTelemetryReader.java b/altoslib/AltosTelemetryReader.java
index 3915927c..aea97844 100644
--- 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,9 +34,12 @@ public class AltosTelemetryReader extends AltosFlightReader {
 		AltosLine l = telem.take();
 		if (l.line == null)
 			throw new IOException("IO error");
-		AltosRecord	next = AltosTelemetry.parse(l.line, previous);
-		previous = next;
-		state = new AltosState (next, state);
+		AltosTelemetry	telem = AltosTelemetry.parse(l.line);
+		if (state == null)
+			state = new AltosState();
+		else
+			state = state.clone();
+		telem.update_state(state);
 		return state;
 	}
 
@@ -46,7 +48,6 @@ public class AltosTelemetryReader extends AltosFlightReader {
 	}
 
 	public void reset() {
-		previous = null;
 		flush();
 	}
 
@@ -123,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);