X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosEepromMetrum2.java;fp=altoslib%2FAltosEepromMetrum2.java;h=3b49483960bba25e18127c66a6f9218a8d8e47ad;hb=528e2e41112cad8a81bccbb89c3bd202b818a506;hp=5a616e6cd835aeff3cf781f2569a2d64deb7410b;hpb=224a1e01bacb7db0076129906ed58e1c785e1b14;p=fw%2Faltos

diff --git a/altoslib/AltosEepromMetrum2.java b/altoslib/AltosEepromMetrum2.java
index 5a616e6c..3b494839 100644
--- a/altoslib/AltosEepromMetrum2.java
+++ b/altoslib/AltosEepromMetrum2.java
@@ -71,6 +71,8 @@ public class AltosEepromMetrum2 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 AltosEepromMetrum2 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());
@@ -115,13 +114,13 @@ public class AltosEepromMetrum2 extends AltosEeprom {
 
 			break;
 		case AltosLib.AO_LOG_GPS_POS:
-			gps = state.make_temp_gps();
+			gps = state.make_temp_gps(false);
 			gps.lat = latitude() / 1e7;
 			gps.lon = longitude() / 1e7;
 			gps.alt = altitude();
 			break;
 		case AltosLib.AO_LOG_GPS_TIME:
-			gps = state.make_temp_gps();
+			gps = state.make_temp_gps(false);
 
 			gps.hour = hour();
 			gps.minute = minute();
@@ -140,7 +139,7 @@ public class AltosEepromMetrum2 extends AltosEeprom {
 			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++)