X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosEepromFile.java;h=f59585f8a9f132c55a63fb172f920a7bbf49c136;hb=ae1174317fc476e39077f7dc257ec08709c6b301;hp=f87bf916f9e8fe8f3fdcb095eaa742ac30797c38;hpb=5b976a6651f4eb05d30afc08b9e1f27c7e52ae00;p=fw%2Faltos

diff --git a/altoslib/AltosEepromFile.java b/altoslib/AltosEepromFile.java
index f87bf916..f59585f8 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_4;
 
 import java.io.*;
 import java.util.*;
@@ -74,11 +74,22 @@ public class AltosEepromFile extends AltosStateIterable {
 		start = headers.state();
 		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(AltosEepromTm.read(input));
+			break;
 		case AltosLib.AO_LOG_FORMAT_TELEMETRY:
 		case AltosLib.AO_LOG_FORMAT_TELESCIENCE:
 		case AltosLib.AO_LOG_FORMAT_TELEMEGA:
@@ -91,6 +102,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;
@@ -118,4 +132,4 @@ public class AltosEepromFile extends AltosStateIterable {
 		}
 		return new AltosEepromIterator(state, i);
 	}
-}
\ No newline at end of file
+}