altoslib: Make cal_data private in AltosDataListener

[fw/altos] / altoslib / AltosTelemetryMegaData.java

diff --git a/altoslib/AltosTelemetryMegaData.java b/altoslib/AltosTelemetryMegaData.java
index 29baee8c4f7c9ededa4b6c3746fef0fc5f095268..7ef9c63759fd0e00ff70823903837c9e162973f0 100644 (file)
--- a/altoslib/AltosTelemetryMegaData.java
+++ b/altoslib/AltosTelemetryMegaData.java
@@ -39,11 +39,10 @@ public class AltosTelemetryMegaData extends AltosTelemetryStandard {
                super(bytes);
        }
 
                super(bytes);
        }
 

-       public void provide_data(AltosDataListener listener, AltosCalData cal_data) {
-               super.provide_data(listener, cal_data);
+       public void provide_data(AltosDataListener listener) {
+               super.provide_data(listener);

 
                listener.set_state(state());
 
                listener.set_state(state());

-               cal_data.set_state(state());

 
                listener.set_battery_voltage(AltosConvert.mega_battery_voltage(v_batt()));
                listener.set_pyro_voltage(AltosConvert.mega_pyro_voltage(v_pyro()));
 
                listener.set_battery_voltage(AltosConvert.mega_battery_voltage(v_batt()));
                listener.set_pyro_voltage(AltosConvert.mega_pyro_voltage(v_pyro()));


@@ -57,6 +56,8 @@ public class AltosTelemetryMegaData extends AltosTelemetryStandard {
 
                listener.set_igniter_voltage(voltages);
 
 
                listener.set_igniter_voltage(voltages);
 

+               AltosCalData cal_data = listener.cal_data();
+

                cal_data.set_ground_accel(ground_accel());
                cal_data.set_ground_pressure(ground_pres());
                cal_data.set_accel_plus_minus(accel_plus_g(), accel_minus_g());
                cal_data.set_ground_accel(ground_accel());
                cal_data.set_ground_pressure(ground_pres());
                cal_data.set_accel_plus_minus(accel_plus_g(), accel_minus_g());