X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosTelemetryMegaData.java;h=7ef9c63759fd0e00ff70823903837c9e162973f0;hb=28a2db68e4806383cfaa7075d454c35cade9633a;hp=b648f300a5fe3c9e859c22dcf48e88bcbe368317;hpb=222158581887b5f9e8b9843d14321c313fa023fa;p=fw%2Faltos

diff --git a/altoslib/AltosTelemetryMegaData.java b/altoslib/AltosTelemetryMegaData.java
index b648f300..7ef9c637 100644
--- a/altoslib/AltosTelemetryMegaData.java
+++ b/altoslib/AltosTelemetryMegaData.java
@@ -16,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_12;
 
 public class AltosTelemetryMegaData extends AltosTelemetryStandard {
 
@@ -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());