projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Extend GPS altitudes to at least 24 bits everywhere
[fw/altos]
/
altoslib
/
AltosReplayReader.java
diff --git
a/altoslib/AltosReplayReader.java
b/altoslib/AltosReplayReader.java
index a7e30370d2696da8db29aedbdb461e3808a332ac..15093af18410a1180e4c8c3bf8a66dee5718ba4d 100644
(file)
--- a/
altoslib/AltosReplayReader.java
+++ b/
altoslib/AltosReplayReader.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_
5
;
import java.io.*;
import java.util.*;
import java.io.*;
import java.util.*;
@@
-25,10
+25,10
@@
import java.util.*;
*/
public class AltosReplayReader extends AltosFlightReader {
*/
public class AltosReplayReader extends AltosFlightReader {
- Iterator<Altos
Record>
iterator;
+ Iterator<Altos
State>
iterator;
File file;
File file;
- public Altos
Record
read() {
+ public Altos
State
read() {
if (iterator.hasNext())
return iterator.next();
return null;
if (iterator.hasNext())
return iterator.next();
return null;
@@
-39,13
+39,14
@@
public class AltosReplayReader extends AltosFlightReader {
public void update(AltosState state) throws InterruptedException {
/* Make it run in realtime after the rocket leaves the pad */
public void update(AltosState state) throws InterruptedException {
/* Make it run in realtime after the rocket leaves the pad */
- if (state.state > AltosLib.ao_flight_pad)
+ if (state.state > AltosLib.ao_flight_pad
&& state.time_change > 0
)
Thread.sleep((int) (Math.min(state.time_change,10) * 1000));
Thread.sleep((int) (Math.min(state.time_change,10) * 1000));
+ state.set_received_time(System.currentTimeMillis());
}
public File backing_file() { return file; }
}
public File backing_file() { return file; }
- public AltosReplayReader(Iterator<Altos
Record
> in_iterator, File in_file) {
+ public AltosReplayReader(Iterator<Altos
State
> in_iterator, File in_file) {
iterator = in_iterator;
file = in_file;
name = file.getName();
iterator = in_iterator;
file = in_file;
name = file.getName();