X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosEepromIterable.java;h=7c7522710245f0955dd4b9388c6167eb29835742;hb=bbbe1846346b4ba61330f535a12b7a5029877ee6;hp=f1397c7bf5430136e92c6f241cdfa9c2ff6ae739;hpb=69e6df07976a56b49e07c242cd6e5b2cbd2a578d;p=fw%2Faltos

diff --git a/altoslib/AltosEepromIterable.java b/altoslib/AltosEepromIterable.java
index f1397c7b..7c752271 100644
--- a/altoslib/AltosEepromIterable.java
+++ b/altoslib/AltosEepromIterable.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
@@ -104,7 +102,7 @@ public class AltosEepromIterable extends AltosRecordIterable {
 		}
 	}
 
-	void update_state(AltosRecord state, AltosEepromRecord record, EepromState eeprom) {
+	void update_state(AltosRecordTM state, AltosEepromRecord record, EepromState eeprom) {
 		state.tick = record.tick;
 		switch (record.cmd) {
 		case AltosLib.AO_LOG_FLIGHT:
@@ -237,8 +235,8 @@ public class AltosEepromIterable extends AltosRecordIterable {
 		LinkedList<AltosRecord>		list = new LinkedList<AltosRecord>();
 		Iterator<AltosOrderedRecord>	iterator = records.iterator();
 		AltosOrderedRecord		record = null;
-		AltosRecord			state = new AltosRecord();
-		boolean				last_reported = false;
+		AltosRecordTM			state = new AltosRecordTM();
+		//boolean				last_reported = false;
 		EepromState			eeprom = new EepromState();
 
 		state.state = AltosLib.ao_flight_pad;
@@ -254,13 +252,13 @@ public class AltosEepromIterable extends AltosRecordIterable {
 		while (iterator.hasNext()) {
 			record = iterator.next();
 			if ((eeprom.seen & seen_basic) == seen_basic && record.tick != state.tick) {
-				AltosRecord r = new AltosRecord(state);
+				AltosRecordTM r = state.clone();
 				r.time = (r.tick - eeprom.boost_tick) / 100.0;
 				list.add(r);
 			}
 			update_state(state, record, eeprom);
 		}
-		AltosRecord r = new AltosRecord(state);
+		AltosRecordTM r = state.clone();
 		r.time = (r.tick - eeprom.boost_tick) / 100.0;
 		list.add(r);
 	return list;
@@ -318,28 +316,28 @@ public class AltosEepromIterable extends AltosRecordIterable {
 			case AltosLib.AO_LOG_SOFTWARE_VERSION:
 				out.printf ("# Software version: %s\n", record.data);
 				break;
-			case Altos.AO_LOG_BARO_RESERVED:
+			case AltosLib.AO_LOG_BARO_RESERVED:
 				out.printf ("# Baro reserved: %d\n", record.a);
 				break;
-			case Altos.AO_LOG_BARO_SENS:
+			case AltosLib.AO_LOG_BARO_SENS:
 				out.printf ("# Baro sens: %d\n", record.a);
 				break;
-			case Altos.AO_LOG_BARO_OFF:
+			case AltosLib.AO_LOG_BARO_OFF:
 				out.printf ("# Baro off: %d\n", record.a);
 				break;
-			case Altos.AO_LOG_BARO_TCS:
+			case AltosLib.AO_LOG_BARO_TCS:
 				out.printf ("# Baro tcs: %d\n", record.a);
 				break;
-			case Altos.AO_LOG_BARO_TCO:
+			case AltosLib.AO_LOG_BARO_TCO:
 				out.printf ("# Baro tco: %d\n", record.a);
 				break;
-			case Altos.AO_LOG_BARO_TREF:
+			case AltosLib.AO_LOG_BARO_TREF:
 				out.printf ("# Baro tref: %d\n", record.a);
 				break;
-			case Altos.AO_LOG_BARO_TEMPSENS:
+			case AltosLib.AO_LOG_BARO_TEMPSENS:
 				out.printf ("# Baro tempsens: %d\n", record.a);
 				break;
-			case Altos.AO_LOG_BARO_CRC:
+			case AltosLib.AO_LOG_BARO_CRC:
 				out.printf ("# Baro crc: %d\n", record.a);
 				break;
 			}
@@ -399,12 +397,10 @@ public class AltosEepromIterable extends AltosRecordIterable {
 
 		try {
 			for (;;) {
-				String line = AltosRecord.gets(input);
+				String line = AltosLib.gets(input);
 				if (line == null)
 					break;
 				AltosOrderedRecord record = new AltosOrderedRecord(line, index++, prev_tick, prev_tick_valid);
-				if (record == null)
-					break;
 				if (record.cmd == AltosLib.AO_LOG_INVALID)
 					continue;
 				prev_tick = record.tick;