X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosEepromFile.java;h=f87bf916f9e8fe8f3fdcb095eaa742ac30797c38;hb=effc62354fc82bb937c6f445a147fc92153a0731;hp=2f4c54d7d7fc3c4d61c29c18f0e55f1638aafb95;hpb=7ec1b97d278c7aec3199fb7270f0dcf9484c879f;p=fw%2Faltos

diff --git a/altoslib/AltosEepromFile.java b/altoslib/AltosEepromFile.java
index 2f4c54d7..f87bf916 100644
--- a/altoslib/AltosEepromFile.java
+++ b/altoslib/AltosEepromFile.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_1;
+package org.altusmetrum.altoslib_2;
 
 import java.io.*;
 import java.util.*;
@@ -72,6 +72,7 @@ public class AltosEepromFile extends AltosStateIterable {
 		headers = new AltosEepromIterable(AltosEepromHeader.read(input));
 
 		start = headers.state();
+		start.set_state(AltosLib.ao_flight_pad);
 
 		switch (start.log_format) {
 		case AltosLib.AO_LOG_FORMAT_FULL:
@@ -81,17 +82,25 @@ public class AltosEepromFile extends AltosStateIterable {
 		case AltosLib.AO_LOG_FORMAT_TELEMETRY:
 		case AltosLib.AO_LOG_FORMAT_TELESCIENCE:
 		case AltosLib.AO_LOG_FORMAT_TELEMEGA:
+			body = new AltosEepromIterable(AltosEepromMega.read(input));
+			break;
+		case AltosLib.AO_LOG_FORMAT_TELEMETRUM:
+			body = new AltosEepromIterable(AltosEepromMetrum2.read(input));
 			break;
 		case AltosLib.AO_LOG_FORMAT_TELEMINI:
 		case AltosLib.AO_LOG_FORMAT_EASYMINI:
 			body = new AltosEepromIterable(AltosEepromMini.read(input));
 			break;
+		default:
+			body = new AltosEepromIterable(new LinkedList<AltosEeprom>());
+			break;
 		}
 
 		/* Find boost tick */
 		AltosState	state = start.clone();
 		for (AltosEeprom eeprom : body) {
 			eeprom.update_state(state);
+			state.finish_update();
 			if (state.state >= AltosLib.ao_flight_boost) {
 				start.set_boost_tick(state.tick);
 				break;
@@ -103,8 +112,10 @@ public class AltosEepromFile extends AltosStateIterable {
 		AltosState		state = start.clone();
 		Iterator<AltosEeprom>	i = body.iterator();
 
-		while (i.hasNext() && !state.valid())
+		while (i.hasNext() && !state.valid()) {
 			i.next().update_state(state);
+			state.finish_update();
+		}
 		return new AltosEepromIterator(state, i);
 	}
 }
\ No newline at end of file