X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosTelemetry.java;h=a123d7528145471a9944b1fa95fd6c9f7a611bc3;hp=1c4ce7bc36e6057d4d4b98bbdb4cf895735a0fb1;hb=8a2be4d36a3b116d82529805430c5fb665688267;hpb=9e18c524fa2d1f648f265b3c3105f5ceacf06c10

diff --git a/altoslib/AltosTelemetry.java b/altoslib/AltosTelemetry.java
index 1c4ce7bc..a123d752 100644
--- a/altoslib/AltosTelemetry.java
+++ b/altoslib/AltosTelemetry.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_5;
 
 import java.text.*;
 
@@ -43,9 +43,9 @@ public abstract class AltosTelemetry implements AltosStateUpdate {
 	}
 
 	public void update_state(AltosState state) {
+		state.set_serial(serial);
 		if (state.state == AltosLib.ao_flight_invalid)
 			state.set_state(AltosLib.ao_flight_startup);
-		state.set_serial(serial);
 		state.set_tick(tick);
 		state.set_rssi(rssi, status);
 		state.set_received_time(received_time);
@@ -114,6 +114,29 @@ public abstract class AltosTelemetry implements AltosStateUpdate {
 		return telem;
 	}
 
+	public static int extend_height(AltosState state, int height_16) {
+		double	compare_height;
+		int	height = height_16;
+
+		if (state.gps != null && state.gps.alt != AltosLib.MISSING) {
+			compare_height = state.gps_height();
+		} else {
+			compare_height = state.height();
+		}
+
+		if (compare_height != AltosLib.MISSING) {
+			int	high_bits = (int) Math.floor (compare_height / 65536.0);
+
+			height = (high_bits << 16) | (height_16 & 0xffff);
+
+			if (Math.abs(height + 65536 - compare_height) < Math.abs(height - compare_height))
+				height += 65536;
+			else if (Math.abs(height - 65536 - compare_height) < Math.abs(height - compare_height))
+				height -= 65536;
+		}
+		return height;
+	}
+
 	public static AltosTelemetry parse(String line) throws ParseException, AltosCRCException {
 		String[] word = line.split("\\s+");
 		int i =0;