Switch from GPLv2 to GPLv2+

[fw/altos] / altoslib / AltosEepromFile.java

diff --git a/altoslib/AltosEepromFile.java b/altoslib/AltosEepromFile.java
index 2f4c54d7d7fc3c4d61c29c18f0e55f1638aafb95..957c826a019098ec17bdce98be1ffb5b6cd1d052 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_1;
+package org.altusmetrum.altoslib_11;
 
 import java.io.*;
 import java.util.*;
@@ -72,27 +73,52 @@ public class AltosEepromFile extends AltosStateIterable {
                headers = new AltosEepromIterable(AltosEepromHeader.read(input));
 
                start = headers.state();
+               if (start.state() != AltosLib.ao_flight_stateless)
+                       start.set_state(AltosLib.ao_flight_pad);
+
+               if (start.log_format == AltosLib.MISSING) {
+                       if (start.product != null) {
+                               if (start.product.startsWith("TeleMetrum"))
+                                       start.log_format = AltosLib.AO_LOG_FORMAT_FULL;
+                               else if (start.product.startsWith("TeleMini"))
+                                       start.log_format = AltosLib.AO_LOG_FORMAT_TINY;
+                       }
+               }
 
                switch (start.log_format) {
                case AltosLib.AO_LOG_FORMAT_FULL:
                        body = new AltosEepromIterable(AltosEepromTM.read(input));
                        break;
                case AltosLib.AO_LOG_FORMAT_TINY:
+                       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:
+               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_EASYMINI:
                        body = new AltosEepromIterable(AltosEepromMini.read(input));
                        break;
+               case AltosLib.AO_LOG_FORMAT_TELEGPS:
+                       body = new AltosEepromIterable(AltosEepromGPS.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) {
+                       state.finish_update();
+                       if (state.state() >= AltosLib.ao_flight_boost) {
                                start.set_boost_tick(state.tick);
                                break;
                        }
@@ -103,8 +129,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
+}