X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosState.java;h=5e7908af135402642abf1d7824a34943ad43954e;hb=2e99ff2c99f5d4a2fa196507e794c690665ab39e;hp=256826a5d0da65185db38bb9826996f45546f38b;hpb=efb6a3d5ed12f8061a48a66efcfe066e68eaf792;p=fw%2Faltos

diff --git a/altoslib/AltosState.java b/altoslib/AltosState.java
index 256826a5..5e7908af 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_4;
+package org.altusmetrum.altoslib_5;
 
 public class AltosState implements Cloneable {
 
@@ -749,6 +749,7 @@ public class AltosState implements Cloneable {
 		speak_altitude = AltosLib.MISSING;
 
 		callsign = null;
+		firmware_version = null;
 
 		accel_plus_g = AltosLib.MISSING;
 		accel_minus_g = AltosLib.MISSING;
@@ -886,6 +887,7 @@ public class AltosState implements Cloneable {
 		speak_altitude = old.speak_altitude;
 
 		callsign = old.callsign;
+		firmware_version = old.firmware_version;
 
 		accel_plus_g = old.accel_plus_g;
 		accel_minus_g = old.accel_minus_g;
@@ -908,8 +910,8 @@ public class AltosState implements Cloneable {
 	}
 
 	void update_gps() {
-		elevation = 0;
-		range = -1;
+		elevation = AltosLib.MISSING;
+		range = AltosLib.MISSING;
 
 		if (gps == null)
 			return;
@@ -1022,15 +1024,21 @@ public class AltosState implements Cloneable {
 		firmware_version = version;
 	}
 
+	private void re_init() {
+		int bt = boost_tick;
+		int rs = receiver_serial;
+		init();
+		boost_tick = bt;
+		receiver_serial = rs;
+	}
+
 	public void set_flight(int flight) {
 
 		/* When the flight changes, reset the state */
-		if (flight != AltosLib.MISSING && flight != 0) {
+		if (flight != AltosLib.MISSING) {
 			if (this.flight != AltosLib.MISSING &&
 			    this.flight != flight) {
-				int bt = boost_tick;
-				init();
-				boost_tick = bt;
+				re_init();
 			}
 			this.flight = flight;
 		}
@@ -1041,9 +1049,7 @@ public class AltosState implements Cloneable {
 		if (serial != AltosLib.MISSING) {
 			if (this.serial != AltosLib.MISSING &&
 			    this.serial != serial) {
-				int bt = boost_tick;
-				init();
-				boost_tick = bt;
+				re_init();
 			}
 			this.serial = serial;
 		}