X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=altoslib%2FAltosEepromRecord.java;h=12519e6b91c1b47beff90c731765e9646c4b9ec1;hb=10834eb60f7a44fee159d9e9ad5ffb2e013fe9cf;hp=7dd3759233d888b12a989e5c8bd9cc4761fe35c8;hpb=222158581887b5f9e8b9843d14321c313fa023fa;p=fw%2Faltos

diff --git a/altoslib/AltosEepromRecord.java b/altoslib/AltosEepromRecord.java
index 7dd37592..12519e6b 100644
--- a/altoslib/AltosEepromRecord.java
+++ b/altoslib/AltosEepromRecord.java
@@ -12,11 +12,11 @@
  * General Public License for more details.
  */
 
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_12;
 
 public abstract class AltosEepromRecord implements Comparable<AltosEepromRecord> {
 
-	AltosEepromNew		eeprom;
+	AltosEeprom		eeprom;
 
 	int			wide_tick;
 
@@ -74,7 +74,7 @@ public abstract class AltosEepromRecord implements Comparable<AltosEepromRecord>
 		if (cmd_diff != 0)
 			return cmd_diff;
 
-		int	tick_diff = tick() - o.tick();
+		int	tick_diff = wide_tick - o.wide_tick;
 
 		if (tick_diff != 0)
 			return tick_diff;
@@ -83,10 +83,17 @@ public abstract class AltosEepromRecord implements Comparable<AltosEepromRecord>
 
 	/* AltosDataProvider */
 	public void provide_data(AltosDataListener listener, AltosCalData cal_data) {
-		cal_data.set_tick(tick());
+		listener.set_tick(tick());
 		if (cmd() == AltosLib.AO_LOG_FLIGHT)
 			cal_data.set_boost_tick();
 		listener.set_time(cal_data.time());
+
+		/* Flush any pending GPS changes */
+		if (!AltosLib.is_gps_cmd(cmd())) {
+			AltosGPS gps = listener.temp_gps();
+			if (gps != null)
+				listener.set_gps(gps);
+		}
 	}
 
 	public int next_start() {
@@ -106,7 +113,7 @@ public abstract class AltosEepromRecord implements Comparable<AltosEepromRecord>
 
 	public abstract AltosEepromRecord next();
 
-	public AltosEepromRecord(AltosEepromNew eeprom, int start, int length) {
+	public AltosEepromRecord(AltosEeprom eeprom, int start, int length) {
 		this.eeprom = eeprom;
 		this.start = start;
 		this.length = length;