X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosEepromReader.java;h=4cc8536a64a22bf889b35e26e6bc1e6d6ca9dcb1;hp=ac54ff4472344ffa07e59932ef36514bbd5c9998;hb=refs%2Ftags%2F0.7.1;hpb=2d58f319a7c1a6a8ccc6a539722009996ba886ab

diff --git a/ao-tools/altosui/AltosEepromReader.java b/ao-tools/altosui/AltosEepromReader.java
index ac54ff44..4cc8536a 100644
--- a/ao-tools/altosui/AltosEepromReader.java
+++ b/ao-tools/altosui/AltosEepromReader.java
@@ -101,8 +101,6 @@ public class AltosEepromReader extends AltosReader {
 
 	int			gps_tick;
 
-	boolean			saw_boost;
-
 	int			boost_tick;
 
 	boolean			saw_gps_date;
@@ -116,7 +114,9 @@ public class AltosEepromReader extends AltosReader {
 					if (last_reported)
 						return null;
 					last_reported = true;
-					return new AltosRecord(state);
+					AltosRecord r = new AltosRecord(state);
+					r.time = (r.tick - boost_tick) / 100.0;
+					return r;
 				}
 				record = record_iterator.next();
 
@@ -130,9 +130,7 @@ public class AltosEepromReader extends AltosReader {
 			state.tick = record.tick;
 			switch (record.cmd) {
 			case Altos.AO_LOG_FLIGHT:
-				state.ground_accel = record.a;
-				state.flight = record.b;
-				seen |= seen_flight;
+				/* recorded when first read from the file */
 				break;
 			case Altos.AO_LOG_SENSOR:
 				state.accel = record.a;
@@ -345,11 +343,11 @@ public class AltosEepromReader extends AltosReader {
 				if (record.cmd == Altos.AO_LOG_INVALID)
 					continue;
 				tick = record.tick;
-				if (!saw_boost && record.cmd == Altos.AO_LOG_STATE &&
-				    record.a >= Altos.ao_flight_boost)
-				{
-					saw_boost = true;
+				if (record.cmd == Altos.AO_LOG_FLIGHT) {
+					state.ground_accel = record.a;
+					state.flight = record.b;
 					boost_tick = tick;
+					seen |= seen_flight;
 				}
 
 				/* Two firmware bugs caused the loss of some GPS data.
@@ -393,6 +391,11 @@ public class AltosEepromReader extends AltosReader {
 					}
 				}
 				records.add(record);
+
+				/* Bail after reading the 'landed' record; we're all done */
+				if (record.cmd == Altos.AO_LOG_STATE &&
+				    record.a == Altos.ao_flight_landed)
+					break;
 			}
 		} catch (IOException io) {
 		} catch (ParseException pe) {