X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosTelemetrySensor.java;h=2219088a07fc133fd84067743adfea467562c04c;hp=b669b9e6441e8db35bcb498284bba864a7ad3376;hb=bed019b64d9e37f276ad5aa2dabb7681aae122ec;hpb=7600116a191b3ac252a0f716d200d0e0b3500987

diff --git a/altoslib/AltosTelemetrySensor.java b/altoslib/AltosTelemetrySensor.java
index b669b9e6..2219088a 100644
--- a/altoslib/AltosTelemetrySensor.java
+++ b/altoslib/AltosTelemetrySensor.java
@@ -16,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_13;
 
 
 public class AltosTelemetrySensor extends AltosTelemetryStandard {
@@ -41,24 +41,27 @@ public class AltosTelemetrySensor extends AltosTelemetryStandard {
 		super(bytes);
 	}
 
-	public void update_state(AltosState state) {
-		super.update_state(state);
+	public void provide_data(AltosDataListener listener) {
+		super.provide_data(listener);
+
+		listener.set_state(state());
+
+		AltosCalData	cal_data = listener.cal_data();
 
-		state.set_state(state());
 		if (type() == packet_type_TM_sensor) {
-			state.set_ground_accel(ground_accel());
-			state.set_accel_g(accel_plus_g(), accel_minus_g());
-			state.set_accel(accel());
+			cal_data.set_ground_accel(ground_accel());
+			cal_data.set_accel_plus_minus(accel_plus_g(), accel_minus_g());
+			listener.set_acceleration(cal_data.acceleration(accel()));
 		}
-		state.set_ground_pressure(AltosConvert.barometer_to_pressure(ground_pres()));
-		state.set_pressure(AltosConvert.barometer_to_pressure(pres()));
-		state.set_temperature(AltosConvert.thermometer_to_temperature(temp()));
-		state.set_battery_voltage(AltosConvert.cc_battery_to_voltage(v_batt()));
+		cal_data.set_ground_pressure(AltosConvert.barometer_to_pressure(ground_pres()));
+		listener.set_pressure(AltosConvert.barometer_to_pressure(pres()));
+		listener.set_temperature(AltosConvert.thermometer_to_temperature(temp()));
+		listener.set_battery_voltage(AltosConvert.cc_battery_to_voltage(v_batt()));
 		if (type() == packet_type_TM_sensor || type() == packet_type_Tm_sensor) {
-			state.set_apogee_voltage(AltosConvert.cc_ignitor_to_voltage(sense_d()));
-			state.set_main_voltage(AltosConvert.cc_ignitor_to_voltage(sense_m()));
+			listener.set_apogee_voltage(AltosConvert.cc_igniter_to_voltage(sense_d()));
+			listener.set_main_voltage(AltosConvert.cc_igniter_to_voltage(sense_m()));
 		}
 
-		state.set_kalman(height_16(), speed()/16.0, acceleration()/16.0);
+		listener.set_kalman(height_16(), speed()/16.0, acceleration()/16.0);
 	}
 }