X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosTelemetryFile.java;h=1aa473aee56325da0539787183ce54fafb2ddd0b;hb=76c5e6bf7ecc30ae77a9744a4af26dca3dc46254;hp=679c6809559508a7b7c8719e8255b0d0ac00837a;hpb=297eb795b24ec31f6599f48bc8c3769557a7ec6f;p=fw%2Faltos

diff --git a/altoslib/AltosTelemetryFile.java b/altoslib/AltosTelemetryFile.java
index 679c6809..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;
 			}
@@ -117,17 +121,16 @@ public class AltosTelemetryFile implements AltosRecordSet {
 		return cal_data;
 	}
 
-	public void capture_series(AltosDataListener listener) {
-		AltosCalData	cal_data = cal_data();
+	public boolean valid() {
+		return true;
+	}
 
+	public void capture_series(AltosDataListener listener) {
+		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;
 		}