diff options
| author | Bdale Garbee <bdale@gag.com> | 2017-04-27 12:57:49 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2017-05-11 09:58:46 -0600 |
| commit | f753ad3b9d0f3dc9794e5dd097063aab6cf9bdc4 (patch) | |
| tree | ac0bf201c5309c9c2acbd9e6311f11b06feb47b0 | |
| parent | 7e2b92ccb56b713fd18af5769156331ead8dc7ed (diff) | |
telefiretwo: don't try to record pre-burn sensor values in FLIGHT record
| -rw-r--r-- | altoslib/AltosEepromRecordFireTwo.java | 4 | ||||
| -rw-r--r-- | src/kernel/ao_log.h | 4 | ||||
| -rw-r--r-- | src/kernel/ao_log_firetwo.c | 4 |
3 files changed, 2 insertions, 10 deletions
diff --git a/altoslib/AltosEepromRecordFireTwo.java b/altoslib/AltosEepromRecordFireTwo.java index dd9e34e1..809247c7 100644 --- 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 a2f2c6ca..5c568c99 100644 --- 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 4b42abe4..1a82673d 100644 --- 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); |