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

diff --git a/altoslib/AltosEepromGPS.java b/altoslib/AltosEepromGPS.java
index 33172eed..8c991a6e 100644
--- a/altoslib/AltosEepromGPS.java
+++ b/altoslib/AltosEepromGPS.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_4;
+package org.altusmetrum.altoslib_5;
 
 import java.io.*;
 import java.util.*;
@@ -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,12 +52,18 @@ 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 state() { return data8(26); }
+	public int altitude_high() { return data16(26); }
 
-	/* AO_LOG_GPS_SAT elements */
-	public int nsat() { return data16(0); }
-	public int svid(int n) { return data8(2 + n * 2); }
-	public int c_n(int n) { return data8(2 + n * 2 + 1); }
+	public boolean has_seconds() { return cmd == AltosLib.AO_LOG_GPS_TIME; }
+
+	public int seconds() {
+		switch (cmd) {
+		case AltosLib.AO_LOG_GPS_TIME:
+			return second() + 60 * (minute() + 60 * (hour() + 24 * (day() + 31 * month())));
+		default:
+			return 0;
+		}
+	}
 
 	public AltosEepromGPS (AltosEepromChunk chunk, int start) throws ParseException {
 		parse_chunk(chunk, start);
@@ -85,17 +91,21 @@ 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:
 			state.set_tick(tick);
-			state.set_state(state());
 			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();
@@ -114,18 +124,21 @@ public class AltosEepromGPS extends AltosEeprom {
 			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();
-			break;
-		case AltosLib.AO_LOG_GPS_SAT:
-			state.set_tick(tick);
-			gps = state.make_temp_gps(true);
-
-			int n = nsat();
-			if (n > max_sat)
-				n = max_sat;
-			for (int i = 0; i < n; i++)
-				gps.add_sat(svid(i), c_n(i));
+			if (state.compare_version("1.4.9") >= 0) {
+				gps.pdop = pdop() / 10.0;
+				gps.hdop = hdop() / 10.0;
+				gps.vdop = vdop() / 10.0;
+			} else {
+				gps.pdop = pdop() / 100.0;
+				if (gps.pdop < 0.8)
+					gps.pdop += 2.56;
+				gps.hdop = hdop() / 100.0;
+				if (gps.hdop < 0.8)
+					gps.hdop += 2.56;
+				gps.vdop = vdop() / 100.0;
+				if (gps.vdop < 0.8)
+					gps.vdop += 2.56;
+			}
 			break;
 		}
 	}