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 fc6833216c8a0ea36d441b1d62d084092e040023..f8e6d7e5a2e16126755d4d7568be479d42445074 100644 (file)
--- 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;