projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Make AltosReplayReader start synchronously enough to track states
[fw/altos]
/
altoslib
/
AltosState.java
diff --git
a/altoslib/AltosState.java
b/altoslib/AltosState.java
index 889aa9a319e4b9067492b716639d162754bd1b77..0716b892a1c1b97d97b8e9337195f3b79721b086 100644
(file)
--- a/
altoslib/AltosState.java
+++ b/
altoslib/AltosState.java
@@
-705,8
+705,6
@@
public class AltosState extends AltosDataListener {
public double igniter_voltage[];
public AltosGPS gps;
public double igniter_voltage[];
public AltosGPS gps;
- public AltosGPS temp_gps;
- public int temp_gps_sat_tick;
public boolean gps_pending;
public AltosIMU imu;
public boolean gps_pending;
public AltosIMU imu;
@@
-757,6
+755,7
@@
public class AltosState extends AltosDataListener {
public void init() {
set = 0;
public void init() {
set = 0;
+ System.out.printf("state init\n");
received_time = System.currentTimeMillis();
time = AltosLib.MISSING;
time_change = AltosLib.MISSING;
received_time = System.currentTimeMillis();
time = AltosLib.MISSING;
time_change = AltosLib.MISSING;
@@
-793,8
+792,6
@@
public class AltosState extends AltosDataListener {
kalman_acceleration = new AltosValue();
gps = null;
kalman_acceleration = new AltosValue();
gps = null;
- temp_gps = null;
- temp_gps_sat_tick = 0;
gps_pending = false;
imu = null;
gps_pending = false;
imu = null;