X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosTelemetryLocation.java;h=1199564020bbf57173443dad3e3d340a4d1712ba;hb=217d77dadbef4192d2f32e290a5c5f50159f2e0d;hp=67705cde57750df8d724f0011b34ab04383799db;hpb=d69547796caf74405f8304d23d4ae318315bbd7b;p=fw%2Faltos

diff --git a/altoslib/AltosTelemetryLocation.java b/altoslib/AltosTelemetryLocation.java
index 67705cde..11995640 100644
--- a/altoslib/AltosTelemetryLocation.java
+++ b/altoslib/AltosTelemetryLocation.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_4;
+package org.altusmetrum.altoslib_11;
 
 
 public class AltosTelemetryLocation extends AltosTelemetryStandard {
@@ -36,13 +37,13 @@ public class AltosTelemetryLocation extends AltosTelemetryStandard {
 	int	ground_speed;
 	int	climb_rate;
 	int	course;
-	int	state;
+
+	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);
@@ -58,7 +59,11 @@ public class AltosTelemetryLocation extends AltosTelemetryStandard {
 		ground_speed   = uint16(26);
 		climb_rate     = int16(28);
 		course	       = uint8(30);
-		state	       = uint8(31);
+
+		if ((mode & AO_GPS_MODE_ALTITUDE_24) != 0) {
+			altitude = (int8(31) << 16) | uint16(6);
+		} else
+			altitude = int16(6);
 	}
 
 	public void update_state(AltosState state) {
@@ -68,7 +73,6 @@ public class AltosTelemetryLocation extends AltosTelemetryStandard {
 		gps.nsat = flags & 0xf;
 		gps.locked = (flags & (1 << 4)) != 0;
 		gps.connected = (flags & (1 << 5)) != 0;
-		gps.state = this.state;
 
 		if (gps.locked) {
 			gps.lat = latitude * 1.0e-7;
@@ -83,8 +87,9 @@ public class AltosTelemetryLocation extends AltosTelemetryStandard {
 			gps.ground_speed = ground_speed * 1.0e-2;
 			gps.course = course * 2;
 			gps.climb_rate = climb_rate * 1.0e-2;
-			gps.hdop = hdop;
-			gps.vdop = vdop;
+			gps.pdop = pdop / 10.0;
+			gps.hdop = hdop / 10.0;
+			gps.vdop = vdop / 10.0;
 		}
 		state.set_temp_gps();
 	}