X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosEepromMini.java;h=f197539eb5c6bf0d66775c217a6a072adff2e5fd;hp=ced8768045b14168bdff54fdc76242335c57c749;hb=c8078d352a7f54a4a97d25af080155d3f875536a;hpb=04d7d0f829ba953ffeca8ad9887a4b6b2b5d5087

diff --git a/altoslib/AltosEepromMini.java b/altoslib/AltosEepromMini.java
index ced87680..f197539e 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_5;
 
 import java.io.*;
 import java.util.*;
@@ -24,21 +24,7 @@ import java.text.*;
 public class AltosEepromMini extends AltosEeprom {
 	public static final int	record_length = 16;
 
-	public int data8(int i) {
-		return data8[i];
-	}
-
-	public int data16(int i) {
-		return ((data8[i] | (data8[i+1] << 8)) << 16) >> 16;
-	}
-
-	public int data24(int i) {
-		return data8[i] | (data8[i+1] << 8) | (data8[i+2] << 16);
-	}
-
-	public int data32(int i) {
-		return data8[i] | (data8[i+1] << 8) | (data8[i+2] << 16) | (data8[i+3] << 24);
-	}
+	public int record_length() { return record_length; }
 
 	/* AO_LOG_FLIGHT elements */
 	public int flight() { return data16(0); }
@@ -55,23 +41,39 @@ 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) {
+		if (state.log_format == AltosLib.AO_LOG_FORMAT_EASYMINI)
+			return AltosConvert.easy_mini_voltage(sensor, state.serial);
+		else
+			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());
+			state.set_ground_pressure(ground_pres());
 			break;
 		case AltosLib.AO_LOG_STATE:
+			state.set_state(state());
 			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()));
 			break;
 		}
 	}
 
 	public AltosEepromMini (AltosEepromChunk chunk, int start) throws ParseException {
-		parse_chunk(chunk, start, record_length);
+		parse_chunk(chunk, start);
 	}
 
 	public AltosEepromMini (String line) {
-		parse_string(line, record_length);
+		parse_string(line);
 	}
 
 	public AltosEepromMini(int in_cmd, int in_tick) {