X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosEepromFile.java;h=60ab2573cc70e8021a638d19ca6fce06b64838b6;hp=367b67915542a89d0372b133057b37d449760735;hb=4e1b134e29313a1bdac18de57fe547299e5ded2a;hpb=77dc89ed5b7bf8f5b3fa3b6131660f1a98f583ea

diff --git a/altoslib/AltosEepromFile.java b/altoslib/AltosEepromFile.java
index 367b6791..60ab2573 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.*;
@@ -79,6 +79,8 @@ public class AltosEepromFile extends AltosStateIterable {
 			body = new AltosEepromIterable(AltosEepromTM.read(input));
 			break;
 		case AltosLib.AO_LOG_FORMAT_TINY:
+			body = new AltosEepromIterable(AltosEepromTm.read(input));
+			break;
 		case AltosLib.AO_LOG_FORMAT_TELEMETRY:
 		case AltosLib.AO_LOG_FORMAT_TELESCIENCE:
 		case AltosLib.AO_LOG_FORMAT_TELEMEGA:
@@ -91,12 +93,16 @@ public class AltosEepromFile extends AltosStateIterable {
 		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;
@@ -108,8 +114,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