X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosTelemetryFile.java;h=135b028447bb6ac49bf85ccbce1b6ea33cf27be4;hb=2969f0af52dfbdea7593b208e510c7b17227064c;hp=077ef9c6336560084fee5b37232939467b8c55a1;hpb=da914cd72411af8c36af05b13c11b9093c8a378c;p=fw%2Faltos

diff --git a/altoslib/AltosTelemetryFile.java b/altoslib/AltosTelemetryFile.java
index 077ef9c6..135b0284 100644
--- a/altoslib/AltosTelemetryFile.java
+++ b/altoslib/AltosTelemetryFile.java
@@ -16,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_12;
 
 import java.io.*;
 import java.util.*;
@@ -52,6 +52,8 @@ class AltosTelemetryNullListener extends AltosDataListener {
 
 	public boolean cal_data_complete() {
 		/* All telemetry packets */
+		AltosCalData cal_data = cal_data();
+
 		if (cal_data.serial == AltosLib.MISSING)
 			return false;
 
@@ -107,7 +109,7 @@ public class AltosTelemetryFile implements AltosRecordSet {
 			AltosTelemetryNullListener l = new AltosTelemetryNullListener(cal_data);
 
 			for (AltosTelemetry telem : telems) {
-				telem.provide_data(l, cal_data);
+				telem.provide_data(l);
 				if (l.cal_data_complete())
 					break;
 			}
@@ -118,11 +120,14 @@ public class AltosTelemetryFile implements AltosRecordSet {
 	public void capture_series(AltosDataListener listener) {
 		AltosCalData	cal_data = cal_data();
 
+		cal_data.reset();
 		for (AltosTelemetry telem : telems) {
 			int tick = telem.tick();
 			cal_data.set_tick(tick);
-			if (cal_data.time() >= -1)
-				telem.provide_data(listener, cal_data);
+
+			/* Try to pick up at least one pre-boost value */
+			if (cal_data.time() >= -2)
+				telem.provide_data(listener);
 			if (listener.state == AltosLib.ao_flight_landed)
 				break;
 		}