X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosTelemetryLocation.java;h=2cd75621f63808fa481a167e9c79d78ddb775ef5;hb=469be0a57dc9932c26f9c38986d22f6e8b2fd6ed;hp=9d50e2fa4570f56ccd2a26ade60839ad48cd7250;hpb=b8fa4e9a077e8e04b922d0c434c139ad0a57ee66;p=fw%2Faltos

diff --git a/altoslib/AltosTelemetryLocation.java b/altoslib/AltosTelemetryLocation.java
index 9d50e2fa..2cd75621 100644
--- a/altoslib/AltosTelemetryLocation.java
+++ b/altoslib/AltosTelemetryLocation.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_5;
+package org.altusmetrum.altoslib_7;
 
 
 public class AltosTelemetryLocation extends AltosTelemetryStandard {
@@ -37,11 +37,12 @@ public class AltosTelemetryLocation extends AltosTelemetryStandard {
 	int	climb_rate;
 	int	course;
 
+	public static final int	AO_GPS_MODE_ALTITUDE_24 = (1 << 0);	/* Reports 24-bits of altitude */
+
 	public AltosTelemetryLocation(int[] bytes) {
 		super(bytes);
 
 		flags          = uint8(5);
-		altitude       = int16(6);
 		latitude       = uint32(8);
 		longitude      = uint32(12);
 		year	       = uint8(16);
@@ -57,6 +58,11 @@ public class AltosTelemetryLocation extends AltosTelemetryStandard {
 		ground_speed   = uint16(26);
 		climb_rate     = int16(28);
 		course	       = uint8(30);
+
+		if ((mode & AO_GPS_MODE_ALTITUDE_24) != 0) {
+			altitude = (int8(31) << 16) | uint16(6);
+		} else
+			altitude = int16(6);
 	}
 
 	public void update_state(AltosState state) {