X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosEepromRecordMetrum.java;h=888a06cca2fbe02316525f6a01f7e10428ee4168;hp=97a1103d6cc4828f70521c69fd1066ed455e6f57;hb=10834eb60f7a44fee159d9e9ad5ffb2e013fe9cf;hpb=f26cfe417c6977cf1e7e75a4f050e25f64d41859

diff --git a/altoslib/AltosEepromRecordMetrum.java b/altoslib/AltosEepromRecordMetrum.java
index 97a1103d..888a06cc 100644
--- a/altoslib/AltosEepromRecordMetrum.java
+++ b/altoslib/AltosEepromRecordMetrum.java
@@ -16,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_12;
 
 public class AltosEepromRecordMetrum extends AltosEepromRecord {
 	public static final int	record_length = 16;
@@ -70,23 +70,6 @@ public class AltosEepromRecordMetrum extends AltosEepromRecord {
 
 		AltosGPS	gps;
 
-		/* Flush any pending GPS changes */
-		if (cal_data.gps_pending()) {
-			switch (cmd()) {
-			case AltosLib.AO_LOG_GPS_POS:
-			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:
 			cal_data.set_flight(flight());
@@ -108,7 +91,7 @@ public class AltosEepromRecordMetrum extends AltosEepromRecord {
 			listener.set_main_voltage(AltosConvert.mega_pyro_voltage(sense_m()));
 			break;
 		case AltosLib.AO_LOG_GPS_POS:
-			gps = cal_data.make_temp_gps(tick(), false);
+			gps = listener.make_temp_gps(false);
 			gps.lat = latitude() / 1e7;
 			gps.lon = longitude() / 1e7;
 			if (config_data().altitude_32())
@@ -117,7 +100,7 @@ public class AltosEepromRecordMetrum extends AltosEepromRecord {
 				gps.alt = altitude_low();
 			break;
 		case AltosLib.AO_LOG_GPS_TIME:
-			gps = cal_data.make_temp_gps(tick(), false);
+			gps = listener.make_temp_gps(false);
 
 			gps.hour = hour();
 			gps.minute = minute();
@@ -136,7 +119,7 @@ public class AltosEepromRecordMetrum extends AltosEepromRecord {
 			gps.pdop = pdop() / 10.0;
 			break;
 		case AltosLib.AO_LOG_GPS_SAT:
-			gps = cal_data.make_temp_gps(tick(), true);
+			gps = listener.make_temp_gps(true);
 
 			int n = nsat();
 			for (int i = 0; i < n; i++)
@@ -152,11 +135,11 @@ public class AltosEepromRecordMetrum extends AltosEepromRecord {
 		return new AltosEepromRecordMetrum(eeprom, s);
 	}
 
-	public AltosEepromRecordMetrum(AltosEepromNew eeprom, int start) {
+	public AltosEepromRecordMetrum(AltosEeprom eeprom, int start) {
 		super(eeprom, start, record_length);
 	}
 
-	public AltosEepromRecordMetrum(AltosEepromNew eeprom) {
+	public AltosEepromRecordMetrum(AltosEeprom eeprom) {
 		this(eeprom, 0);
 	}
 }