altoslib: Track pyro firing state when reading mega eeprom files

[fw/altos] / altoslib / AltosState.java

diff --git a/altoslib/AltosState.java b/altoslib/AltosState.java
index d65e3bd88fb2bc466ce97457d3d8c478ebefdfb7..4dbd751bee8d74f78562f4832d2be0fcf656897e 100644 (file)
--- a/altoslib/AltosState.java
+++ b/altoslib/AltosState.java
@@ -619,6 +619,8 @@ public class AltosState implements Cloneable {
 
        public AltosCompanion   companion;
 
 
        public AltosCompanion   companion;
 

+       public int      pyro_fired;
+

        public void set_npad(int npad) {
                this.npad = npad;
                gps_waiting = MIN_PAD_SAMPLES - npad;
        public void set_npad(int npad) {
                this.npad = npad;
                gps_waiting = MIN_PAD_SAMPLES - npad;


@@ -711,6 +713,8 @@ public class AltosState implements Cloneable {
 
                baro = null;
                companion = null;
 
                baro = null;
                companion = null;

+
+               pyro_fired = 0;

        }
 
        void finish_update() {
        }
 
        void finish_update() {


@@ -840,6 +844,8 @@ public class AltosState implements Cloneable {
 
                baro = old.baro;
                companion = old.companion;
 
                baro = old.baro;
                companion = old.companion;

+
+               pyro_fired = old.pyro_fired;

        }
 
        void update_time() {
        }
 
        void update_time() {


@@ -1114,6 +1120,10 @@ public class AltosState implements Cloneable {
                this.ignitor_voltage = voltage;
        }
 
                this.ignitor_voltage = voltage;
        }
 

+       public void set_pyro_fired(int fired) {
+               this.pyro_fired = fired;
+       }
+

        public double time_since_boost() {
                if (tick == AltosLib.MISSING)
                        return 0.0;
        public double time_since_boost() {
                if (tick == AltosLib.MISSING)
                        return 0.0;