altos: Use installed pdclib

[fw/altos] / altoslib / AltosEepromMega.java

diff --git a/altoslib/AltosEepromMega.java b/altoslib/AltosEepromMega.java
index e8f9b1fc585af7ff71af6be8a8b65933fb8ac240..7a4ee52d10680e1e61c3289bb029a12e079b444c 100644 (file)
--- a/altoslib/AltosEepromMega.java
+++ b/altoslib/AltosEepromMega.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_1;
+package org.altusmetrum.altoslib_2;
 
 import java.io.*;
 import java.util.*;
@@ -79,6 +79,8 @@ public class AltosEepromMega extends AltosEeprom {
        }
 
        public void update_state(AltosState state) {
+               super.update_state(state);
+
                AltosGPS        gps;
 
                /* Flush any pending GPS changes */
@@ -149,7 +151,7 @@ public class AltosEepromMega extends AltosEeprom {
                        break;
                case AltosLib.AO_LOG_GPS_TIME:
                        state.set_tick(tick);
-                       gps = state.make_temp_gps();
+                       gps = state.make_temp_gps(false);
                        gps.lat = latitude() / 1e7;
                        gps.lon = longitude() / 1e7;
                        gps.alt = altitude();
@@ -165,13 +167,13 @@ public class AltosEepromMega extends AltosEeprom {
                        gps.nsat = (flags & AltosLib.AO_GPS_NUM_SAT_MASK) >>
                                AltosLib.AO_GPS_NUM_SAT_SHIFT;
 
-                       gps.year = year();
+                       gps.year = 2000 + year();
                        gps.month = month();
                        gps.day = day();
                        break;
                case AltosLib.AO_LOG_GPS_SAT:
                        state.set_tick(tick);
-                       gps = state.make_temp_gps();
+                       gps = state.make_temp_gps(true);
 
                        int n = nsat();
                        for (int i = 0; i < n; i++)