altoslib: Save eeprom data in new .eeprom format

[fw/altos] / altoslib / AltosEepromFile.java

diff --git a/altoslib/AltosEepromFile.java b/altoslib/AltosEepromFile.java
index b7e446ce6a1627fbdd8b6d4637176bfe1f4351a6..bb8abf87fa334cfa3be713ba271a464f7804a780 100644 (file)
--- a/altoslib/AltosEepromFile.java
+++ b/altoslib/AltosEepromFile.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_4;
+package org.altusmetrum.altoslib_11;
 
 import java.io.*;
 import java.util.*;
@@ -57,6 +58,7 @@ public class AltosEepromFile extends AltosStateIterable {
 
        AltosEepromIterable     headers;
        AltosEepromIterable     body;
+       AltosEepromRecordSet    set;
        AltosState              start;
 
        public void write_comments(PrintStream out) {
@@ -68,11 +70,16 @@ public class AltosEepromFile extends AltosStateIterable {
                body.write(out);
        }
 
+       public AltosEepromFile(Reader input) throws IOException {
+               set = new AltosEepromRecordSet(input);
+
+       }
+
        public AltosEepromFile(FileInputStream input) {
                headers = new AltosEepromIterable(AltosEepromHeader.read(input));
 
                start = headers.state();
-               if (start.state != AltosLib.ao_flight_stateless)
+               if (start.state() != AltosLib.ao_flight_stateless)
                        start.set_state(AltosLib.ao_flight_pad);
 
                if (start.log_format == AltosLib.MISSING) {
@@ -89,23 +96,28 @@ public class AltosEepromFile extends AltosStateIterable {
                        body = new AltosEepromIterable(AltosEepromTM.read(input));
                        break;
                case AltosLib.AO_LOG_FORMAT_TINY:
-                       body = new AltosEepromIterable(AltosEepromTm.read(input));
+                       body = new AltosEepromIterable(AltosEepromTMini.read(input));
                        break;
                case AltosLib.AO_LOG_FORMAT_TELEMETRY:
                case AltosLib.AO_LOG_FORMAT_TELESCIENCE:
                case AltosLib.AO_LOG_FORMAT_TELEMEGA:
-                       body = new AltosEepromIterable(AltosEepromMega.read(input));
+               case AltosLib.AO_LOG_FORMAT_TELEMEGA_OLD:
+                       body = new AltosEepromIterable(AltosEepromMega.read(input, start.log_format));
                        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_TELEMINI2:
+               case AltosLib.AO_LOG_FORMAT_TELEMINI3:
                case AltosLib.AO_LOG_FORMAT_EASYMINI:
                        body = new AltosEepromIterable(AltosEepromMini.read(input));
                        break;
                case AltosLib.AO_LOG_FORMAT_TELEGPS:
                        body = new AltosEepromIterable(AltosEepromGPS.read(input));
                        break;
+               case AltosLib.AO_LOG_FORMAT_TELEFIRETWO:
+                       body = new AltosEepromIterable(AltosEepromFireTwo.read(input));
+                       break;
                default:
                        body = new AltosEepromIterable(new LinkedList<AltosEeprom>());
                        break;
@@ -116,7 +128,7 @@ public class AltosEepromFile extends AltosStateIterable {
                for (AltosEeprom eeprom : body) {
                        eeprom.update_state(state);
                        state.finish_update();
-                       if (state.state >= AltosLib.ao_flight_boost) {
+                       if (state.state() >= AltosLib.ao_flight_boost) {
                                start.set_boost_tick(state.tick);
                                break;
                        }
@@ -124,6 +136,9 @@ public class AltosEepromFile extends AltosStateIterable {
        }
 
        public Iterator<AltosState> iterator() {
+               if (set != null)
+                       return set.iterator();
+
                AltosState              state = start.clone();
                Iterator<AltosEeprom>   i = body.iterator();