X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosEepromRecordSet.java;h=aec302e8072d939b17874ec321426bf2b87cb27c;hb=bd351b9e3b1ba21851b2c87f5202ac3bf5c479c0;hp=d91ae3ac1c1aba278cd21eedc03c3de3cad802a2;hpb=de2b6ec1cdfd48c948bff7edbfe2540440429b1b;p=fw%2Faltos

diff --git a/altoslib/AltosEepromRecordSet.java b/altoslib/AltosEepromRecordSet.java
index d91ae3ac..aec302e8 100644
--- a/altoslib/AltosEepromRecordSet.java
+++ b/altoslib/AltosEepromRecordSet.java
@@ -12,7 +12,7 @@
  * General Public License for more details.
  */
 
-package org.altusmetrum.altoslib_12;
+package org.altusmetrum.altoslib_13;
 
 import java.io.*;
 import java.util.*;
@@ -69,7 +69,9 @@ 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:
+		case AltosLib.AO_LOG_FORMAT_EASYMEGA_2:
 			record = new AltosEepromRecordMega(eeprom);
 			break;
 		case AltosLib.AO_LOG_FORMAT_TELEMETRUM:
@@ -89,15 +91,16 @@ public class AltosEepromRecordSet implements AltosRecordSet {
 			break;
 		}
 
+		ordered = new TreeSet<AltosEepromRecord>();
+
 		if (record == null) {
 			System.out.printf("failed to parse log format %d\n", config_data.log_format);
 			return;
 		}
-		ordered = new TreeSet<AltosEepromRecord>();
 		int	tick = 0;
 		boolean first = true;
 
-		for (;;) {
+		do {
 			int	t = record.tick();
 
 			if (first) {
@@ -110,10 +113,8 @@ 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 {