altoslib: Use symbols in AltosRomconfig instead of fixed offsets

[fw/altos] / altoslib / AltosEepromFile.java

diff --git a/altoslib/AltosEepromFile.java b/altoslib/AltosEepromFile.java
index 082c23ca5149dee65e111d12b3c61308284d1249..60ab2573cc70e8021a638d19ca6fce06b64838b6 100644 (file)
--- 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:
@@ -100,6 +102,7 @@ public class AltosEepromFile extends AltosStateIterable {
                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;
@@ -111,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