X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosEepromGPS.java;h=8c991a6e392a822a5094c406a77f27967f158437;hp=46a2173de6063c08211789598df215241c1178f2;hb=57f0ae384f3c206ea777dc7c93b594ae3901f354;hpb=b8fa4e9a077e8e04b922d0c434c139ad0a57ee66

diff --git a/altoslib/AltosEepromGPS.java b/altoslib/AltosEepromGPS.java
index 46a2173d..8c991a6e 100644
--- a/altoslib/AltosEepromGPS.java
+++ b/altoslib/AltosEepromGPS.java
@@ -37,7 +37,7 @@ public class AltosEepromGPS extends AltosEeprom {
 	/* AO_LOG_GPS_TIME elements */
 	public int latitude() { return data32(0); }
 	public int longitude() { return data32(4); }
-	public int altitude() { return data16(8); }
+	public int altitude_low() { return data16(8); }
 	public int hour() { return data8(10); }
 	public int minute() { return data8(11); }
 	public int second() { return data8(12); }
@@ -52,6 +52,7 @@ public class AltosEepromGPS extends AltosEeprom {
 	public int hdop() { return data8(23); }
 	public int vdop() { return data8(24); }
 	public int mode() { return data8(25); }
+	public int altitude_high() { return data16(26); }
 
 	public boolean has_seconds() { return cmd == AltosLib.AO_LOG_GPS_TIME; }
 
@@ -90,8 +91,10 @@ public class AltosEepromGPS extends AltosEeprom {
 
 		switch (cmd) {
 		case AltosLib.AO_LOG_FLIGHT:
-			state.set_boost_tick(tick);
-			state.set_flight(flight());
+			if (state.flight == AltosLib.MISSING) {
+				state.set_boost_tick(tick);
+				state.set_flight(flight());
+			}
 			/* no place to log start lat/lon yet */
 			break;
 		case AltosLib.AO_LOG_GPS_TIME:
@@ -99,7 +102,10 @@ public class AltosEepromGPS extends AltosEeprom {
 			gps = state.make_temp_gps(false);
 			gps.lat = latitude() / 1e7;
 			gps.lon = longitude() / 1e7;
-			gps.alt = altitude();
+			if (state.altitude_32())
+				gps.alt = (altitude_low() & 0xffff) | (altitude_high() << 16);
+			else
+				gps.alt = altitude_low();
 
 			gps.hour = hour();
 			gps.minute = minute();