X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosTelemetryFile.java;h=a4792f118938b4d0283954d7bd1d8ae8919bb158;hb=cd8b22bef0a88ed6881036b4c6718a4e33c55d41;hp=c6462872700f14e1f90fefcb194266a577082dc6;hpb=222158581887b5f9e8b9843d14321c313fa023fa;p=fw%2Faltos diff --git a/altoslib/AltosTelemetryFile.java b/altoslib/AltosTelemetryFile.java index c6462872..a4792f11 100644 --- 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; } @@ -119,15 +118,21 @@ 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) + + /* 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) + break; } + listener.finish(); } - public AltosTelemetryFile(FileInputStream input) { + public AltosTelemetryFile(FileInputStream input) throws IOException { telems = new AltosTelemetryIterable(input); } }