diff options
| author | Keith Packard <keithp@keithp.com> | 2011-04-19 14:06:39 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-04-19 14:06:39 -0700 |
| commit | 44fb71ca3e5bccd5f601fc5a2d5da7292050b1d6 (patch) | |
| tree | a5147a78cc37c9728aa1a2424a434c23508dca20 /altosui/AltosEepromDownload.java | |
| parent | 2ebdb888f6792de70b3132950a988d49752d264e (diff) | |
| parent | c269e263a6accd815ed5d08c0f5a6c3d5b9d3853 (diff) | |
Merge branch 'telemini' into telebt
Diffstat (limited to 'altosui/AltosEepromDownload.java')
| -rw-r--r-- | altosui/AltosEepromDownload.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/altosui/AltosEepromDownload.java b/altosui/AltosEepromDownload.java index 5c704968..82f01ef5 100644 --- a/altosui/AltosEepromDownload.java +++ b/altosui/AltosEepromDownload.java @@ -155,15 +155,17 @@ public class AltosEepromDownload implements Runnable { int s = v ^ 0x8000; if (Altos.ao_flight_startup <= s && s <= Altos.ao_flight_invalid) { - r = new AltosEepromRecord(Altos.AO_LOG_STATE, tiny_tick, s, 0); - if (s == Altos.ao_flight_landed) + state = s; + r = new AltosEepromRecord(Altos.AO_LOG_STATE, tiny_tick, state, 0); + if (state == Altos.ao_flight_landed) done = true; state = s; any_valid = true; } else { if (v != 0xffff) any_valid = true; - r = new AltosEepromRecord(Altos.AO_LOG_HEIGHT, tiny_tick, v, 0); + + r = new AltosEepromRecord(Altos.AO_LOG_PRESSURE, tiny_tick, 0, v); /* * The flight software records ascent data every 100ms, and descent |