X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosSensorTM.java;h=a25f4d1962474eaeedd613ba6af8d7eec1fe6ed4;hp=2696a3080a252c68f10f43e1b0d49c75f82f5e20;hb=fab890328d4e1151932621a317226bc291b853da;hpb=5b976a6651f4eb05d30afc08b9e1f27c7e52ae00

diff --git a/altoslib/AltosSensorTM.java b/altoslib/AltosSensorTM.java
index 2696a308..a25f4d19 100644
--- a/altoslib/AltosSensorTM.java
+++ b/altoslib/AltosSensorTM.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_2;
+package org.altusmetrum.altoslib_13;
 
 import java.util.concurrent.TimeoutException;
 
@@ -28,21 +29,21 @@ public class AltosSensorTM {
 	public int	drogue;
 	public int	main;
 
-	static public void update_state(AltosState state, AltosLink link, AltosConfigData config_data) {
+	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) {
-		} catch (InterruptedException ie) {
 		}
 	}