altoslib: Use GPS seconds as an additional sort key for TeleGPS eeprom

Long idle periods with TeleGPS can easily overflow 16 bits of tick
count. Using the GPS seconds provides an additional sort which will
span the tick wrap-around.

Signed-off-by: Keith Packard <keithp@keithp.com>

1 files changed, 8 insertions, 1 deletions

diff --git a/altoslib/AltosEepromIterable.java b/altoslib/AltosEepromIterable.java
index 415c5b62..d6832c1b 100644
--- a/altoslib/AltosEepromIterable.java
+++ b/altoslib/AltosEepromIterable.java
@@ -38,6 +38,13 @@ class AltosEepromOrdered implements Comparable<AltosEepromOrdered> {
 		if (cmd_diff != 0)
 			return cmd_diff;
 
+		if (eeprom.has_seconds() && o.eeprom.has_seconds()) {
+			int	seconds_diff = eeprom.seconds() - o.eeprom.seconds();
+
+			if (seconds_diff != 0)
+				return seconds_diff;
+		}
+
 		int	tick_diff = tick - o.tick;
 
 		if (tick_diff != 0)
@@ -116,4 +123,4 @@ public class AltosEepromIterable implements Iterable<AltosEeprom> {
 			eeproms = new LinkedList<AltosEeprom>();
 		return new AltosEepromOrderedIterator(eeproms);
 	}
-}
\ No newline at end of file
+}