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

diff --git a/altoslib/AltosEepromRecordSet.java b/altoslib/AltosEepromRecordSet.java
index 183cb9ae..1f10e677 100644
--- a/altoslib/AltosEepromRecordSet.java
+++ b/altoslib/AltosEepromRecordSet.java
@@ -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,6 +42,8 @@ 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);
 		}
@@ -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 {
+	public AltosEepromRecordSet(InputStream input) throws IOException {
 		this(new AltosEepromNew(input));
 	}
 }