altoslib, altosui: Restructured state management now does TM eeprom files

[fw/altos] / altoslib / AltosEepromFile.java

diff --git a/altoslib/AltosEepromFile.java b/altoslib/AltosEepromFile.java
index 48d2543c30375e2a0e28f98b9ef63509b9de8631..bcc7171ee91a4c9dd77d00aae042fbaf91602ee9 100644 (file)
--- a/altoslib/AltosEepromFile.java
+++ b/altoslib/AltosEepromFile.java
@@ -21,11 +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;
 
+       public void write_comments(PrintStream out) {
+               headers.write(out);
+       }
+
        public void write(PrintStream out) {
                headers.write(out);
                body.write(out);
@@ -38,14 +74,38 @@ public class AltosEepromFile {
 
                switch (state.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:
                        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;
                }
        }
+
+       int boost_tick (AltosState start) {
+               AltosState      state = start.clone();
+               for (AltosEeprom eeprom : body) {
+                       eeprom.update_state(state);
+                       if (state.state >= AltosLib.ao_flight_boost)
+                               return state.tick;
+               }
+               return 0;
+       }
+
+       public Iterator<AltosState> iterator() {
+
+               AltosState              state = headers.state();
+               Iterator<AltosEeprom>   i = body.iterator();
+
+               while (i.hasNext() && !state.valid())
+                       i.next().update_state(state);
+               state.set_boost_tick(boost_tick(state));
+               return new AltosEepromIterator(state, i);
+       }
 }
\ No newline at end of file