X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosTelemetryMetrumSensor.java;h=e003c8316037af7e2d9a45d10f56c2b46c80f60a;hp=e666f4ec29939c85c2d2e948e53636df5c9e56fc;hb=f26cfe417c6977cf1e7e75a4f050e25f64d41859;hpb=7600116a191b3ac252a0f716d200d0e0b3500987

diff --git a/altoslib/AltosTelemetryMetrumSensor.java b/altoslib/AltosTelemetryMetrumSensor.java
index e666f4ec..e003c831 100644
--- a/altoslib/AltosTelemetryMetrumSensor.java
+++ b/altoslib/AltosTelemetryMetrumSensor.java
@@ -38,21 +38,21 @@ public class AltosTelemetryMetrumSensor extends AltosTelemetryStandard {
 		super(bytes);
 	}
 
-	public void update_state(AltosState state) {
-		super.update_state(state);
+	public void provide_data(AltosDataListener listener, AltosCalData cal_data) {
+		super.provide_data(listener, cal_data);
 
-		state.set_state(state());
+		listener.set_state(state());
+		cal_data.set_state(state());
 
-		state.set_accel(accel());
-		state.set_pressure(pres());
-		state.set_temperature(temp()/100.0);
+		listener.set_acceleration(cal_data.acceleration(accel()));
+		listener.set_pressure(pres());
+		listener.set_temperature(temp()/100.0);
 
-		state.set_kalman(extend_height(state, height_16()),
-				 speed()/16.0, acceleration()/16.0);
+		listener.set_kalman(height_16(), speed()/16.0, acceleration()/16.0);
 
-		state.set_battery_voltage(AltosConvert.mega_battery_voltage(v_batt()));
+		listener.set_battery_voltage(AltosConvert.mega_battery_voltage(v_batt()));
 
-		state.set_apogee_voltage(AltosConvert.mega_pyro_voltage(sense_a()));
-		state.set_main_voltage(AltosConvert.mega_pyro_voltage(sense_m()));
+		listener.set_apogee_voltage(AltosConvert.mega_pyro_voltage(sense_a()));
+		listener.set_main_voltage(AltosConvert.mega_pyro_voltage(sense_m()));
 	}
 }