summaryrefslogtreecommitdiff
path: root/altoslib/AltosState.java
diff options
context:
space:
mode:
authorBdale Garbee <bdale@gag.com>2013-01-12 10:57:22 -0700
committerBdale Garbee <bdale@gag.com>2013-01-12 10:57:22 -0700
commit670034eef48d63cdaec8d271fa93da984ffe2ea9 (patch)
tree422713fba95404876049f785255942ce6d9c4afd /altoslib/AltosState.java
parent8c5ebaf88b459b09924753a8077393a7b0639133 (diff)
parentd374d6be7eb040457f4df6c38b5d057f26ee741c (diff)
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Diffstat (limited to 'altoslib/AltosState.java')
-rw-r--r--altoslib/AltosState.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/altoslib/AltosState.java b/altoslib/AltosState.java
index 218c598a..4f59c840 100644
--- a/altoslib/AltosState.java
+++ b/altoslib/AltosState.java
@@ -200,10 +200,10 @@ public class AltosState {
}
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)