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

diff --git a/altoslib/AltosEepromMini.java b/altoslib/AltosEepromMini.java
index 15ec1929..a09a62ce 100644
--- a/altoslib/AltosEepromMini.java
+++ b/altoslib/AltosEepromMini.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_1;
+package org.altusmetrum.altoslib_2;
 
 import java.io.*;
 import java.util.*;
@@ -42,16 +42,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);
 		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());