X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosSensorTM.java;fp=altoslib%2FAltosSensorTM.java;h=bdedaa9c88b1218cb64e8a1a91dfbbd0c1163145;hp=5d1b1b7f6c50f24ca023dbbbe83c9516d46e12bb;hb=c8dbcaf69cd538a31ab6e2b568237ae7c8656a9a;hpb=0cbfa444a9f9159cb509bb47ca5590fc1d709f64

diff --git a/altoslib/AltosSensorTM.java b/altoslib/AltosSensorTM.java
index 5d1b1b7f..bdedaa9c 100644
--- a/altoslib/AltosSensorTM.java
+++ b/altoslib/AltosSensorTM.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.util.concurrent.TimeoutException;
 
@@ -29,18 +29,19 @@ public class AltosSensorTM {
 	public int	drogue;
 	public int	main;
 
-	static public void update_state(AltosState state, AltosLink link, AltosConfigData config_data) throws InterruptedException {
+	static public void provide_data(AltosDataListener listener, AltosLink link) throws InterruptedException {
 		try {
 			AltosSensorTM	sensor_tm = new AltosSensorTM(link);
+			AltosCalData	cal_data = listener.cal_data();
 
 			if (sensor_tm == null)
 				return;
-			state.set_accel(sensor_tm.accel);
-			state.set_pressure(AltosConvert.barometer_to_pressure(sensor_tm.pres));
-			state.set_temperature(AltosConvert.thermometer_to_temperature(sensor_tm.temp));
-			state.set_battery_voltage(AltosConvert.cc_battery_to_voltage(sensor_tm.batt));
-			state.set_apogee_voltage(AltosConvert.cc_ignitor_to_voltage(sensor_tm.drogue));
-			state.set_main_voltage(AltosConvert.cc_ignitor_to_voltage(sensor_tm.main));
+			listener.set_acceleration(cal_data.acceleration((sensor_tm.accel)));
+			listener.set_pressure(AltosConvert.barometer_to_pressure(sensor_tm.pres));
+			listener.set_temperature(AltosConvert.thermometer_to_temperature(sensor_tm.temp));
+			listener.set_battery_voltage(AltosConvert.cc_battery_to_voltage(sensor_tm.batt));
+			listener.set_apogee_voltage(AltosConvert.cc_igniter_to_voltage(sensor_tm.drogue));
+			listener.set_main_voltage(AltosConvert.cc_igniter_to_voltage(sensor_tm.main));
 
 		} catch (TimeoutException te) {
 		}