X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosEepromFile.java;h=082c23ca5149dee65e111d12b3c61308284d1249;hb=4de934c283a839fcbb246b36aa15362f3cf8629c;hp=48d2543c30375e2a0e28f98b9ef63509b9de8631;hpb=04d7d0f829ba953ffeca8ad9887a4b6b2b5d5087;p=fw%2Faltos

diff --git a/altoslib/AltosEepromFile.java b/altoslib/AltosEepromFile.java
index 48d2543c..082c23ca 100644
--- a/altoslib/AltosEepromFile.java
+++ b/altoslib/AltosEepromFile.java
@@ -21,10 +21,47 @@ import java.io.*;
 import java.util.*;
 import java.text.*;
 
-public class AltosEepromFile {
+class AltosEepromIterator implements Iterator<AltosState> {
+	AltosState		state;
+	Iterator<AltosEeprom>	body;
+	AltosEeprom		next;
+	boolean			seen;
+
+	public boolean hasNext() {
+		return !seen || body.hasNext();
+	}
+
+	public AltosState next() {
+		if (seen) {
+			AltosState	n = state.clone();
+			AltosEeprom	e = body.next();
+
+			e.update_state(n);
+			state = n;
+		}
+		seen = true;
+		return state;
+	}
+
+	public void remove () {
+	}
+
+	public AltosEepromIterator(AltosState start, Iterator<AltosEeprom> body) {
+		this.state = start;
+		this.body = body;
+		this.seen = false;
+	}
+}
+
+public class AltosEepromFile extends AltosStateIterable {
 
 	AltosEepromIterable	headers;
 	AltosEepromIterable	body;
+	AltosState		start;
+
+	public void write_comments(PrintStream out) {
+		headers.write(out);
+	}
 
 	public void write(PrintStream out) {
 		headers.write(out);
@@ -34,18 +71,48 @@ public class AltosEepromFile {
 	public AltosEepromFile(FileInputStream input) {
 		headers = new AltosEepromIterable(AltosEepromHeader.read(input));
 
-		AltosState	state = headers.state();
+		start = headers.state();
+		start.set_state(AltosLib.ao_flight_pad);
 
-		switch (state.log_format) {
+		switch (start.log_format) {
 		case AltosLib.AO_LOG_FORMAT_FULL:
+			body = new AltosEepromIterable(AltosEepromTM.read(input));
+			break;
 		case AltosLib.AO_LOG_FORMAT_TINY:
 		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_MINI:
+		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);
+			if (state.state >= AltosLib.ao_flight_boost) {
+				start.set_boost_tick(state.tick);
+				break;
+			}
+		}
+	}
+
+	public Iterator<AltosState> iterator() {
+		AltosState		state = start.clone();
+		Iterator<AltosEeprom>	i = body.iterator();
+
+		while (i.hasNext() && !state.valid())
+			i.next().update_state(state);
+		return new AltosEepromIterator(state, i);
 	}
 }
\ No newline at end of file