projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib,altosuilib: Bump library version numbers
[fw/altos]
/
altoslib
/
AltosTelemetryFile.java
diff --git
a/altoslib/AltosTelemetryFile.java
b/altoslib/AltosTelemetryFile.java
index 40b9c9bfb85f1f25487112bae905f342bf197a7d..037a6c87f9698a2c018d0426d5ab4aaa3b3d1eb6 100644
(file)
--- a/
altoslib/AltosTelemetryFile.java
+++ b/
altoslib/AltosTelemetryFile.java
@@
-16,7
+16,7
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_1
1
;
+package org.altusmetrum.altoslib_1
2
;
import java.io.*;
import java.util.*;
import java.io.*;
import java.util.*;
@@
-118,10
+118,13
@@
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);
if (listener.state == AltosLib.ao_flight_landed)
break;
telem.provide_data(listener, cal_data);
if (listener.state == AltosLib.ao_flight_landed)
break;
@@
-129,7
+132,7
@@
public class AltosTelemetryFile implements AltosRecordSet {
listener.finish();
}
listener.finish();
}
- public AltosTelemetryFile(FileInputStream input) {
+ public AltosTelemetryFile(FileInputStream input)
throws IOException
{
telems = new AltosTelemetryIterable(input);
}
}
telems = new AltosTelemetryIterable(input);
}
}