altosui: Fill in time value of last Eeprom record read from file

[fw/altos] / ao-tools / altosui / AltosEepromReader.java

diff --git a/ao-tools/altosui/AltosEepromReader.java b/ao-tools/altosui/AltosEepromReader.java
index ac54ff4472344ffa07e59932ef36514bbd5c9998..f1d6a6a7d8124b416f0e96246e3dbcf9730ba82e 100644 (file)
--- 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.