X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosEepromMegaIterable.java;h=f0786e123697fee701912f8b67a7c14be1ad5342;hb=218c73b5bd5bd5673dc6f259f62b39541c52d6ff;hp=f62cc45bac38ed3bec280b9cef1d3cd58b9058ef;hpb=6f421818fd7062f03bfaf9e606d6a4cfdcb13b49;p=fw%2Faltos diff --git a/altoslib/AltosEepromMegaIterable.java b/altoslib/AltosEepromMegaIterable.java index f62cc45b..f0786e12 100644 --- a/altoslib/AltosEepromMegaIterable.java +++ b/altoslib/AltosEepromMegaIterable.java @@ -20,8 +20,6 @@ package org.altusmetrum.AltosLib; import java.io.*; import java.util.*; import java.text.*; -import java.util.prefs.*; -import java.util.concurrent.LinkedBlockingQueue; /* * AltosRecords with an index field so they can be sorted by tick while preserving @@ -285,7 +283,7 @@ public class AltosEepromMegaIterable extends AltosRecordIterable { Iterator iterator = records.iterator(); AltosOrderedMegaRecord record = null; AltosRecordMM state = new AltosRecordMM(); - boolean last_reported = false; + //boolean last_reported = false; EepromState eeprom = new EepromState(); state.state = AltosLib.ao_flight_pad; @@ -452,8 +450,6 @@ public class AltosEepromMegaIterable extends AltosRecordIterable { if (line == null) break; AltosOrderedMegaRecord record = new AltosOrderedMegaRecord(line, index++, prev_tick, prev_tick_valid); - if (record == null) - break; if (record.cmd == AltosLib.AO_LOG_INVALID) continue; prev_tick = record.tick;