X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosEepromChunk.java;h=32d9f8eab2efa5066b44213c7881607b003b5f04;hb=217d77dadbef4192d2f32e290a5c5f50159f2e0d;hp=1709352b3a640be5c0c3f523b8333066b9150cb9;hpb=77dc89ed5b7bf8f5b3fa3b6131660f1a98f583ea;p=fw%2Faltos

diff --git a/altoslib/AltosEepromChunk.java b/altoslib/AltosEepromChunk.java
index 1709352b..32d9f8ea 100644
--- a/altoslib/AltosEepromChunk.java
+++ b/altoslib/AltosEepromChunk.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.text.*;
 import java.util.concurrent.*;
@@ -62,28 +63,38 @@ public class AltosEepromChunk {
 		return true;
 	}
 
-	public AltosEeprom eeprom(int offset, int log_format) {
+	public AltosEeprom eeprom(int offset, int log_format, AltosState state) throws ParseException {
 		AltosEeprom	eeprom = null;
-		try {
-			switch (log_format) {
-			case AltosLib.AO_LOG_FORMAT_FULL:
-				eeprom = new AltosEepromTM(this, offset);
-				break;
-			case AltosLib.AO_LOG_FORMAT_TINY:
-			case AltosLib.AO_LOG_FORMAT_TELEMETRY:
-			case AltosLib.AO_LOG_FORMAT_TELESCIENCE:
-			case AltosLib.AO_LOG_FORMAT_TELEMEGA:
-				eeprom = new AltosEepromMega(this, offset);
-				break;
-			case AltosLib.AO_LOG_FORMAT_TELEMETRUM:
-				eeprom = new AltosEepromMetrum2(this, offset);
-				break;
-			case AltosLib.AO_LOG_FORMAT_TELEMINI:
-			case AltosLib.AO_LOG_FORMAT_EASYMINI:
-				eeprom = new AltosEepromMini(this, offset);
-				break;
-			}
-		} catch (ParseException e) {
+		switch (log_format) {
+		case AltosLib.AO_LOG_FORMAT_FULL:
+			eeprom = new AltosEepromTM(this, offset);
+			break;
+		case AltosLib.AO_LOG_FORMAT_TINY:
+			eeprom = new AltosEepromTMini(this, offset, state);
+			break;
+		case AltosLib.AO_LOG_FORMAT_TELEMETRY:
+		case AltosLib.AO_LOG_FORMAT_TELESCIENCE:
+			break;
+		case AltosLib.AO_LOG_FORMAT_TELEMEGA:
+		case AltosLib.AO_LOG_FORMAT_TELEMEGA_OLD:
+			eeprom = new AltosEepromMega(this, offset, log_format);
+			break;
+		case AltosLib.AO_LOG_FORMAT_TELEMETRUM:
+			eeprom = new AltosEepromMetrum2(this, offset);
+			break;
+		case AltosLib.AO_LOG_FORMAT_TELEMINI2:
+		case AltosLib.AO_LOG_FORMAT_TELEMINI3:
+		case AltosLib.AO_LOG_FORMAT_EASYMINI:
+			eeprom = new AltosEepromMini(this, offset);
+			break;
+		case AltosLib.AO_LOG_FORMAT_TELEGPS:
+			eeprom = new AltosEepromGPS(this, offset);
+			break;
+		case AltosLib.AO_LOG_FORMAT_TELEFIRETWO:
+			eeprom = new AltosEepromFireTwo(this, offset);
+			break;
+		default:
+			throw new ParseException("unknown eeprom format " + log_format, 0);
 		}
 		return eeprom;
 	}
@@ -123,4 +134,4 @@ public class AltosEepromChunk {
 			}
 		}
 	}
-}
\ No newline at end of file
+}