X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosEepromFile.java;h=c1dc10b596e1cd2335613ae8aa9efb5fd65390d7;hb=08f07d0af123e1c307bc4c0c973da07fae8246b1;hp=f59585f8a9f132c55a63fb172f920a7bbf49c136;hpb=fcea12ac416b1eab11e9e8aae801358574308f73;p=fw%2Faltos

diff --git a/altoslib/AltosEepromFile.java b/altoslib/AltosEepromFile.java
index f59585f8..c1dc10b5 100644
--- 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_4;
+package org.altusmetrum.altoslib_5;
 
 import java.io.*;
 import java.util.*;
@@ -72,7 +72,8 @@ public class AltosEepromFile extends AltosStateIterable {
 		headers = new AltosEepromIterable(AltosEepromHeader.read(input));
 
 		start = headers.state();
-		start.set_state(AltosLib.ao_flight_pad);
+		if (start.state != AltosLib.ao_flight_stateless)
+			start.set_state(AltosLib.ao_flight_pad);
 
 		if (start.log_format == AltosLib.MISSING) {
 			if (start.product != null) {
@@ -93,7 +94,8 @@ public class AltosEepromFile extends AltosStateIterable {
 		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));