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/AltosEepromIterable.java | |
| parent | 2ebdb888f6792de70b3132950a988d49752d264e (diff) | |
| parent | c269e263a6accd815ed5d08c0f5a6c3d5b9d3853 (diff) | |
Merge branch 'telemini' into telebt
Diffstat (limited to 'altosui/AltosEepromIterable.java')
| -rw-r--r-- | altosui/AltosEepromIterable.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/altosui/AltosEepromIterable.java b/altosui/AltosEepromIterable.java index 624e1dd3..16349b88 100644 --- a/altosui/AltosEepromIterable.java +++ b/altosui/AltosEepromIterable.java @@ -134,8 +134,13 @@ public class AltosEepromIterable extends AltosRecordIterable { eeprom.seen |= seen_sensor; has_accel = true; break; - case Altos.AO_LOG_HEIGHT: - state.height = (short) record.a; + case Altos.AO_LOG_PRESSURE: + state.pres = record.b; + state.flight_pres = state.pres; + if (eeprom.n_pad_samples == 0) { + eeprom.n_pad_samples++; + state.ground_pres = state.pres; + } eeprom.seen |= seen_sensor; break; case Altos.AO_LOG_TEMP_VOLT: |