X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosEepromLog.java;h=ee77e5c84046fee5f1e4a4fa75e00b7cd8932948;hp=f7fb39e1e19c33e91ab0ee314007132c17bf212c;hb=7f74761051f2a5ab45b82c4dd79a8569376bbe2e;hpb=b155647472ddfacb07c5ffa832e4d1f4a13ad342

diff --git a/altosui/AltosEepromLog.java b/altosui/AltosEepromLog.java
index f7fb39e1..ee77e5c8 100644
--- a/altosui/AltosEepromLog.java
+++ b/altosui/AltosEepromLog.java
@@ -46,58 +46,64 @@ public class AltosEepromLog {
 	boolean		download;
 	boolean		delete;
 
-	public AltosEepromLog(AltosSerial serial_line, int in_serial,
-			      int in_start_block, int in_end_block)
+	public AltosEepromLog(AltosConfigData config_data,
+			      AltosSerial serial_line,
+			      int in_flight, int in_start_block,
+			      int in_end_block)
 		throws InterruptedException, TimeoutException {
 
 		int		block;
 		boolean		has_date = false;
 
+		flight = in_flight;
+		if (flight != 0)
+			has_flight = true;
 		start_block = in_start_block;
 		end_block = in_end_block;
-		serial = in_serial;
+		serial = config_data.serial;
 
 		/*
 		 * By default, request that every log be downloaded but not deleted
 		 */
 		download = true;
 		delete = false;
+
 		/*
-		 * Only look in the first two blocks so that this
-		 * process doesn't take a long time
+		 * Look in TeleMetrum log data for date
 		 */
-		if (in_end_block > in_start_block + 2)
-			in_end_block = in_start_block + 2;
+		if (config_data.log_format == Altos.AO_LOG_FORMAT_UNKNOWN ||
+		    config_data.log_format == Altos.AO_LOG_FORMAT_FULL)
+		{
+			/*
+			 * Only look in the first two blocks so that this
+			 * process doesn't take a long time
+			 */
+			if (in_end_block > in_start_block + 2)
+				in_end_block = in_start_block + 2;
 
-		for (block = in_start_block; block < in_end_block; block++) {
-			AltosEepromChunk eechunk = new AltosEepromChunk(serial_line, block);
+			for (block = in_start_block; block < in_end_block; block++) {
+				AltosEepromChunk eechunk = new AltosEepromChunk(serial_line, block, block == in_start_block);
 
-			if (block == in_start_block) {
-				if (eechunk.data(0) != Altos.AO_LOG_FLIGHT) {
-					flight = eechunk.data16(0);
-					has_flight = true;
-					break;
-				}
-			}
-			for (int i = 0; i < eechunk.chunk_size; i += AltosEepromRecord.record_length) {
-				try {
-					AltosEepromRecord r = new AltosEepromRecord(eechunk, i);
+				for (int i = 0; i < eechunk.chunk_size; i += AltosEepromRecord.record_length) {
+					try {
+						AltosEepromRecord r = new AltosEepromRecord(eechunk, i);
 
-					if (r.cmd == Altos.AO_LOG_FLIGHT) {
-						flight = r.b;
-						has_flight = true;
-					}
-					if (r.cmd == Altos.AO_LOG_GPS_DATE) {
-						year = 2000 + (r.a & 0xff);
-						month = (r.a >> 8) & 0xff;
-						day = (r.b & 0xff);
-						has_date = true;
+						if (r.cmd == Altos.AO_LOG_FLIGHT) {
+							flight = r.b;
+							has_flight = true;
+						}
+						if (r.cmd == Altos.AO_LOG_GPS_DATE) {
+							year = 2000 + (r.a & 0xff);
+							month = (r.a >> 8) & 0xff;
+							day = (r.b & 0xff);
+							has_date = true;
+						}
+					} catch (ParseException pe) {
 					}
-				} catch (ParseException pe) {
 				}
+				if (has_date && has_flight)
+					break;
 			}
-			if (has_date && has_flight)
-				break;
 		}
 	}
 }