altoslib: Extract a few more values from config to cal_data

[fw/altos] / altoslib / AltosTelemetryFile.java

diff --git a/altoslib/AltosTelemetryFile.java b/altoslib/AltosTelemetryFile.java
index c6462872700f14e1f90fefcb194266a577082dc6..40b9c9bfb85f1f25487112bae905f342bf197a7d 100644 (file)
--- a/altoslib/AltosTelemetryFile.java
+++ b/altoslib/AltosTelemetryFile.java
@@ -111,7 +111,6 @@ public class AltosTelemetryFile implements AltosRecordSet {
                                if (l.cal_data_complete())
                                        break;
                        }
-                       System.out.printf("Telemetry boost tick %d\n", cal_data.boost_tick);
                }
                return cal_data;
        }
@@ -124,7 +123,10 @@ public class AltosTelemetryFile implements AltosRecordSet {
                        cal_data.set_tick(tick);
                        if (cal_data.time() >= -1)
                                telem.provide_data(listener, cal_data);
+                       if (listener.state == AltosLib.ao_flight_landed)
+                               break;
                }
+               listener.finish();
        }
 
        public AltosTelemetryFile(FileInputStream input) {