Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / altoslib / AltosSensorTMini2.java

diff --git a/altoslib/AltosSensorTMini2.java b/altoslib/AltosSensorTMini2.java
index 7e00abd017222360f641a457a28569414116137a..9b5a18545070e7e331886a8e62f33af712aaa179 100644 (file)
--- a/altoslib/AltosSensorTMini2.java
+++ b/altoslib/AltosSensorTMini2.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;
 
@@ -26,15 +26,15 @@ public class AltosSensorTMini2 {
        public int      main;
        public int      batt;
 
-       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 {
                        AltosSensorTMini2       sensor_tmini = new AltosSensorTMini2(link);
 
                        if (sensor_tmini == null)
                                return;
-                       state.set_battery_voltage(AltosConvert.tele_mini_2_voltage(sensor_tmini.batt));
-                       state.set_apogee_voltage(AltosConvert.tele_mini_2_voltage(sensor_tmini.apogee));
-                       state.set_main_voltage(AltosConvert.tele_mini_2_voltage(sensor_tmini.main));
+                       listener.set_battery_voltage(AltosConvert.tele_mini_2_voltage(sensor_tmini.batt));
+                       listener.set_apogee_voltage(AltosConvert.tele_mini_2_voltage(sensor_tmini.apogee));
+                       listener.set_main_voltage(AltosConvert.tele_mini_2_voltage(sensor_tmini.main));
 
                } catch (TimeoutException te) {
                }