From: Anthony Towns <aj@erisian.com.au>
Date: Sun, 21 Nov 2010 06:08:37 +0000 (+1000)
Subject: Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox
X-Git-Tag: debian/0.7.1+168+gcb08bc2~15^2~25
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=ec47bc93a487614714a752cb30ec9fe3d8f72929;hp=0393830f85da5efc96bbdf0d9769b66019c34b33

Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox
---

diff --git a/ao-tools/altosui/AltosEepromIterable.java b/ao-tools/altosui/AltosEepromIterable.java
index fc683321..f8e6d7e5 100644
--- a/ao-tools/altosui/AltosEepromIterable.java
+++ b/ao-tools/altosui/AltosEepromIterable.java
@@ -309,6 +309,12 @@ public class AltosEepromIterable extends AltosRecordIterable {
 		int flags = (good.b >> 8);
 		int seconds = hour * 3600 + minute * 60 + second;
 
+		/* Make sure this looks like a good GPS value */
+		if ((flags & Altos.AO_GPS_NUM_SAT_MASK) >> Altos.AO_GPS_NUM_SAT_SHIFT < 4)
+			flags = (flags & ~Altos.AO_GPS_NUM_SAT_MASK) | (4 << Altos.AO_GPS_NUM_SAT_SHIFT);
+		flags |= Altos.AO_GPS_RUNNING;
+		flags |= Altos.AO_GPS_VALID;
+
 		int new_seconds = seconds + diff;
 		if (new_seconds < 0)
 			new_seconds += 24 * 3600;