projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
micropeak: Update mac/windows FTDI drivers
[fw/altos]
/
altoslib
/
AltosTelemetryFile.java
diff --git
a/altoslib/AltosTelemetryFile.java
b/altoslib/AltosTelemetryFile.java
index 9e992576272cd93df0b7ecc4db8b490fcf647a0e..d28795c43be57e282af4a00213a056b06ab62584 100644
(file)
--- a/
altoslib/AltosTelemetryFile.java
+++ b/
altoslib/AltosTelemetryFile.java
@@
-15,7
+15,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
;
+package org.altusmetrum.altoslib_
7
;
import java.io.*;
import java.util.*;
import java.io.*;
import java.util.*;
@@
-62,7
+62,7
@@
public class AltosTelemetryFile extends AltosStateIterable {
}
public void write(PrintStream out) {
}
public void write(PrintStream out) {
-
+
}
public AltosTelemetryFile(FileInputStream input) {
}
public AltosTelemetryFile(FileInputStream input) {
@@
-74,7
+74,8
@@
public class AltosTelemetryFile extends AltosStateIterable {
for (AltosTelemetry telem : telems) {
telem.update_state(state);
for (AltosTelemetry telem : telems) {
telem.update_state(state);
- if (state.state >= AltosLib.ao_flight_boost) {
+ state.finish_update();
+ if (state.state != AltosLib.ao_flight_invalid && state.state >= AltosLib.ao_flight_boost) {
start.set_boost_tick(state.tick);
break;
}
start.set_boost_tick(state.tick);
break;
}
@@
-88,6
+89,7
@@
public class AltosTelemetryFile extends AltosStateIterable {
while (i.hasNext() && !state.valid()) {
AltosTelemetry t = i.next();
t.update_state(state);
while (i.hasNext() && !state.valid()) {
AltosTelemetry t = i.next();
t.update_state(state);
+ state.finish_update();
}
return new AltosTelemetryIterator(state, i);
}
}
return new AltosTelemetryIterator(state, i);
}