From bc54014cfd4dbca67fa9db66e906ab8212a2eaa2 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Tue, 3 Sep 2013 17:35:23 -0600 Subject: [PATCH] altoslib: Clean up metrum eeprom file reading Spurious tick setting, fix some local variable names Signed-off-by: Keith Packard --- altoslib/AltosEepromMetrum2.java | 12 ++++++------ 1 file 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 read(FileInputStream input) { - LinkedList megas = new LinkedList(); + LinkedList metrums = new LinkedList(); 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; } } -- 2.30.2