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

diff --git a/altoslib/AltosEepromRecordFireTwo.java b/altoslib/AltosEepromRecordFireTwo.java
index dd9e34e1425e10309e09871fd55ea28e4209fe6b..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:

diff --git a/src/kernel/ao_log.h b/src/kernel/ao_log.h
index a2f2c6ca9679f8b93946ff3bc3d418d5e4209d2a..5c568c99e9e3bdd34906c14c92a1bf30d0f27a17 100644 (file)
--- a/src/kernel/ao_log.h
+++ b/src/kernel/ao_log.h
@@ -309,9 +309,7 @@ struct ao_log_firetwo {
                /* AO_LOG_FLIGHT */
                struct {
                        uint16_t        flight;         /* 4 */
-                       uint16_t        idle_pressure;  /* 6 */
-                       uint16_t        idle_thrust;    /* 8 */
-               } flight;       /* 16 */
+               } flight;       /* 6 */
                /* AO_LOG_STATE */
                struct {
                        uint16_t        state;          /* 4 */

diff --git a/src/kernel/ao_log_firetwo.c b/src/kernel/ao_log_firetwo.c
index 4b42abe4bcb1792bf252106ead12002dffbb4aad..1a82673d4344e387e505148dcd58815409056ea0 100644 (file)
--- a/src/kernel/ao_log_firetwo.c
+++ b/src/kernel/ao_log_firetwo.c
@@ -75,8 +75,6 @@ typedef uint8_t check_log_size[1-(256 % sizeof(struct ao_log_firetwo))] ;
 void
 ao_log(void)
 {
-       uint16_t ao_idle_pressure = 0;          // write code to capture pre-test values someday
-       uint16_t ao_idle_thrust = 0;
        uint16_t ao_flight_state = ao_flight_startup;
 
        ao_storage_setup();
@@ -89,8 +87,6 @@ ao_log(void)
        
                log.type = AO_LOG_FLIGHT;
                log.tick = ao_time();
-               log.u.flight.idle_pressure = ao_idle_pressure;
-               log.u.flight.idle_thrust = ao_idle_thrust;
                log.u.flight.flight = ao_flight_number;
                ao_log_firetwo(&log);