X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosTelemetryLegacy.java;h=027f601e1aa553fa022ae12636e55ee9ac8d7f58;hp=2907f11195aea8f7e351a881b35f5b3777e66031;hb=b986a12b478a6d4ff550786d24aa8628dc0abe32;hpb=7600116a191b3ac252a0f716d200d0e0b3500987

diff --git a/altoslib/AltosTelemetryLegacy.java b/altoslib/AltosTelemetryLegacy.java
index 2907f111..027f601e 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_11;
+package org.altusmetrum.altoslib_12;
 
 import java.text.*;
 
@@ -548,23 +548,26 @@ public class AltosTelemetryLegacy extends AltosTelemetry {
 		}
 	}
 
-	public void update_state(AltosState state) {
-		state.set_tick(tick);
-		state.set_state(this.state);
-		state.set_flight(flight);
-		state.set_serial(serial);
-		state.set_rssi(rssi, status);
+	public void provide_data(AltosDataListener listener) {
+		listener.set_serial(serial);
+		listener.set_tick(tick);
+		listener.set_state(this.state);
+		listener.set_flight(flight);
+		listener.set_rssi(rssi, status);
 
-		state.set_pressure(AltosConvert.barometer_to_pressure(pres));
-		state.set_accel_g(accel_plus_g, accel_minus_g);
-		state.set_accel(accel);
+		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)
-			state.set_kalman(kalman_height, kalman_speed, kalman_acceleration);
-		state.set_temperature(AltosConvert.thermometer_to_temperature(temp));
-		state.set_battery_voltage(AltosConvert.cc_battery_to_voltage(batt));
-		state.set_apogee_voltage(AltosConvert.cc_ignitor_to_voltage(apogee));
-		state.set_main_voltage(AltosConvert.cc_ignitor_to_voltage(main));
+			listener.set_kalman(kalman_height, kalman_speed, kalman_acceleration);
+		listener.set_temperature(AltosConvert.thermometer_to_temperature(temp));
+		listener.set_battery_voltage(AltosConvert.cc_battery_to_voltage(batt));
+		listener.set_apogee_voltage(AltosConvert.cc_igniter_to_voltage(apogee));
+		listener.set_main_voltage(AltosConvert.cc_igniter_to_voltage(main));
 		if (gps != null)
-			state.set_gps(gps, gps_sequence);
+			listener.set_gps(gps);
 	}
 }