From: Keith Packard <keithp@keithp.com>
Date: Sun, 5 Sep 2010 08:52:36 +0000 (-0700)
Subject: altosui: Record flight number when scanning file, not when running
X-Git-Tag: debian/0.7+79+g3d49d5f~3
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=6c653a4cba5fef8d49261cf1c024f3e86e9058c6;ds=sidebyside

altosui: Record flight number when scanning file, not when running

The very first record in the eeprom is the flight number, but it is
time-stamped with the 'boost' time, and so it gets sorted until much
later, delaying the return of data until the rocket enters boost
mode. This drops all of the nice pad GPS and state date on the floor.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/ao-tools/altosui/AltosEepromReader.java b/ao-tools/altosui/AltosEepromReader.java
index ac54ff44..86bbaee0 100644
--- a/ao-tools/altosui/AltosEepromReader.java
+++ b/ao-tools/altosui/AltosEepromReader.java
@@ -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;
@@ -351,6 +349,11 @@ public class AltosEepromReader extends AltosReader {
 					saw_boost = true;
 					boost_tick = tick;
 				}
+				if (record.cmd == Altos.AO_LOG_FLIGHT) {
+					state.ground_accel = record.a;
+					state.flight = record.b;
+					seen |= seen_flight;
+				}
 
 				/* Two firmware bugs caused the loss of some GPS data.
 				 * The flight date would never be recorded, and often