summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2010-08-26 23:47:38 -0700
committerKeith Packard <keithp@keithp.com>2010-08-26 23:47:38 -0700
commite383595cd281687de903fb6176564bbef270cb83 (patch)
tree09eeefbba22aadb8423f480d124733215ad17364
parent651f6102ac79459fc8d5679d852c963dcb5bb3fc (diff)
altosui: AltosEepromReader was mis-setting boost tick
It was supposed to use record.tick instead of the (unset) state.tick value. Signed-off-by: Keith Packard <keithp@keithp.com>
-rw-r--r--ao-tools/altosui/AltosEepromReader.java7
1 files changed, 2 insertions, 5 deletions
diff --git a/ao-tools/altosui/AltosEepromReader.java b/ao-tools/altosui/AltosEepromReader.java
index deab2167..3f2d4c62 100644
--- a/ao-tools/altosui/AltosEepromReader.java
+++ b/ao-tools/altosui/AltosEepromReader.java
@@ -133,8 +133,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;
- System.out.printf("ground pressure %d altitude %f\n",
- record.b, state.altitude());
ground_accel += state.accel;
state.ground_accel = (int) (ground_accel / n_pad_samples);
state.flight_accel = state.ground_accel;
@@ -156,7 +154,6 @@ public class AltosEepromReader extends AltosReader {
seen |= seen_deploy;
break;
case Altos.AO_LOG_STATE:
- System.out.printf("state %d\n", record.a);
state.state = record.a;
break;
case Altos.AO_LOG_GPS_TIME:
@@ -298,10 +295,10 @@ public class AltosEepromReader extends AltosReader {
break;
tick = record.tick;
if (!saw_boost && record.cmd == Altos.AO_LOG_STATE &&
- record.a == Altos.ao_flight_boost)
+ record.a >= Altos.ao_flight_boost)
{
saw_boost = true;
- boost_tick = state.tick;
+ boost_tick = tick;
}
records.add(record);
}