Switch from GPLv2 to GPLv2+

[fw/altos] / altoslib / AltosEepromFile.java

diff --git a/altoslib/AltosEepromFile.java b/altoslib/AltosEepromFile.java
index ac537856191c579904aa72caa2609e86d51951f6..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_7;
+package org.altusmetrum.altoslib_11;
 
 import java.io.*;
 import java.util.*;
@@ -72,7 +73,7 @@ public class AltosEepromFile extends AltosStateIterable {
                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,7 +90,7 @@ 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:
@@ -117,7 +118,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;
                        }