first cut at turnon scripts for EasyTimer v2

[fw/altos] / altoslib / AltosSensorEMini.java

diff --git a/altoslib/AltosSensorEMini.java b/altoslib/AltosSensorEMini.java
index a144ec7a1dd9cefa0b09faaac199dcbf4f2bd9d8..33026c07ffc1e5162a441e2ac9a2f1a8aa5b4b47 100644 (file)
--- a/altoslib/AltosSensorEMini.java
+++ b/altoslib/AltosSensorEMini.java
@@ -16,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_12;
+package org.altusmetrum.altoslib_14;
 
 import java.util.concurrent.TimeoutException;
 
@@ -26,9 +26,10 @@ public class AltosSensorEMini {
        public int      main;
        public int      batt;
 
-       static public void provide_data(AltosDataListener listener, AltosLink link, AltosCalData cal_data, int version) throws InterruptedException {
+       static public void provide_data(AltosDataListener listener, AltosLink link, int version) throws InterruptedException {
                try {
                        AltosSensorEMini        sensor_emini = new AltosSensorEMini(link);
+                       AltosCalData            cal_data = listener.cal_data();
 
                        if (sensor_emini == null)
                                return;
@@ -43,6 +44,11 @@ public class AltosSensorEMini {
                                listener.set_apogee_voltage(AltosConvert.easy_mini_2_voltage(sensor_emini.apogee));
                                listener.set_main_voltage(AltosConvert.easy_mini_2_voltage(sensor_emini.main));
                                break;
+                       case 3:
+                               listener.set_battery_voltage(AltosConvert.easy_mini_3_voltage(sensor_emini.batt));
+                               listener.set_apogee_voltage(AltosConvert.easy_mini_3_voltage(sensor_emini.apogee));
+                               listener.set_main_voltage(AltosConvert.easy_mini_3_voltage(sensor_emini.main));
+                               break;
                        }
 
                } catch (TimeoutException te) {