altoslib: Make cal_data private in AltosDataListener

[fw/altos] / altoslib / AltosTelemetryLegacy.java

diff --git a/altoslib/AltosTelemetryLegacy.java b/altoslib/AltosTelemetryLegacy.java
index 7f3f2ecb2382f9a155b7bea6f79d949a4fac8d2d..027f601e1aa553fa022ae12636e55ee9ac8d7f58 100644 (file)
--- a/altoslib/AltosTelemetryLegacy.java
+++ b/altoslib/AltosTelemetryLegacy.java
@@ -548,16 +548,17 @@ public class AltosTelemetryLegacy extends AltosTelemetry {
                }
        }
 
-       public void provide_data(AltosDataListener listener, AltosCalData cal_data) {
-               cal_data.set_tick(tick);
-               listener.set_time(cal_data.time());
+       public void provide_data(AltosDataListener listener) {
+               listener.set_serial(serial);
+               listener.set_tick(tick);
                listener.set_state(this.state);
-               cal_data.set_state(this.state);
-               cal_data.set_flight(flight);
-               cal_data.set_serial(serial);
+               listener.set_flight(flight);
                listener.set_rssi(rssi, status);
 
                listener.set_pressure(AltosConvert.barometer_to_pressure(pres));
+
+               AltosCalData cal_data = listener.cal_data();
+
                cal_data.set_accel_plus_minus(accel_plus_g, accel_minus_g);
                listener.set_acceleration(cal_data.acceleration(accel));
                if (kalman_height != AltosLib.MISSING)