projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Reset transient AltosCalData values before processing data
[fw/altos]
/
altoslib
/
AltosTelemetryFile.java
diff --git
a/altoslib/AltosTelemetryFile.java
b/altoslib/AltosTelemetryFile.java
index 46a5d060caf9a264335947ec26e5909aa4a251f7..a4792f118938b4d0283954d7bd1d8ae8919bb158 100644
(file)
--- a/
altoslib/AltosTelemetryFile.java
+++ b/
altoslib/AltosTelemetryFile.java
@@
-118,16
+118,21
@@
public class AltosTelemetryFile implements AltosRecordSet {
public void capture_series(AltosDataListener listener) {
AltosCalData cal_data = cal_data();
public void capture_series(AltosDataListener listener) {
AltosCalData cal_data = cal_data();
+ cal_data.reset();
for (AltosTelemetry telem : telems) {
int tick = telem.tick();
cal_data.set_tick(tick);
for (AltosTelemetry telem : telems) {
int tick = telem.tick();
cal_data.set_tick(tick);
- if (cal_data.time() >= -1)
+
+ /* Try to pick up at least one pre-boost value */
+ if (cal_data.time() >= -2)
telem.provide_data(listener, cal_data);
telem.provide_data(listener, cal_data);
+ if (listener.state == AltosLib.ao_flight_landed)
+ break;
}
listener.finish();
}
}
listener.finish();
}
- public AltosTelemetryFile(FileInputStream input) {
+ public AltosTelemetryFile(FileInputStream input)
throws IOException
{
telems = new AltosTelemetryIterable(input);
}
}
telems = new AltosTelemetryIterable(input);
}
}