diff options
| author | Keith Packard <keithp@keithp.com> | 2013-09-03 17:35:23 -0600 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2013-09-03 17:35:23 -0600 |
| commit | bc54014cfd4dbca67fa9db66e906ab8212a2eaa2 (patch) | |
| tree | 9ed3d0d9136e4779d92ac8354435c4a4d653494f | |
| parent | d203a2da2641bec21a4257c8a7b03d9a1eba53a5 (diff) | |
altoslib: Clean up metrum eeprom file reading
Spurious tick setting, fix some local variable names
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | altoslib/AltosEepromMetrum2.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/altoslib/AltosEepromMetrum2.java b/altoslib/AltosEepromMetrum2.java index f96713a1..ea38edf2 100644 --- a/altoslib/AltosEepromMetrum2.java +++ b/altoslib/AltosEepromMetrum2.java @@ -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; } } |