X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosEepromMetrum2.java;h=c1d62c0c7663fd8c64bdb078657dc3e0fe40512e;hp=5a616e6cd835aeff3cf781f2569a2d64deb7410b;hb=9d8da4ef325171960e16fc027c6039cb63eae942;hpb=77dc89ed5b7bf8f5b3fa3b6131660f1a98f583ea

diff --git a/altoslib/AltosEepromMetrum2.java b/altoslib/AltosEepromMetrum2.java
index 5a616e6c..c1d62c0c 100644
--- a/altoslib/AltosEepromMetrum2.java
+++ b/altoslib/AltosEepromMetrum2.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 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();
@@ -134,13 +133,12 @@ public class AltosEepromMetrum2 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++)
@@ -154,7 +152,7 @@ public class AltosEepromMetrum2 extends AltosEeprom {
 	}
 
 	static public LinkedList<AltosEeprom> read(FileInputStream input) {
-		LinkedList<AltosEeprom> megas = new LinkedList<AltosEeprom>();
+		LinkedList<AltosEeprom> metrums = new LinkedList<AltosEeprom>();
 
 		for (;;) {
 			try {
@@ -162,9 +160,10 @@ public class AltosEepromMetrum2 extends AltosEeprom {
 				if (line == null)
 					break;
 				try {
-					AltosEepromMetrum2 mega = new AltosEepromMetrum2(line);
-					if (mega.cmd != AltosLib.AO_LOG_INVALID)
-						megas.add(mega);
+					AltosEepromMetrum2 metrum = new AltosEepromMetrum2(line);
+					
+					if (metrum.cmd != AltosLib.AO_LOG_INVALID)
+						metrums.add(metrum);
 				} catch (Exception e) {
 					System.out.printf ("exception\n");
 				}
@@ -173,6 +172,6 @@ public class AltosEepromMetrum2 extends AltosEeprom {
 			}
 		}
 
-		return megas;
+		return metrums;
 	}
 }