altoslib: Fix EasyMini voltage computations

[fw/altos] / altoslib / AltosSensorEMini.java

diff --git a/altoslib/AltosSensorEMini.java b/altoslib/AltosSensorEMini.java
index cbc65143fa9b51a4df9be57124efcbdd474fd31c..5f43b3a9ecf6aebcfde8f24c4190ec77436cf14a 100644 (file)
--- a/altoslib/AltosSensorEMini.java
+++ b/altoslib/AltosSensorEMini.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_2;
+package org.altusmetrum.altoslib_3;
 
 import java.util.concurrent.TimeoutException;
 
@@ -25,18 +25,17 @@ public class AltosSensorEMini {
        public int      main;
        public int      batt;
 
-       static public void update_state(AltosState state, AltosLink link, AltosConfigData config_data) {
+       static public void update_state(AltosState state, AltosLink link, AltosConfigData config_data) throws InterruptedException {
                try {
                        AltosSensorEMini        sensor_emini = new AltosSensorEMini(link);
 
                        if (sensor_emini == null)
                                return;
-                       state.set_battery_voltage(AltosConvert.easy_mini_voltage(sensor_emini.batt));
-                       state.set_apogee_voltage(AltosConvert.easy_mini_voltage(sensor_emini.apogee));
-                       state.set_main_voltage(AltosConvert.easy_mini_voltage(sensor_emini.main));
-                       
+                       state.set_battery_voltage(AltosConvert.easy_mini_voltage(sensor_emini.batt, config_data.serial));
+                       state.set_apogee_voltage(AltosConvert.easy_mini_voltage(sensor_emini.apogee, config_data.serial));
+                       state.set_main_voltage(AltosConvert.easy_mini_voltage(sensor_emini.main, config_data.serial));
+
                } catch (TimeoutException te) {
-               } catch (InterruptedException ie) {
                }
        }