X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosEepromMini.java;h=dc51e591de71c626ea371422769742d76e370f6d;hb=8bbef0c7039f4a0c6ac368fd994c2e52d84d293c;hp=15ec19298a9b1294e246e97b23ea9ebdddd2448f;hpb=77dc89ed5b7bf8f5b3fa3b6131660f1a98f583ea;p=fw%2Faltos

diff --git a/altoslib/AltosEepromMini.java b/altoslib/AltosEepromMini.java
index 15ec1929..dc51e591 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_1;
+package org.altusmetrum.altoslib_11;
 
 import java.io.*;
 import java.util.*;
@@ -42,16 +43,15 @@ public class AltosEepromMini extends AltosEeprom {
 	public int v_batt() { return data16(10); }
 
 	double voltage(AltosState state, int sensor) {
-		double	supply;
-
 		if (state.log_format == AltosLib.AO_LOG_FORMAT_EASYMINI)
-			supply = 3.0;
+			return AltosConvert.easy_mini_voltage(sensor, state.serial);
 		else
-			supply = 3.3;
-		return sensor / 32767.0 * supply * 127/27;
+			return AltosConvert.tele_mini_voltage(sensor);
 	}
 
 	public void update_state(AltosState state) {
+		super.update_state(state);
+
 		switch (cmd) {
 		case AltosLib.AO_LOG_FLIGHT:
 			state.set_flight(flight());