altoslib: Finish AltosState changes. Update version number.

[fw/altos] / altoslib / AltosSensorMetrum.java

diff --git a/altoslib/AltosSensorMetrum.java b/altoslib/AltosSensorMetrum.java
index 686c78a827c3188a9052b5adb23d09200017db40..4a51d492db4188f9d69861f600a34de49c1abb15 100644 (file)
--- a/altoslib/AltosSensorMetrum.java
+++ b/altoslib/AltosSensorMetrum.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_1;
+package org.altusmetrum.altoslib_2;
 
 import java.util.concurrent.TimeoutException;
 
@@ -51,5 +51,16 @@ class AltosSensorMetrum {
                        i++;
                }
        }
+
+       static public void update_state(AltosState state, AltosLink link, AltosConfigData config_data) {
+               try {
+                       AltosSensorMetrum       sensor_metrum = new AltosSensorMetrum(link);
+                       state.set_battery_voltage(AltosConvert.mega_battery_voltage(sensor_metrum.v_batt));
+                       state.set_apogee_voltage(AltosConvert.mega_pyro_voltage(sensor_metrum.sense_a));
+                       state.set_main_voltage(AltosConvert.mega_pyro_voltage(sensor_metrum.sense_m));
+               } catch (TimeoutException te) {
+               } catch (InterruptedException ie) {
+               }
+       }
 }