telefiretwo: don't try to record pre-burn sensor values in FLIGHT record

[fw/altos] / altoslib / AltosEepromRecordFireTwo.java

diff --git a/altoslib/AltosEepromRecordFireTwo.java b/altoslib/AltosEepromRecordFireTwo.java
index 9b92f1115ffe2f3fa285f0b8b0cbfda593628532..809247c798e5ed2699e1c8b27e58c875809abd4a 100644 (file)
--- a/altoslib/AltosEepromRecordFireTwo.java
+++ b/altoslib/AltosEepromRecordFireTwo.java
@@ -27,8 +27,6 @@ public class AltosEepromRecordFireTwo extends AltosEepromRecord {
 
        /* AO_LOG_FLIGHT elements */
        public int flight() { return data16(0); }
-       public int idle_pres() { return data16(2); }
-       public int idle_thrust() { return data16(4); }
 
        /* AO_LOG_STATE elements */
        public int state() { return data16(0); }
@@ -76,7 +74,7 @@ public class AltosEepromRecordFireTwo extends AltosEepromRecord {
                switch (cmd()) {
                case AltosLib.AO_LOG_FLIGHT:
                        state.set_flight(flight());
-                       state.set_ground_pressure(adc_to_pa(idle_pres()));
+                       state.set_ground_pressure(0.0);
                        state.set_accel_g(0, -1);
                        break;
                case AltosLib.AO_LOG_STATE:
@@ -90,9 +88,10 @@ public class AltosEepromRecordFireTwo extends AltosEepromRecord {
        }
 
        public AltosEepromRecord next() {
-               if (start + length + length < eeprom.data.size())
-                       return new AltosEepromRecordFireTwo(eeprom, start + length);
-               return null;
+               int     s = next_start();
+               if (s < 0)
+                       return null;
+               return new AltosEepromRecordFireTwo(eeprom, s);
        }
 
        public AltosEepromRecordFireTwo(AltosEepromNew eeprom, int start) {