Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / altoslib / AltosTelemetryFile.java

diff --git a/altoslib/AltosTelemetryFile.java b/altoslib/AltosTelemetryFile.java
index 037a6c87f9698a2c018d0426d5ab4aaa3b3d1eb6..e51455f8bb8c00cd4dabb62aa134276942e2e5f9 100644 (file)
--- a/altoslib/AltosTelemetryFile.java
+++ b/altoslib/AltosTelemetryFile.java
@@ -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;
                        }
@@ -125,8 +127,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();