X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosEepromRecordSet.java;h=5e2adba34c00ae9cf4e4a9915f52d8b531d75252;hb=8554da3b6c05c1094045f4fb21b43c183029408f;hp=360759314d4bf9e123bf2e109271f66beb6375ff;hpb=b986a12b478a6d4ff550786d24aa8628dc0abe32;p=fw%2Faltos

diff --git a/altoslib/AltosEepromRecordSet.java b/altoslib/AltosEepromRecordSet.java
index 36075931..5e2adba3 100644
--- a/altoslib/AltosEepromRecordSet.java
+++ b/altoslib/AltosEepromRecordSet.java
@@ -12,7 +12,7 @@
  * General Public License for more details.
  */
 
-package org.altusmetrum.altoslib_12;
+package org.altusmetrum.altoslib_13;
 
 import java.io.*;
 import java.util.*;
@@ -21,6 +21,7 @@ public class AltosEepromRecordSet implements AltosRecordSet {
 	AltosEeprom			eeprom;
 	TreeSet<AltosEepromRecord>	ordered;
 	AltosCalData			cal_data;
+	boolean				valid;
 
 	public AltosConfigData config_data() {
 		return eeprom.config_data();
@@ -52,6 +53,10 @@ public class AltosEepromRecordSet implements AltosRecordSet {
 		listener.finish();
 	}
 
+	public boolean valid() {
+		return valid;
+	}
+
 	public AltosEepromRecordSet(AltosEeprom eeprom) {
 		this.eeprom = eeprom;
 
@@ -71,6 +76,7 @@ public class AltosEepromRecordSet implements AltosRecordSet {
 		case AltosLib.AO_LOG_FORMAT_TELEMEGA:
 		case AltosLib.AO_LOG_FORMAT_TELEMEGA_3:
 		case AltosLib.AO_LOG_FORMAT_TELEMEGA_OLD:
+		case AltosLib.AO_LOG_FORMAT_EASYMEGA_2:
 			record = new AltosEepromRecordMega(eeprom);
 			break;
 		case AltosLib.AO_LOG_FORMAT_TELEMETRUM:
@@ -88,13 +94,20 @@ public class AltosEepromRecordSet implements AltosRecordSet {
 		case AltosLib.AO_LOG_FORMAT_TELEFIRETWO:
 			record = new AltosEepromRecordFireTwo(eeprom);
 			break;
+		case AltosLib.AO_LOG_FORMAT_MICROPEAK2:
+			record = new AltosEepromRecordMicroPeak2(eeprom);
+			break;
 		}
 
+		ordered = new TreeSet<AltosEepromRecord>();
+
 		if (record == null) {
 			System.out.printf("failed to parse log format %d\n", config_data.log_format);
+			valid = false;
 			return;
 		}
-		ordered = new TreeSet<AltosEepromRecord>();
+		valid = true;
+
 		int	tick = 0;
 		boolean first = true;