X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosSensorEMini.java;h=e7f540fde55d76ab5c26d6cc26c666b113d0210b;hp=cbc65143fa9b51a4df9be57124efcbdd474fd31c;hb=bed019b64d9e37f276ad5aa2dabb7681aae122ec;hpb=5b976a6651f4eb05d30afc08b9e1f27c7e52ae00

diff --git a/altoslib/AltosSensorEMini.java b/altoslib/AltosSensorEMini.java
index cbc65143..e7f540fd 100644
--- a/altoslib/AltosSensorEMini.java
+++ b/altoslib/AltosSensorEMini.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_2;
+package org.altusmetrum.altoslib_13;
 
 import java.util.concurrent.TimeoutException;
 
@@ -25,18 +26,27 @@ public class AltosSensorEMini {
 	public int	main;
 	public int	batt;
 
-	static public void update_state(AltosState state, AltosLink link, AltosConfigData config_data) {
+	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;
-			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));
-			
+			switch (version) {
+			case 1:
+				listener.set_battery_voltage(AltosConvert.easy_mini_1_voltage(sensor_emini.batt, cal_data.serial));
+				listener.set_apogee_voltage(AltosConvert.easy_mini_1_voltage(sensor_emini.apogee, cal_data.serial));
+				listener.set_main_voltage(AltosConvert.easy_mini_1_voltage(sensor_emini.main, cal_data.serial));
+				break;
+			case 2:
+				listener.set_battery_voltage(AltosConvert.easy_mini_2_voltage(sensor_emini.batt));
+				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;
+			}
+
 		} catch (TimeoutException te) {
-		} catch (InterruptedException ie) {
 		}
 	}