altos/telefireone-v2.0: Remove build of ao_product.h from Makefile

[fw/altos] / altoslib / AltosSensorMega.java

diff --git a/altoslib/AltosSensorMega.java b/altoslib/AltosSensorMega.java
index a3c2a033abbdb279fcefd1ea3af163b9e13f1fe0..0aa52176d48b03ba6fdad5c5fb892414bf26bf38 100644 (file)
--- a/altoslib/AltosSensorMega.java
+++ b/altoslib/AltosSensorMega.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_6;
+package org.altusmetrum.altoslib_13;
 
 import java.util.concurrent.TimeoutException;
 
@@ -88,18 +89,18 @@ class AltosSensorMega {
                }
        }
 
-       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 {
                        AltosSensorMega sensor_mega = new AltosSensorMega(link);
 
-                       state.set_battery_voltage(AltosConvert.mega_battery_voltage(sensor_mega.v_batt));
-                       state.set_apogee_voltage(AltosConvert.mega_pyro_voltage(sensor_mega.sense[4]));
-                       state.set_main_voltage(AltosConvert.mega_pyro_voltage(sensor_mega.sense[5]));
+                       listener.set_battery_voltage(AltosConvert.mega_battery_voltage(sensor_mega.v_batt));
+                       listener.set_apogee_voltage(AltosConvert.mega_pyro_voltage(sensor_mega.sense[4]));
+                       listener.set_main_voltage(AltosConvert.mega_pyro_voltage(sensor_mega.sense[5]));
 
-                       double[]        ignitor_voltage = new double[4];
+                       double[]        igniter_voltage = new double[4];
                        for (int i = 0; i < 4; i++)
-                               ignitor_voltage[i] = AltosConvert.mega_pyro_voltage(sensor_mega.sense[i]);
-                       state.set_ignitor_voltage(ignitor_voltage);
+                               igniter_voltage[i] = AltosConvert.mega_pyro_voltage(sensor_mega.sense[i]);
+                       listener.set_igniter_voltage(igniter_voltage);
 
                } catch (TimeoutException te) {
                }