X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosEepromRecord.java;h=d8a07951a72369f7a73fa7cecd45565bb3c51476;hb=c8a00bb9ccdf0d4257f037c2bf996ce5e6b0b0c0;hp=5787af86e6d53fc60640bc35f803c7d71be2c931;hpb=011615d40b3cb1d1c0ab9fa41e139e263a6a51e7;p=fw%2Faltos

diff --git a/altosui/AltosEepromRecord.java b/altosui/AltosEepromRecord.java
index 5787af86..d8a07951 100644
--- a/altosui/AltosEepromRecord.java
+++ b/altosui/AltosEepromRecord.java
@@ -40,42 +40,18 @@ public class AltosEepromRecord {
 
 	static final int	record_length = 8;
 
-	int[] ParseHex(String line) {
-		String[] tokens = line.split("\\s+");
-		int[] array = new int[tokens.length];
-
-		for (int i = 0; i < tokens.length; i++)
-			try {
-				array[i] = Integer.parseInt(tokens[i], 16);
-			} catch (NumberFormatException ne) {
-				return null;
-			}
-		return array;
-	}
-
-	int checksum(int[] data, int start) {
-		int	csum = 0x5a;
-		for (int i = 0; i < record_length; i++)
-			csum += data[i + start];
-		return csum & 0xff;
-	}
-
 	public AltosEepromRecord (AltosEepromChunk chunk, int start) throws ParseException {
 
 		cmd = chunk.data(start);
 		tick_valid = true;
 
-		int i;
-		for (i = 0; i < record_length; i++)
-			if (chunk.data[start + i] != 0xff)
-				break;
-		if (i != 8) {
-			if (checksum(chunk.data, start) != 0)
+		tick_valid = !chunk.erased(start, record_length);
+		if (tick_valid) {
+			if (AltosConvert.checksum(chunk.data, start, record_length) != 0)
 				throw new ParseException(String.format("invalid checksum at 0x%x",
 								       chunk.address + start), 0);
 		} else {
 			cmd = Altos.AO_LOG_INVALID;
-			tick_valid = false;
 		}
 
 		tick = chunk.data16(start + 2);
@@ -131,6 +107,9 @@ public class AltosEepromRecord {
 				} else if (tokens[0].equals("Radio") && tokens[1].equals("cal:")) {
 					cmd = Altos.AO_LOG_RADIO_CAL;
 					a = Integer.parseInt(tokens[2]);
+				} else if (tokens[0].equals("Max") && tokens[1].equals("flight") && tokens[2].equals("log:")) {
+					cmd = Altos.AO_LOG_MAX_FLIGHT_LOG;
+					a = Integer.parseInt(tokens[3]);
 				} else if (tokens[0].equals("manufacturer")) {
 					cmd = Altos.AO_LOG_MANUFACTURER;
 					data = tokens[1];
@@ -140,6 +119,9 @@ public class AltosEepromRecord {
 				} else if (tokens[0].equals("serial-number")) {
 					cmd = Altos.AO_LOG_SERIAL_NUMBER;
 					a = Integer.parseInt(tokens[1]);
+				} else if (tokens[0].equals("log-format")) {
+					cmd = Altos.AO_LOG_LOG_FORMAT;
+					a = Integer.parseInt(tokens[1]);
 				} else if (tokens[0].equals("software-version")) {
 					cmd = Altos.AO_LOG_SOFTWARE_VERSION;
 					data = tokens[1];