X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosEepromRecordSet.java;h=df1aad9f54dea63c4ee76c4a531d5a24725b1ac8;hb=e4f1fa544f1cb21070c9d79c81ebae0fb71d77db;hp=183cb9aecc0f4deca8cd269d40d01df6a8639324;hpb=fd738d47bbc46d36698350d5450abe1125d990a3;p=fw%2Faltos

diff --git a/altoslib/AltosEepromRecordSet.java b/altoslib/AltosEepromRecordSet.java
index 183cb9ae..df1aad9f 100644
--- a/altoslib/AltosEepromRecordSet.java
+++ b/altoslib/AltosEepromRecordSet.java
@@ -18,7 +18,7 @@ import java.io.*;
 import java.util.*;
 
 public class AltosEepromRecordSet implements AltosRecordSet {
-	AltosEepromNew			eeprom;
+	AltosEeprom			eeprom;
 	TreeSet<AltosEepromRecord>	ordered;
 	AltosCalData			cal_data;
 
@@ -33,6 +33,7 @@ public class AltosEepromRecordSet implements AltosRecordSet {
 				if (record.cmd() == AltosLib.AO_LOG_FLIGHT) {
 					cal_data.set_tick(record.tick());
 					cal_data.set_boost_tick();
+					break;
 				}
 			}
 		}
@@ -41,13 +42,15 @@ public class AltosEepromRecordSet implements AltosRecordSet {
 
 	public void capture_series(AltosDataListener listener) {
 		AltosCalData	cal_data = cal_data();
+
+		cal_data.reset();
 		for (AltosEepromRecord record : ordered) {
 			record.provide_data(listener, cal_data);
 		}
 		listener.finish();
 	}
 
-	public AltosEepromRecordSet(AltosEepromNew eeprom) {
+	public AltosEepromRecordSet(AltosEeprom eeprom) {
 		this.eeprom = eeprom;
 
 		AltosConfigData 	config_data = eeprom.config_data();
@@ -72,7 +75,8 @@ public class AltosEepromRecordSet implements AltosRecordSet {
 			break;
 		case AltosLib.AO_LOG_FORMAT_TELEMINI2:
 		case AltosLib.AO_LOG_FORMAT_TELEMINI3:
-		case AltosLib.AO_LOG_FORMAT_EASYMINI:
+		case AltosLib.AO_LOG_FORMAT_EASYMINI1:
+		case AltosLib.AO_LOG_FORMAT_EASYMINI2:
 			record = new AltosEepromRecordMini(eeprom);
 			break;
 		case AltosLib.AO_LOG_FORMAT_TELEGPS:
@@ -110,7 +114,7 @@ public class AltosEepromRecordSet implements AltosRecordSet {
 		}
 	}
 
-	public AltosEepromRecordSet(Reader input) throws IOException {
-		this(new AltosEepromNew(input));
+	public AltosEepromRecordSet(InputStream input) throws IOException {
+		this(new AltosEeprom(input));
 	}
 }