X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosState.java;h=32d02f21d1923ba934cb756e7d013196aac3ec6d;hp=f28dd1c6609f24070b7ba0fa4ce4e5f8f60205ed;hb=8d1d8d2a3c129cdbd55427bcda0f26715b02f1ee;hpb=7894c27b2b2c3c46a7c107c8acd5977830f006cf

diff --git a/altoslib/AltosState.java b/altoslib/AltosState.java
index f28dd1c6..32d02f21 100644
--- a/altoslib/AltosState.java
+++ b/altoslib/AltosState.java
@@ -19,7 +19,7 @@
  * Track flight state from telemetry or eeprom data stream
  */
 
-package org.altusmetrum.AltosLib;
+package org.altusmetrum.altoslib_1;
 
 public class AltosState {
 	public AltosRecord data;
@@ -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();
@@ -197,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)