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

diff --git a/altoslib/AltosEepromRecordFull.java b/altoslib/AltosEepromRecordFull.java
index b4968220..32df9578 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_12;
 
 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);
@@ -101,7 +85,7 @@ public class AltosEepromRecordFull extends AltosEepromRecord {
 		case AltosLib.AO_LOG_GPS_SAT:
 			gps = cal_data.make_temp_gps(tick(),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:
@@ -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);
 	}
 }