altoslib: Make cal_data private in AltosDataListener

This way we can create it as needed.

Signed-off-by: Keith Packard <keithp@keithp.com>

1 files changed, 4 insertions, 3 deletions

diff --git a/altoslib/AltosTelemetryMegaData.java b/altoslib/AltosTelemetryMegaData.java
index 29baee8c..7ef9c637 100644
--- a/altoslib/AltosTelemetryMegaData.java
+++ b/altoslib/AltosTelemetryMegaData.java
@@ -39,11 +39,10 @@ public class AltosTelemetryMegaData extends AltosTelemetryStandard {
 		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());
-		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()));
@@ -57,6 +56,8 @@ public class AltosTelemetryMegaData extends AltosTelemetryStandard {
 
 		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());