X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosEepromMini.java;h=04155071fbd0767f143788cf91a5ef94754e8167;hp=fb3b4d23b6d7fbafe5868c948d49563322f123da;hb=17e20a6d2dab1f4bd1375bfd9e1c5230ee2c1119;hpb=b89fb51a963635e2effe3a31f803bfc29c2c46b7

diff --git a/altoslib/AltosEepromMini.java b/altoslib/AltosEepromMini.java
index fb3b4d23..04155071 100644
--- a/altoslib/AltosEepromMini.java
+++ b/altoslib/AltosEepromMini.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_3;
+package org.altusmetrum.altoslib_11;
 
 import java.io.*;
 import java.util.*;
@@ -41,11 +42,24 @@ public class AltosEepromMini extends AltosEeprom {
 	public int sense_m() { return data16(8); }
 	public int v_batt() { return data16(10); }
 
-	double voltage(AltosState state, int sensor) {
+	private double battery_voltage(AltosState state, int sensor) {
 		if (state.log_format == AltosLib.AO_LOG_FORMAT_EASYMINI)
-			return AltosConvert.easy_mini_voltage(sensor);
-		else
-			return AltosConvert.tele_mini_voltage(sensor);
+			return AltosConvert.easy_mini_voltage(sensor, state.serial);
+		if (state.log_format == AltosLib.AO_LOG_FORMAT_TELEMINI2)
+			return AltosConvert.tele_mini_2_voltage(sensor);
+		if (state.log_format == AltosLib.AO_LOG_FORMAT_TELEMINI3)
+			return AltosConvert.tele_mini_3_battery_voltage(sensor);
+		return -1;
+	}
+
+	private double pyro_voltage(AltosState state, int sensor) {
+		if (state.log_format == AltosLib.AO_LOG_FORMAT_EASYMINI)
+			return AltosConvert.easy_mini_voltage(sensor, state.serial);
+		if (state.log_format == AltosLib.AO_LOG_FORMAT_TELEMINI2)
+			return AltosConvert.tele_mini_2_voltage(sensor);
+		if (state.log_format == AltosLib.AO_LOG_FORMAT_TELEMINI3)
+			return AltosConvert.tele_mini_3_pyro_voltage(sensor);
+		return -1;
 	}
 
 	public void update_state(AltosState state) {
@@ -61,9 +75,9 @@ public class AltosEepromMini extends AltosEeprom {
 			break;
 		case AltosLib.AO_LOG_SENSOR:
 			state.set_ms5607(pres(), temp());
-			state.set_apogee_voltage(voltage(state, sense_a()));
-			state.set_main_voltage(voltage(state, sense_m()));
-			state.set_battery_voltage(voltage(state, v_batt()));
+			state.set_apogee_voltage(pyro_voltage(state, sense_a()));
+			state.set_main_voltage(pyro_voltage(state, sense_m()));
+			state.set_battery_voltage(battery_voltage(state, v_batt()));
 			break;
 		}
 	}