X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosTelemetryFile.java;h=01d82c242bd3ef7e1915269eee57ad1d40ac0db6;hb=8554da3b6c05c1094045f4fb21b43c183029408f;hp=a4792f118938b4d0283954d7bd1d8ae8919bb158;hpb=78b4bf77fca96bef2cce443ad4c9544ae83f0acc;p=fw%2Faltos

diff --git a/altoslib/AltosTelemetryFile.java b/altoslib/AltosTelemetryFile.java
index a4792f11..01d82c24 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_13;
 
 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;
 			}
@@ -115,6 +117,10 @@ public class AltosTelemetryFile implements AltosRecordSet {
 		return cal_data;
 	}
 
+	public boolean valid() {
+		return true;
+	}
+
 	public void capture_series(AltosDataListener listener) {
 		AltosCalData	cal_data = cal_data();
 
@@ -125,8 +131,8 @@ public class AltosTelemetryFile implements AltosRecordSet {
 
 			/* Try to pick up at least one pre-boost value */
 			if (cal_data.time() >= -2)
-				telem.provide_data(listener, cal_data);
-			if (listener.state == AltosLib.ao_flight_landed)
+				telem.provide_data(listener);
+			if (listener.state() == AltosLib.ao_flight_landed)
 				break;
 		}
 		listener.finish();