X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosEepromIterable.java;h=b84574ef9647261ea724d9510f0946f03469f544;hb=9a22a300009679a14d66214a5d61e9e6a177279f;hp=bc698c8064a50723bf0d279f148b44c2043e6342;hpb=8d1d8d2a3c129cdbd55427bcda0f26715b02f1ee;p=fw%2Faltos

diff --git a/altoslib/AltosEepromIterable.java b/altoslib/AltosEepromIterable.java
index bc698c80..b84574ef 100644
--- a/altoslib/AltosEepromIterable.java
+++ b/altoslib/AltosEepromIterable.java
@@ -125,30 +125,40 @@ public class AltosEepromIterable extends AltosRecordIterable {
 			state.gps.locked = (flags & AltosLib.AO_GPS_VALID) != 0;
 			state.gps.nsat = (flags & AltosLib.AO_GPS_NUM_SAT_MASK) >>
 				AltosLib.AO_GPS_NUM_SAT_SHIFT;
-			state.new_gps = true;
+			state.gps_sequence++;
 			has_gps = true;
 			break;
 		case AltosLib.AO_LOG_GPS_LAT:
 			eeprom.seen |= AltosRecord.seen_gps_lat;
 			int lat32 = record.a | (record.b << 16);
+			if (state.gps == null)
+				state.gps = new AltosGPS();
 			state.gps.lat = (double) lat32 / 1e7;
 			break;
 		case AltosLib.AO_LOG_GPS_LON:
 			eeprom.seen |= AltosRecord.seen_gps_lon;
 			int lon32 = record.a | (record.b << 16);
+			if (state.gps == null)
+				state.gps = new AltosGPS();
 			state.gps.lon = (double) lon32 / 1e7;
 			break;
 		case AltosLib.AO_LOG_GPS_ALT:
+			if (state.gps == null)
+				state.gps = new AltosGPS();
 			state.gps.alt = record.a;
 			break;
 		case AltosLib.AO_LOG_GPS_SAT:
 			if (state.tick == eeprom.gps_tick) {
 				int svid = record.a;
 				int c_n0 = record.b >> 8;
+				if (state.gps == null)
+					state.gps = new AltosGPS();
 				state.gps.add_sat(svid, c_n0);
 			}
 			break;
 		case AltosLib.AO_LOG_GPS_DATE:
+			if (state.gps == null)
+				state.gps = new AltosGPS();
 			state.gps.year = (record.a & 0xff) + 2000;
 			state.gps.month = record.a >> 8;
 			state.gps.day = record.b & 0xff;