X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosTelemetryFile.java;h=1aa473aee56325da0539787183ce54fafb2ddd0b;hp=01d82c242bd3ef7e1915269eee57ad1d40ac0db6;hb=8ac11767a1b8d3e2faf6f020f5161ed05b801070;hpb=da499044c9d66e42915e3f6429b6b86999b06c2c

diff --git a/altoslib/AltosTelemetryFile.java b/altoslib/AltosTelemetryFile.java
index 01d82c24..1aa473ae 100644
--- a/altoslib/AltosTelemetryFile.java
+++ b/altoslib/AltosTelemetryFile.java
@@ -95,6 +95,7 @@ public class AltosTelemetryFile implements AltosRecordSet {
 
 	AltosTelemetryIterable	telems;
 	AltosCalData		cal_data;
+	int			first_state;
 
 	public void write_comments(PrintStream out) {
 	}
@@ -108,8 +109,11 @@ public class AltosTelemetryFile implements AltosRecordSet {
 			cal_data = new AltosCalData();
 			AltosTelemetryNullListener l = new AltosTelemetryNullListener(cal_data);
 
+			first_state = AltosLib.ao_flight_startup;
 			for (AltosTelemetry telem : telems) {
 				telem.provide_data(l);
+				if (cal_data.state == AltosLib.ao_flight_pad)
+					first_state = cal_data.state;
 				if (l.cal_data_complete())
 					break;
 			}
@@ -122,16 +126,11 @@ public class AltosTelemetryFile implements AltosRecordSet {
 	}
 
 	public void capture_series(AltosDataListener listener) {
-		AltosCalData	cal_data = cal_data();
-
+		cal_data();
 		cal_data.reset();
+		cal_data.state = first_state;
 		for (AltosTelemetry telem : telems) {
-			int tick = telem.tick();
-			cal_data.set_tick(tick);
-
-			/* Try to pick up at least one pre-boost value */
-			if (cal_data.time() >= -2)
-				telem.provide_data(listener);
+			telem.provide_data(listener);
 			if (listener.state() == AltosLib.ao_flight_landed)
 				break;
 		}