projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Accel calibration UI
[fw/altos]
/
altoslib
/
AltosTelemetryFile.java
diff --git
a/altoslib/AltosTelemetryFile.java
b/altoslib/AltosTelemetryFile.java
index 40b9c9bfb85f1f25487112bae905f342bf197a7d..135b028447bb6ac49bf85ccbce1b6ea33cf27be4 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.*;
@@
-52,6
+52,8
@@
class AltosTelemetryNullListener extends AltosDataListener {
public boolean cal_data_complete() {
/* All telemetry packets */
public boolean cal_data_complete() {
/* All telemetry packets */
+ AltosCalData cal_data = cal_data();
+
if (cal_data.serial == AltosLib.MISSING)
return false;
if (cal_data.serial == AltosLib.MISSING)
return false;
@@
-107,7
+109,7
@@
public class AltosTelemetryFile implements AltosRecordSet {
AltosTelemetryNullListener l = new AltosTelemetryNullListener(cal_data);
for (AltosTelemetry telem : telems) {
AltosTelemetryNullListener l = new AltosTelemetryNullListener(cal_data);
for (AltosTelemetry telem : telems) {
- telem.provide_data(l
, cal_data
);
+ telem.provide_data(l);
if (l.cal_data_complete())
break;
}
if (l.cal_data_complete())
break;
}
@@
-118,18
+120,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)
- telem.provide_data(listener, cal_data);
+
+ /* Try to pick up at least one pre-boost value */
+ if (cal_data.time() >= -2)
+ telem.provide_data(listener);
if (listener.state == AltosLib.ao_flight_landed)
break;
}
listener.finish();
}
if (listener.state == AltosLib.ao_flight_landed)
break;
}
listener.finish();
}
- public AltosTelemetryFile(FileInputStream input) {
+ public AltosTelemetryFile(FileInputStream input)
throws IOException
{
telems = new AltosTelemetryIterable(input);
}
}
telems = new AltosTelemetryIterable(input);
}
}