X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosEepromRecordFull.java;h=3e255f8a6a5e57903eeb7da77c5cbc0bea078e2a;hp=b49682209642794a9e2ca658db40806032ab1d35;hb=76b288f8d02e0a48f04de9455a2dd0b77e48bd63;hpb=222158581887b5f9e8b9843d14321c313fa023fa

diff --git a/altoslib/AltosEepromRecordFull.java b/altoslib/AltosEepromRecordFull.java
index b4968220..3e255f8a 100644
--- a/altoslib/AltosEepromRecordFull.java
+++ b/altoslib/AltosEepromRecordFull.java
@@ -12,7 +12,7 @@
  * General Public License for more details.
  */
 
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_14;
 
 public class AltosEepromRecordFull extends AltosEepromRecord {
 	public static final int	record_length = 8;
@@ -26,22 +26,6 @@ public class AltosEepromRecordFull extends AltosEepromRecord {
 		super.provide_data(listener, cal_data);
 		AltosGPS	gps;
 
-		/* Flush any pending GPS changes */
-		if (cal_data.gps_pending()) {
-			switch (cmd()) {
-			case AltosLib.AO_LOG_GPS_LAT:
-			case AltosLib.AO_LOG_GPS_LON:
-			case AltosLib.AO_LOG_GPS_ALT:
-			case AltosLib.AO_LOG_GPS_SAT:
-			case AltosLib.AO_LOG_GPS_DATE:
-				break;
-			default:
-				listener.set_gps(cal_data.temp_gps());
-				cal_data.reset_temp_gps();
-				break;
-			}
-		}
-
 		switch (cmd()) {
 		case AltosLib.AO_LOG_FLIGHT:
 			listener.set_state(AltosLib.ao_flight_pad);
@@ -69,7 +53,7 @@ public class AltosEepromRecordFull extends AltosEepromRecord {
 			listener.set_state(data16(0));
 			break;
 		case AltosLib.AO_LOG_GPS_TIME:
-			gps = cal_data.make_temp_gps(tick(),false);
+			gps = listener.make_temp_gps(false);
 
 			gps.hour = data8(0);
 			gps.minute = data8(1);
@@ -83,29 +67,29 @@ public class AltosEepromRecordFull extends AltosEepromRecord {
 				AltosLib.AO_GPS_NUM_SAT_SHIFT;
 			break;
 		case AltosLib.AO_LOG_GPS_LAT:
-			gps = cal_data.make_temp_gps(tick(),false);
+			gps = listener.make_temp_gps(false);
 
 			int lat32 = data32(0);
 			gps.lat = (double) lat32 / 1e7;
 			break;
 		case AltosLib.AO_LOG_GPS_LON:
-			gps = cal_data.make_temp_gps(tick(),false);
+			gps = listener.make_temp_gps(false);
 
 			int lon32 = data32(0);
 			gps.lon = (double) lon32 / 1e7;
 			break;
 		case AltosLib.AO_LOG_GPS_ALT:
-			gps = cal_data.make_temp_gps(tick(),false);
+			gps = listener.make_temp_gps(false);
 			gps.alt = data16(0);
 			break;
 		case AltosLib.AO_LOG_GPS_SAT:
-			gps = cal_data.make_temp_gps(tick(),true);
+			gps = listener.make_temp_gps(true);
 			int svid = data16(0);
-			int c_n0 = data16(3);
+			int c_n0 = data16(2);
 			gps.add_sat(svid, c_n0);
 			break;
 		case AltosLib.AO_LOG_GPS_DATE:
-			gps = cal_data.make_temp_gps(tick(),false);
+			gps = listener.make_temp_gps(false);
 			gps.year = data8(0) + 2000;
 			gps.month = data8(1);
 			gps.day = data8(2);
@@ -120,11 +104,11 @@ public class AltosEepromRecordFull extends AltosEepromRecord {
 		return new AltosEepromRecordFull(eeprom, s);
 	}
 
-	public AltosEepromRecordFull(AltosEepromNew eeprom, int start) {
+	public AltosEepromRecordFull(AltosEeprom eeprom, int start) {
 		super(eeprom, start, record_length);
 	}
 
-	public AltosEepromRecordFull(AltosEepromNew eeprom) {
+	public AltosEepromRecordFull(AltosEeprom eeprom) {
 		this(eeprom, 0);
 	}
 }