projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
[fw/altos]
/
altoslib
/
AltosState.java
diff --git
a/altoslib/AltosState.java
b/altoslib/AltosState.java
index f28dd1c6609f24070b7ba0fa4ce4e5f8f60205ed..4f59c840c4f6d02acc8e862a27578b9ed4534c0a 100644
(file)
--- a/
altoslib/AltosState.java
+++ b/
altoslib/AltosState.java
@@
-92,6
+92,9
@@
public class AltosState {
public void init (AltosRecord cur, AltosState prev_state) {
data = cur;
public void init (AltosRecord cur, AltosState prev_state) {
data = cur;
+ /* Discard previous state if it was for a different board */
+ if (prev_state != null && prev_state.data.serial != data.serial)
+ prev_state = null;
ground_altitude = data.ground_altitude();
altitude = data.altitude();
ground_altitude = data.ground_altitude();
altitude = data.altitude();
@@
-197,10
+200,10
@@
public class AltosState {
}
ngps++;
}
}
ngps++;
}
- } else
- pad_alt = ground_altitude;
-
- data.new_gps = false;
+ } else
{
+ if (ngps == 0)
+ pad_alt = ground_altitude;
+ }
gps_waiting = MIN_PAD_SAMPLES - npad;
if (gps_waiting < 0)
gps_waiting = MIN_PAD_SAMPLES - npad;
if (gps_waiting < 0)