projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add --with-fat-dir configure option to publish finished stand-alone bits
[fw/altos]
/
ao-tools
/
altosui
/
AltosEepromReader.java
diff --git
a/ao-tools/altosui/AltosEepromReader.java
b/ao-tools/altosui/AltosEepromReader.java
index ac54ff4472344ffa07e59932ef36514bbd5c9998..cb82f9a9d6ced0f7f37596a178c88e52199d791e 100644
(file)
--- a/
ao-tools/altosui/AltosEepromReader.java
+++ b/
ao-tools/altosui/AltosEepromReader.java
@@
-101,8
+101,6
@@
public class AltosEepromReader extends AltosReader {
int gps_tick;
int gps_tick;
- boolean saw_boost;
-
int boost_tick;
boolean saw_gps_date;
int boost_tick;
boolean saw_gps_date;
@@
-130,9
+128,7
@@
public class AltosEepromReader extends AltosReader {
state.tick = record.tick;
switch (record.cmd) {
case Altos.AO_LOG_FLIGHT:
state.tick = record.tick;
switch (record.cmd) {
case Altos.AO_LOG_FLIGHT:
- state.ground_accel = record.a;
- state.flight = record.b;
- seen |= seen_flight;
+ /* recorded when first read from the file */
break;
case Altos.AO_LOG_SENSOR:
state.accel = record.a;
break;
case Altos.AO_LOG_SENSOR:
state.accel = record.a;
@@
-345,11
+341,11
@@
public class AltosEepromReader extends AltosReader {
if (record.cmd == Altos.AO_LOG_INVALID)
continue;
tick = record.tick;
if (record.cmd == Altos.AO_LOG_INVALID)
continue;
tick = record.tick;
- if (!saw_boost && record.cmd == Altos.AO_LOG_STATE &&
- record.a >= Altos.ao_flight_boost)
- {
- saw_boost = true;
+ if (record.cmd == Altos.AO_LOG_FLIGHT) {
+ state.ground_accel = record.a;
+ state.flight = record.b;
boost_tick = tick;
boost_tick = tick;
+ seen |= seen_flight;
}
/* Two firmware bugs caused the loss of some GPS data.
}
/* Two firmware bugs caused the loss of some GPS data.