X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosSensorMetrum.java;h=efed1a6f55883b0b54a0c9d99c3db1049b017567;hp=c00e00d5738f001e2c67cb4231d55fa535edcf71;hb=72bcff4c1af10571314e5cbbe29f073de818088e;hpb=87c8bb3956897830da1f7aaca2990a9571767b73

diff --git a/altoslib/AltosSensorMetrum.java b/altoslib/AltosSensorMetrum.java
index c00e00d5..efed1a6f 100644
--- a/altoslib/AltosSensorMetrum.java
+++ b/altoslib/AltosSensorMetrum.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_8;
+package org.altusmetrum.altoslib_13;
 
 import java.util.concurrent.TimeoutException;
 
@@ -52,12 +53,12 @@ class AltosSensorMetrum {
 		}
 	}
 
-	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 {
 			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));
+			listener.set_battery_voltage(AltosConvert.mega_battery_voltage(sensor_metrum.v_batt));
+			listener.set_apogee_voltage(AltosConvert.mega_pyro_voltage(sensor_metrum.sense_a));
+			listener.set_main_voltage(AltosConvert.mega_pyro_voltage(sensor_metrum.sense_m));
 		} catch (TimeoutException te) {
 		}
 	}