X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosEepromFile.java;h=c1dc10b596e1cd2335613ae8aa9efb5fd65390d7;hp=60ab2573cc70e8021a638d19ca6fce06b64838b6;hb=656d8fe17532ca6c7d1d43996f187df2f14f5395;hpb=a299a5a9a1b89c7ebc00ebd33a789793a6835181

diff --git a/altoslib/AltosEepromFile.java b/altoslib/AltosEepromFile.java
index 60ab2573..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_2;
+package org.altusmetrum.altoslib_5;
 
 import java.io.*;
 import java.util.*;
@@ -72,7 +72,17 @@ 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) {
+				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:
@@ -84,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));
@@ -93,6 +104,9 @@ public class AltosEepromFile extends AltosStateIterable {
 		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;
@@ -120,4 +134,4 @@ public class AltosEepromFile extends AltosStateIterable {
 		}
 		return new AltosEepromIterator(state, i);
 	}
-}
\ No newline at end of file
+}