X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosEepromMetrum2.java;h=d13aac42863d5b2e8f8bdc718682d65c0ed95aa5;hp=f96713a1695b9dabbbf2cd89ad8f5c37c8ed8e5f;hb=9e18c524fa2d1f648f265b3c3105f5ceacf06c10;hpb=d203a2da2641bec21a4257c8a7b03d9a1eba53a5

diff --git a/altoslib/AltosEepromMetrum2.java b/altoslib/AltosEepromMetrum2.java
index f96713a1..d13aac42 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_3;
 
 import java.io.*;
 import java.util.*;
@@ -59,7 +59,7 @@ public class AltosEepromMetrum2 extends AltosEeprom {
 	public int year() { return data8(4); }
 	public int month() { return data8(5); }
 	public int day() { return data8(6); }
-	
+
 	/* AO_LOG_GPS_SAT elements */
 	public int nsat() { return data8(0); }
 	public int more() { return data8(1); }
@@ -138,7 +138,6 @@ public class AltosEepromMetrum2 extends AltosEeprom {
 			gps.day = day();
 			break;
 		case AltosLib.AO_LOG_GPS_SAT:
-			state.set_tick(tick);
 			gps = state.make_temp_gps(true);
 
 			int n = nsat();
@@ -153,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 {
@@ -161,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");
 				}
@@ -172,6 +172,6 @@ public class AltosEepromMetrum2 extends AltosEeprom {
 			}
 		}
 
-		return megas;
+		return metrums;
 	}
 }