altoslib: Finish AltosState changes. Update version number.

[fw/altos] / altoslib / AltosEepromGPS.java

diff --git a/altoslib/AltosEepromGPS.java b/altoslib/AltosEepromGPS.java
index d8e47a6ef71f8e074c48c06689f0135ee2890fb2..43ed3392c2fa8b27c9a37ae6d49c8abc6c20778c 100644 (file)
--- a/altoslib/AltosEepromGPS.java
+++ b/altoslib/AltosEepromGPS.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.*;
@@ -71,6 +71,8 @@ public class AltosEepromGPS extends AltosEeprom {
        }
 
        public void update_state(AltosState state) {
+               super.update_state(state);
+
                AltosGPS        gps;
 
                /* Flush any pending GPS changes */
@@ -89,11 +91,8 @@ public class AltosEepromGPS extends AltosEeprom {
                        }
                }
 
-               if (cmd != AltosLib.AO_LOG_FLIGHT)
-                       state.set_tick(tick);
                switch (cmd) {
                case AltosLib.AO_LOG_FLIGHT:
-                       state.set_boost_tick(tick);
                        state.set_flight(flight());
                        state.set_ground_accel(ground_accel());
                        state.set_ground_pressure(ground_pres());
@@ -139,7 +138,6 @@ public class AltosEepromGPS extends AltosEeprom {
                        gps.day = day();
                        break;
                case AltosLib.AO_LOG_GPS_SAT:
-                       state.set_tick(tick);
                        gps = state.make_temp_gps();
 
                        int n = nsat();