X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosEepromLog.java;h=0cf420d9c7d2a45b5bf89abb4d32bbfa551c45a0;hp=4c6deaa065f232dd09f63119e7297708e3d08cf2;hb=3cad81b0ebb52352c66643a2587e94a2b693a2d2;hpb=011615d40b3cb1d1c0ab9fa41e139e263a6a51e7

diff --git a/altosui/AltosEepromLog.java b/altosui/AltosEepromLog.java
index 4c6deaa0..0cf420d9 100644
--- a/altosui/AltosEepromLog.java
+++ b/altosui/AltosEepromLog.java
@@ -41,20 +41,18 @@ public class AltosEepromLog {
 	int		start_block;
 	int		end_block;
 
-	boolean		has_gps;
 	int		year, month, day;
-	int		hour, minute, second;
-	double		lat, lon;
 
 	boolean		download;
 	boolean		delete;
 
 	public AltosEepromLog(AltosSerial serial_line, int in_serial,
-			      int in_start_block, int in_end_block)
+			      int in_flight, int in_start_block,
+			      int in_end_block)
 		throws InterruptedException, TimeoutException {
 
 		int		block;
-		boolean		has_date = false, has_time = false, has_lat = false, has_lon = false;
+		boolean		has_date = false;
 
 		start_block = in_start_block;
 		end_block = in_end_block;
@@ -76,40 +74,30 @@ public class AltosEepromLog {
 			AltosEepromChunk eechunk = new AltosEepromChunk(serial_line, block);
 
 			if (block == in_start_block) {
-				if (eechunk.data(0) != Altos.AO_LOG_FLIGHT) {
-					flight = eechunk.data16(0);
+				if (eechunk.data16(0) == in_flight) {
+					flight = in_flight;
 					has_flight = true;
 					break;
 				}
 			}
-			AltosEepromBlock eeblock = new AltosEepromBlock(eechunk);
-			if (eeblock.has_flight) {
-				flight = eeblock.flight;
-				has_flight = true;
-			}
-			if (eeblock.has_date) {
-				year = eeblock.year;
-				month = eeblock.month;
-				day = eeblock.day;
-				has_date = true;
-			}
-			if (eeblock.has_time) {
-				hour = eeblock.hour;
-				minute = eeblock.minute;
-				second = eeblock.second;
-				has_time = true;
-			}
-			if (eeblock.has_lat) {
-				lat = eeblock.lat;
-				has_lat = true;
-			}
-			if (eeblock.has_lon) {
-				lon = eeblock.lon;
-				has_lon = true;
+			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;
+					}
+				} catch (ParseException pe) {
+				}
 			}
-			if (has_date && has_time && has_lat && has_lon)
-				has_gps = true;
-			if (has_gps && has_flight)
+			if (has_date && has_flight)
 				break;
 		}
 	}