X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosSensorEMini.java;h=a144ec7a1dd9cefa0b09faaac199dcbf4f2bd9d8;hb=a61217f0a6d0ef48b6471f632c4600255867e831;hp=884800f87adb004e392bcab82f73a63ce290104e;hpb=21d176f161b90f18f236ef887cef9676d712eee3;p=fw%2Faltos

diff --git a/altoslib/AltosSensorEMini.java b/altoslib/AltosSensorEMini.java
index 884800f8..a144ec7a 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_10;
+package org.altusmetrum.altoslib_12;
 
 import java.util.concurrent.TimeoutException;
 
@@ -25,15 +26,24 @@ public class AltosSensorEMini {
 	public int	main;
 	public int	batt;
 
-	static public void update_state(AltosState state, AltosLink link, AltosConfigData config_data) throws InterruptedException {
+	static public void provide_data(AltosDataListener listener, AltosLink link, AltosCalData cal_data, int version) 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, 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));
+			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) {
 		}