X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosTelemetryLegacy.java;h=1012a4ec84ed63e2d4c2d3a66d4559a3f4652621;hp=7f3f2ecb2382f9a155b7bea6f79d949a4fac8d2d;hb=HEAD;hpb=a61217f0a6d0ef48b6471f632c4600255867e831

diff --git a/altoslib/AltosTelemetryLegacy.java b/altoslib/AltosTelemetryLegacy.java
index 7f3f2ecb..1012a4ec 100644
--- a/altoslib/AltosTelemetryLegacy.java
+++ b/altoslib/AltosTelemetryLegacy.java
@@ -16,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_12;
+package org.altusmetrum.altoslib_14;
 
 import java.text.*;
 
@@ -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)
@@ -567,6 +568,6 @@ public class AltosTelemetryLegacy extends AltosTelemetry {
 		listener.set_apogee_voltage(AltosConvert.cc_igniter_to_voltage(apogee));
 		listener.set_main_voltage(AltosConvert.cc_igniter_to_voltage(main));
 		if (gps != null)
-			listener.set_gps(gps);
+			listener.set_gps(gps, true, true);
 	}
 }