projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Pass all flight records while reading telem file
[fw/altos]
/
altoslib
/
AltosTelemetryFile.java
diff --git
a/altoslib/AltosTelemetryFile.java
b/altoslib/AltosTelemetryFile.java
index 01d82c242bd3ef7e1915269eee57ad1d40ac0db6..1aa473aee56325da0539787183ce54fafb2ddd0b 100644
(file)
--- a/
altoslib/AltosTelemetryFile.java
+++ b/
altoslib/AltosTelemetryFile.java
@@
-95,6
+95,7
@@
public class AltosTelemetryFile implements AltosRecordSet {
AltosTelemetryIterable telems;
AltosCalData cal_data;
AltosTelemetryIterable telems;
AltosCalData cal_data;
+ int first_state;
public void write_comments(PrintStream out) {
}
public void write_comments(PrintStream out) {
}
@@
-108,8
+109,11
@@
public class AltosTelemetryFile implements AltosRecordSet {
cal_data = new AltosCalData();
AltosTelemetryNullListener l = new AltosTelemetryNullListener(cal_data);
cal_data = new AltosCalData();
AltosTelemetryNullListener l = new AltosTelemetryNullListener(cal_data);
+ first_state = AltosLib.ao_flight_startup;
for (AltosTelemetry telem : telems) {
telem.provide_data(l);
for (AltosTelemetry telem : telems) {
telem.provide_data(l);
+ if (cal_data.state == AltosLib.ao_flight_pad)
+ first_state = cal_data.state;
if (l.cal_data_complete())
break;
}
if (l.cal_data_complete())
break;
}
@@
-122,16
+126,11
@@
public class AltosTelemetryFile implements AltosRecordSet {
}
public void capture_series(AltosDataListener listener) {
}
public void capture_series(AltosDataListener listener) {
- AltosCalData cal_data = cal_data();
-
+ cal_data();
cal_data.reset();
cal_data.reset();
+ cal_data.state = first_state;
for (AltosTelemetry telem : telems) {
for (AltosTelemetry telem : telems) {
- int tick = telem.tick();
- cal_data.set_tick(tick);
-
- /* Try to pick up at least one pre-boost value */
- if (cal_data.time() >= -2)
- telem.provide_data(listener);
+ telem.provide_data(listener);
if (listener.state() == AltosLib.ao_flight_landed)
break;
}
if (listener.state() == AltosLib.ao_flight_landed)
break;
}