summaryrefslogtreecommitdiff
path: root/altoslib/AltosState.java
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2012-12-25 14:20:42 -0800
committerKeith Packard <keithp@keithp.com>2012-12-25 14:20:42 -0800
commit868ef0c9c4b208c02a87180b0eede329369bdc77 (patch)
tree1f20d312d56bac34bad12f287629a2651bbbccf8 /altoslib/AltosState.java
parent669cde8a87d88ceae89e369c1d38b88c9f8198cf (diff)
parent57487e78b90465a21c87cf30deb0aeaba0887332 (diff)
Merge branch 'master' into micropeak-logging
Diffstat (limited to 'altoslib/AltosState.java')
-rw-r--r--altoslib/AltosState.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/altoslib/AltosState.java b/altoslib/AltosState.java
index f28dd1c6..218c598a 100644
--- 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;
+ /* 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();