summaryrefslogtreecommitdiff
path: root/altoslib/AltosTelemetryFile.java
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2017-06-20 11:18:41 -0700
committerKeith Packard <keithp@keithp.com>2017-06-20 11:18:41 -0700
commit0da4e201041a4420f273c2e0cda77eea78099518 (patch)
tree617f28dbd38b7ade20edb7eb1676ee2b3fc917b0 /altoslib/AltosTelemetryFile.java
parenta61217f0a6d0ef48b6471f632c4600255867e831 (diff)
altoslib: Make cal_data private in AltosDataListener
This way we can create it as needed. Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'altoslib/AltosTelemetryFile.java')
-rw-r--r--altoslib/AltosTelemetryFile.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/altoslib/AltosTelemetryFile.java b/altoslib/AltosTelemetryFile.java
index 037a6c87..135b0284 100644
--- 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,7 +127,7 @@ 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);
+ telem.provide_data(listener);
if (listener.state == AltosLib.ao_flight_landed)
break;
}