diff options
| author | Anthony Towns <aj@erisian.com.au> | 2010-09-20 22:05:26 +1000 |
|---|---|---|
| committer | Anthony Towns <aj@erisian.com.au> | 2010-09-20 22:05:26 +1000 |
| commit | eb74866e919e8c661153847871f5a79e66d37296 (patch) | |
| tree | 453dd8cd824d1a08eea4a5af5a705db917bbfdb6 /ao-tools/altosui/AltosEepromReader.java | |
| parent | af404b428bd742039afc25ff3850f76bc92c7c29 (diff) | |
| parent | 1260589976c1a95848b298497fd251c4ee7d3f93 (diff) | |
Merge branch 'master' of git://git.gag.com/fw/altos
Diffstat (limited to 'ao-tools/altosui/AltosEepromReader.java')
| -rw-r--r-- | ao-tools/altosui/AltosEepromReader.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/ao-tools/altosui/AltosEepromReader.java b/ao-tools/altosui/AltosEepromReader.java index 4cc8536a..03e73812 100644 --- a/ao-tools/altosui/AltosEepromReader.java +++ b/ao-tools/altosui/AltosEepromReader.java @@ -95,7 +95,6 @@ public class AltosEepromReader extends AltosReader { boolean last_reported; double ground_pres; - double ground_accel; int n_pad_samples; @@ -140,9 +139,6 @@ public class AltosEepromReader extends AltosReader { ground_pres += state.pres; state.ground_pres = (int) (ground_pres / n_pad_samples); state.flight_pres = state.ground_pres; - ground_accel += state.accel; - state.ground_accel = (int) (ground_accel / n_pad_samples); - state.flight_accel = state.ground_accel; } else { state.flight_pres = (state.flight_pres * 15 + state.pres) / 16; state.flight_accel = (state.flight_accel * 15 + state.accel) / 16; @@ -345,6 +341,7 @@ public class AltosEepromReader extends AltosReader { tick = record.tick; if (record.cmd == Altos.AO_LOG_FLIGHT) { state.ground_accel = record.a; + state.flight_accel = record.a; state.flight = record.b; boost_tick = tick; seen |= seen_flight; |