X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosEepromRecordSet.java;h=360759314d4bf9e123bf2e109271f66beb6375ff;hp=c019a092bbeb0c44d3652e1768e8fbea6de50c09;hb=57218127ee39724e985fefcf203991401f01cc84;hpb=e0f25bcb8c036330e80c1254ab67f0bf323a4a98

diff --git a/altoslib/AltosEepromRecordSet.java b/altoslib/AltosEepromRecordSet.java
index c019a092..36075931 100644
--- a/altoslib/AltosEepromRecordSet.java
+++ b/altoslib/AltosEepromRecordSet.java
@@ -12,13 +12,13 @@
  * General Public License for more details.
  */
 
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_12;
 
 import java.io.*;
 import java.util.*;
 
 public class AltosEepromRecordSet implements AltosRecordSet {
-	AltosEepromNew			eeprom;
+	AltosEeprom			eeprom;
 	TreeSet<AltosEepromRecord>	ordered;
 	AltosCalData			cal_data;
 
@@ -42,13 +42,17 @@ public class AltosEepromRecordSet implements AltosRecordSet {
 
 	public void capture_series(AltosDataListener listener) {
 		AltosCalData	cal_data = cal_data();
+
+		cal_data.reset();
+		listener.set_log_format(config_data().log_format);
+
 		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();
@@ -65,6 +69,7 @@ public class AltosEepromRecordSet implements AltosRecordSet {
 		case AltosLib.AO_LOG_FORMAT_TELEMETRY:
 		case AltosLib.AO_LOG_FORMAT_TELESCIENCE:
 		case AltosLib.AO_LOG_FORMAT_TELEMEGA:
+		case AltosLib.AO_LOG_FORMAT_TELEMEGA_3:
 		case AltosLib.AO_LOG_FORMAT_TELEMEGA_OLD:
 			record = new AltosEepromRecordMega(eeprom);
 			break;
@@ -73,7 +78,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:
@@ -92,7 +98,7 @@ public class AltosEepromRecordSet implements AltosRecordSet {
 		int	tick = 0;
 		boolean first = true;
 
-		for (;;) {
+		do {
 			int	t = record.tick();
 
 			if (first) {
@@ -105,13 +111,11 @@ public class AltosEepromRecordSet implements AltosRecordSet {
 			}
 			record.wide_tick = tick;
 			ordered.add(record);
-			if (!record.hasNext())
-				break;
 			record = record.next();
-		}
+		} while (record != null);
 	}
 
 	public AltosEepromRecordSet(InputStream input) throws IOException {
-		this(new AltosEepromNew(input));
+		this(new AltosEeprom(input));
 	}
 }