altoslib: remove AltosRecord based eeprom code

Signed-off-by: Keith Packard <keithp@keithp.com>

6 files changed, 0 insertions, 1514 deletions

diff --git a/altoslib/AltosEepromMetrum.java b/altoslib/AltosEepromMetrum.java
deleted file mode 100644
index 7b2fcb3c..00000000
--- a/altoslib/AltosEepromMetrum.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * Copyright © 2013 Keith Packard <keithp@keithp.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
-
-package org.altusmetrum.altoslib_2;
-
-import java.text.*;
-
-public class AltosEepromMetrum {
-	public int	cmd;
-	public int	tick;
-	public boolean	valid;
-	public String	data;
-	public int	config_a, config_b;
-
-	public int	data8[];
-
-	public static final int	record_length = 16;
-	static final int	header_length = 4;
-	static final int	data_length = record_length - header_length;
-
-	public int record_length() { return record_length; }
-
-	public int data8(int i) {
-		return data8[i];
-	}
-
-	public int data16(int i) {
-		return ((data8[i] | (data8[i+1] << 8)) << 16) >> 16;
-	}
-
-	public int data32(int i) {
-		return data8[i] | (data8[i+1] << 8) | (data8[i+2] << 16) | (data8[i+3] << 24);
-	}
-
-	/* AO_LOG_FLIGHT elements */
-	public int flight() { return data16(0); }
-	public int ground_accel() { return data16(2); }
-	public int ground_pres() { return data32(4); }
-	public int ground_temp() { return data32(8); }
-
-	/* AO_LOG_STATE elements */
-	public int state() { return data16(0); }
-	public int reason() { return data16(2); }
-
-	/* AO_LOG_SENSOR elements */
-	public int pres() { return data32(0); }
-	public int temp() { return data32(4); }
-	public int accel() { return data16(8); }
-
-	/* AO_LOG_TEMP_VOLT elements */
-	public int v_batt() { return data16(0); }
-	public int sense_a() { return data16(2); }
-	public int sense_m() { return data16(4); }
-
-	/* AO_LOG_GPS_POS elements */
-	public int latitude() { return data32(0); }
-	public int longitude() { return data32(4); }
-	public int altitude() { return data16(8); }
-
-	/* AO_LOG_GPS_TIME elements */
-	public int hour() { return data8(0); }
-	public int minute() { return data8(1); }
-	public int second() { return data8(2); }
-	public int flags() { return data8(3); }
-	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 channels() { return data8(0); }
-	public int more() { return data8(1); }
-	public int svid(int n) { return data8(2 + n * 2); }
-	public int c_n(int n) { return data8(2 + n * 2 + 1); }
-
-	public AltosEepromMetrum (AltosEepromChunk chunk, int start) throws ParseException {
-		cmd = chunk.data(start);
-
-		valid = !chunk.erased(start, record_length);
-		if (valid) {
-			if (AltosConvert.checksum(chunk.data, start, record_length) != 0)
-				throw new ParseException(String.format("invalid checksum at 0x%x",
-								       chunk.address + start), 0);
-		} else {
-			cmd = AltosLib.AO_LOG_INVALID;
-		}
-
-		tick = chunk.data16(start+2);
-
-		data8 = new int[data_length];
-		for (int i = 0; i < data_length; i++)
-			data8[i] = chunk.data(start + header_length + i);
-	}
-
-	public AltosEepromMetrum (String line) {
-		valid = false;
-		tick = 0;
-
-		if (line == null) {
-			cmd = AltosLib.AO_LOG_INVALID;
-			line = "";
-		} else {
-			try {
-				String[] tokens = line.split("\\s+");
-
-				if (tokens[0].length() == 1) {
-					if (tokens.length != 2 + data_length) {
-						cmd = AltosLib.AO_LOG_INVALID;
-						data = line;
-					} else {
-						cmd = tokens[0].codePointAt(0);
-						tick = Integer.parseInt(tokens[1],16);
-						valid = true;
-						data8 = new int[data_length];
-						for (int i = 0; i < data_length; i++)
-							data8[i] = Integer.parseInt(tokens[2 + i],16);
-					}
-				} else if (tokens[0].equals("Config") && tokens[1].equals("version:")) {
-					cmd = AltosLib.AO_LOG_CONFIG_VERSION;
-					data = tokens[2];
-				} else if (tokens[0].equals("Main") && tokens[1].equals("deploy:")) {
-					cmd = AltosLib.AO_LOG_MAIN_DEPLOY;
-					config_a = Integer.parseInt(tokens[2]);
-				} else if (tokens[0].equals("Apogee") && tokens[1].equals("delay:")) {
-					cmd = AltosLib.AO_LOG_APOGEE_DELAY;
-					config_a = Integer.parseInt(tokens[2]);
-				} else if (tokens[0].equals("Radio") && tokens[1].equals("channel:")) {
-					cmd = AltosLib.AO_LOG_RADIO_CHANNEL;
-					config_a = Integer.parseInt(tokens[2]);
-				} else if (tokens[0].equals("Callsign:")) {
-					cmd = AltosLib.AO_LOG_CALLSIGN;
-					data = tokens[1].replaceAll("\"","");
-				} else if (tokens[0].equals("Accel") && tokens[1].equals("cal")) {
-					cmd = AltosLib.AO_LOG_ACCEL_CAL;
-					config_a = Integer.parseInt(tokens[3]);
-					config_b = Integer.parseInt(tokens[5]);
-				} else if (tokens[0].equals("Radio") && tokens[1].equals("cal:")) {
-					cmd = AltosLib.AO_LOG_RADIO_CAL;
-					config_a = Integer.parseInt(tokens[2]);
-				} else if (tokens[0].equals("Max") && tokens[1].equals("flight") && tokens[2].equals("log:")) {
-					cmd = AltosLib.AO_LOG_MAX_FLIGHT_LOG;
-					config_a = Integer.parseInt(tokens[3]);
-				} else if (tokens[0].equals("manufacturer")) {
-					cmd = AltosLib.AO_LOG_MANUFACTURER;
-					data = tokens[1];
-				} else if (tokens[0].equals("product")) {
-					cmd = AltosLib.AO_LOG_PRODUCT;
-					data = tokens[1];
-				} else if (tokens[0].equals("serial-number")) {
-					cmd = AltosLib.AO_LOG_SERIAL_NUMBER;
-					config_a = Integer.parseInt(tokens[1]);
-				} else if (tokens[0].equals("log-format")) {
-					cmd = AltosLib.AO_LOG_LOG_FORMAT;
-					config_a = Integer.parseInt(tokens[1]);
-				} else if (tokens[0].equals("software-version")) {
-					cmd = AltosLib.AO_LOG_SOFTWARE_VERSION;
-					data = tokens[1];
-				} else if (tokens[0].equals("ms5607")) {
-					if (tokens[1].equals("reserved:")) {
-						cmd = AltosLib.AO_LOG_BARO_RESERVED;
-						config_a = Integer.parseInt(tokens[2]);
-					} else if (tokens[1].equals("sens:")) {
-						cmd = AltosLib.AO_LOG_BARO_SENS;
-						config_a = Integer.parseInt(tokens[2]);
-					} else if (tokens[1].equals("off:")) {
-						cmd = AltosLib.AO_LOG_BARO_OFF;
-						config_a = Integer.parseInt(tokens[2]);
-					} else if (tokens[1].equals("tcs:")) {
-						cmd = AltosLib.AO_LOG_BARO_TCS;
-						config_a = Integer.parseInt(tokens[2]);
-					} else if (tokens[1].equals("tco:")) {
-						cmd = AltosLib.AO_LOG_BARO_TCO;
-						config_a = Integer.parseInt(tokens[2]);
-					} else if (tokens[1].equals("tref:")) {
-						cmd = AltosLib.AO_LOG_BARO_TREF;
-						config_a = Integer.parseInt(tokens[2]);
-					} else if (tokens[1].equals("tempsens:")) {
-						cmd = AltosLib.AO_LOG_BARO_TEMPSENS;
-						config_a = Integer.parseInt(tokens[2]);
-					} else if (tokens[1].equals("crc:")) {
-						cmd = AltosLib.AO_LOG_BARO_CRC;
-						config_a = Integer.parseInt(tokens[2]);
-					} else {
-						cmd = AltosLib.AO_LOG_INVALID;
-						data = line;
-					}
-				} else {
-					cmd = AltosLib.AO_LOG_INVALID;
-					data = line;
-				}
-			} catch (NumberFormatException ne) {
-				cmd = AltosLib.AO_LOG_INVALID;
-				data = line;
-			}
-		}
-	}
-
-	public AltosEepromMetrum(int in_cmd, int in_tick) {
-		cmd = in_cmd;
-		tick = in_tick;
-		valid = true;
-	}
-}
diff --git a/altoslib/AltosEepromMetrumIterable.java b/altoslib/AltosEepromMetrumIterable.java
deleted file mode 100644
index de4cc919..00000000
--- a/altoslib/AltosEepromMetrumIterable.java
+++ /dev/null
@@ -1,358 +0,0 @@
-/*
- * Copyright © 2013 Keith Packard <keithp@keithp.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
-
-package org.altusmetrum.altoslib_2;
-
-import java.io.*;
-import java.util.*;
-import java.text.*;
-
-public class AltosEepromMetrumIterable extends AltosRecordIterable {
-
-	static final int	seen_flight = 1;
-	static final int	seen_sensor = 2;
-	static final int	seen_temp_volt = 4;
-	static final int	seen_deploy = 8;
-	static final int	seen_gps_time = 16;
-	static final int	seen_gps_lat = 32;
-	static final int	seen_gps_lon = 64;
-
-	static final int	seen_basic = seen_flight|seen_sensor;
-
-	boolean			has_accel;
-	boolean			has_gps;
-	boolean			has_ignite;
-
-	AltosEepromMetrum	flight_record;
-	AltosEepromMetrum	gps_date_record;
-
-	TreeSet<AltosOrderedMetrumRecord>	records;
-
-	AltosMs5607		baro;
-
-	LinkedList<AltosRecord>	list;
-
-	class EepromState {
-		int	seen;
-		int	n_pad_samples;
-		double	ground_pres;
-		int	gps_tick;
-		int	boost_tick;
-		int	sensor_tick;
-
-		EepromState() {
-			seen = 0;
-			n_pad_samples = 0;
-			ground_pres = 0.0;
-			gps_tick = 0;
-		}
-	}
-
-	void update_state(AltosRecordTM2 state, AltosEepromMetrum record, EepromState eeprom) {
-		state.tick = record.tick;
-		switch (record.cmd) {
-		case AltosLib.AO_LOG_FLIGHT:
-			eeprom.seen |= seen_flight;
-			state.ground_accel = record.ground_accel();
-			state.flight_accel = record.ground_accel();
-			state.ground_pres = baro.set(record.ground_pres(), record.ground_temp());
-			state.flight_pres = state.ground_pres;
-			state.flight = record.data16(0);
-			eeprom.boost_tick = record.tick;
-			break;
-		case AltosLib.AO_LOG_STATE:
-			state.state = record.state();
-			break;
-		case AltosLib.AO_LOG_SENSOR:
-			state.accel = record.accel();
-			baro.set(record.pres(), record.temp());
-			state.pres = baro.pa;
-			state.temp = baro.cc;
-			if (state.state < AltosLib.ao_flight_boost) {
-				eeprom.n_pad_samples++;
-				eeprom.ground_pres += state.pres;
-				state.ground_pres = (int) (eeprom.ground_pres / eeprom.n_pad_samples);
-				state.flight_pres = state.ground_pres;
-			} else {
-				state.flight_pres = (state.flight_pres * 15 + state.pres) / 16;
-			}
-			state.flight_accel = (state.flight_accel * 15 + state.accel) / 16;
-			if ((eeprom.seen & seen_sensor) == 0)
-				eeprom.sensor_tick = record.tick - 1;
-			state.flight_vel += (state.accel_plus_g - state.accel) * (record.tick - eeprom.sensor_tick);
-			eeprom.seen |= seen_sensor;
-			eeprom.sensor_tick = record.tick;
-			has_accel = true;
-			break;
-		case AltosLib.AO_LOG_TEMP_VOLT:
-			state.v_batt = record.v_batt();
-			state.sense_a = record.sense_a();
-			state.sense_m = record.sense_m();
-			eeprom.seen |= seen_temp_volt;
-			break;
-		case AltosLib.AO_LOG_GPS_POS:
-			eeprom.gps_tick = state.tick;
-			state.gps = new AltosGPS();
-
-			state.gps.lat = record.latitude() / 1e7;
-			state.gps.lon = record.longitude() / 1e7;
-			state.gps.alt = record.altitude();
-			break;
-
-		case AltosLib.AO_LOG_GPS_TIME:
-			state.gps.year = record.year() + 2000;
-			state.gps.month = record.month();
-			state.gps.day = record.day();
-
-			state.gps.hour = record.hour();
-			state.gps.minute = record.minute();
-			state.gps.second = record.second();
-
-			int flags = record.flags();
-			state.gps.connected = (flags & AltosLib.AO_GPS_RUNNING) != 0;
-			state.gps.locked = (flags & AltosLib.AO_GPS_VALID) != 0;
-			state.gps.nsat = (flags & AltosLib.AO_GPS_NUM_SAT_MASK) >>
-				AltosLib.AO_GPS_NUM_SAT_SHIFT;
-			state.gps_sequence++;
-			has_gps = true;
-			eeprom.seen |= seen_gps_time | seen_gps_lat | seen_gps_lon;
-			break;
-		case AltosLib.AO_LOG_GPS_SAT:
-			if (state.tick == eeprom.gps_tick) {
-				int nsat = record.channels();
-				for (int i = 0; i < nsat; i++)
-					state.gps.add_sat(record.svid(i), record.c_n(i));
-			}
-			break;
-		case AltosLib.AO_LOG_CONFIG_VERSION:
-			break;
-		case AltosLib.AO_LOG_MAIN_DEPLOY:
-			break;
-		case AltosLib.AO_LOG_APOGEE_DELAY:
-			break;
-		case AltosLib.AO_LOG_RADIO_CHANNEL:
-			break;
-		case AltosLib.AO_LOG_CALLSIGN:
-			state.callsign = record.data;
-			break;
-		case AltosLib.AO_LOG_ACCEL_CAL:
-			state.accel_plus_g = record.config_a;
-			state.accel_minus_g = record.config_b;
-			break;
-		case AltosLib.AO_LOG_RADIO_CAL:
-			break;
-		case AltosLib.AO_LOG_MANUFACTURER:
-			break;
-		case AltosLib.AO_LOG_PRODUCT:
-			break;
-		case AltosLib.AO_LOG_SERIAL_NUMBER:
-			state.serial = record.config_a;
-			break;
-		case AltosLib.AO_LOG_SOFTWARE_VERSION:
-			break;
-		case AltosLib.AO_LOG_BARO_RESERVED:
-			baro.reserved = record.config_a;
-			break;
-		case AltosLib.AO_LOG_BARO_SENS:
-			baro.sens =record.config_a;
-			break;
-		case AltosLib.AO_LOG_BARO_OFF:
-			baro.off =record.config_a;
-			break;
-		case AltosLib.AO_LOG_BARO_TCS:
-			baro.tcs =record.config_a;
-			break;
-		case AltosLib.AO_LOG_BARO_TCO:
-			baro.tco =record.config_a;
-			break;
-		case AltosLib.AO_LOG_BARO_TREF:
-			baro.tref =record.config_a;
-			break;
-		case AltosLib.AO_LOG_BARO_TEMPSENS:
-			baro.tempsens =record.config_a;
-			break;
-		case AltosLib.AO_LOG_BARO_CRC:
-			baro.crc =record.config_a;
-			break;
-		}
-		state.seen |= eeprom.seen;
-	}
-
-	LinkedList<AltosRecord> make_list() {
-		LinkedList<AltosRecord>			list = new LinkedList<AltosRecord>();
-		Iterator<AltosOrderedMetrumRecord>	iterator = records.iterator();
-		AltosOrderedMetrumRecord		record = null;
-		AltosRecordTM2				state = new AltosRecordTM2();
-		//boolean				last_reported = false;
-		EepromState				eeprom = new EepromState();
-
-		state.state = AltosLib.ao_flight_pad;
-		state.accel_plus_g = 15758;
-		state.accel_minus_g = 16294;
-
-		/* Pull in static data from the flight and gps_date records */
-		if (flight_record != null)
-			update_state(state, flight_record, eeprom);
-		if (gps_date_record != null)
-			update_state(state, gps_date_record, eeprom);
-
-		while (iterator.hasNext()) {
-			record = iterator.next();
-			if ((eeprom.seen & seen_basic) == seen_basic && record.tick != state.tick) {
-				AltosRecordTM2 r = state.clone();
-				r.time = (r.tick - eeprom.boost_tick) / 100.0;
-				list.add(r);
-			}
-			update_state(state, record, eeprom);
-		}
-		AltosRecordTM2 r = state.clone();
-		r.time = (r.tick - eeprom.boost_tick) / 100.0;
-		list.add(r);
-		return list;
-	}
-
-	public Iterator<AltosRecord> iterator() {
-		if (list == null)
-			list = make_list();
-		return list.iterator();
-	}
-
-	public boolean has_gps() { return has_gps; }
-	public boolean has_accel() { return has_accel; }
-	public boolean has_ignite() { return has_ignite; }
-
-	public void write_comments(PrintStream out) {
-		Iterator<AltosOrderedMetrumRecord>	iterator = records.iterator();
-		out.printf("# Comments\n");
-		while (iterator.hasNext()) {
-			AltosOrderedMetrumRecord	record = iterator.next();
-			switch (record.cmd) {
-			case AltosLib.AO_LOG_CONFIG_VERSION:
-				out.printf("# Config version: %s\n", record.data);
-				break;
-			case AltosLib.AO_LOG_MAIN_DEPLOY:
-				out.printf("# Main deploy: %s\n", record.config_a);
-				break;
-			case AltosLib.AO_LOG_APOGEE_DELAY:
-				out.printf("# Apogee delay: %s\n", record.config_a);
-				break;
-			case AltosLib.AO_LOG_RADIO_CHANNEL:
-				out.printf("# Radio channel: %s\n", record.config_a);
-				break;
-			case AltosLib.AO_LOG_CALLSIGN:
-				out.printf("# Callsign: %s\n", record.data);
-				break;
-			case AltosLib.AO_LOG_ACCEL_CAL:
-				out.printf ("# Accel cal: %d %d\n", record.config_a, record.config_b);
-				break;
-			case AltosLib.AO_LOG_RADIO_CAL:
-				out.printf ("# Radio cal: %d\n", record.config_a);
-				break;
-			case AltosLib.AO_LOG_MAX_FLIGHT_LOG:
-				out.printf ("# Max flight log: %d\n", record.config_a);
-				break;
-			case AltosLib.AO_LOG_MANUFACTURER:
-				out.printf ("# Manufacturer: %s\n", record.data);
-				break;
-			case AltosLib.AO_LOG_PRODUCT:
-				out.printf ("# Product: %s\n", record.data);
-				break;
-			case AltosLib.AO_LOG_SERIAL_NUMBER:
-				out.printf ("# Serial number: %d\n", record.config_a);
-				break;
-			case AltosLib.AO_LOG_SOFTWARE_VERSION:
-				out.printf ("# Software version: %s\n", record.data);
-				break;
-			case AltosLib.AO_LOG_BARO_RESERVED:
-				out.printf ("# Baro reserved: %d\n", record.config_a);
-				break;
-			case AltosLib.AO_LOG_BARO_SENS:
-				out.printf ("# Baro sens: %d\n", record.config_a);
-				break;
-			case AltosLib.AO_LOG_BARO_OFF:
-				out.printf ("# Baro off: %d\n", record.config_a);
-				break;
-			case AltosLib.AO_LOG_BARO_TCS:
-				out.printf ("# Baro tcs: %d\n", record.config_a);
-				break;
-			case AltosLib.AO_LOG_BARO_TCO:
-				out.printf ("# Baro tco: %d\n", record.config_a);
-				break;
-			case AltosLib.AO_LOG_BARO_TREF:
-				out.printf ("# Baro tref: %d\n", record.config_a);
-				break;
-			case AltosLib.AO_LOG_BARO_TEMPSENS:
-				out.printf ("# Baro tempsens: %d\n", record.config_a);
-				break;
-			case AltosLib.AO_LOG_BARO_CRC:
-				out.printf ("# Baro crc: %d\n", record.config_a);
-				break;
-			}
-		}
-	}
-
-	/*
-	 * Read the whole file, dumping records into a RB tree so
-	 * we can enumerate them in time order -- the eeprom data
-	 * are sometimes out of order with GPS data getting timestamps
-	 * matching the first packet out of the GPS unit but not
-	 * written until the final GPS packet has been received.
-	 */
-	public AltosEepromMetrumIterable (FileInputStream input) {
-		records = new TreeSet<AltosOrderedMetrumRecord>();
-
-		AltosOrderedMetrumRecord last_gps_time = null;
-
-		baro = new AltosMs5607();
-
-		int index = 0;
-		int prev_tick = 0;
-		boolean prev_tick_valid = false;
-		boolean missing_time = false;
-
-		try {
-			for (;;) {
-				String line = AltosLib.gets(input);
-				if (line == null)
-					break;
-				AltosOrderedMetrumRecord record = new AltosOrderedMetrumRecord(line, index++, prev_tick, prev_tick_valid);
-				if (record.cmd == AltosLib.AO_LOG_INVALID)
-					continue;
-				prev_tick = record.tick;
-				if (record.cmd < AltosLib.AO_LOG_CONFIG_VERSION)
-					prev_tick_valid = true;
-				if (record.cmd == AltosLib.AO_LOG_FLIGHT) {
-					flight_record = record;
-					continue;
-				}
-
-				records.add(record);
-
-				/* Bail after reading the 'landed' record; we're all done */
-				if (record.cmd == AltosLib.AO_LOG_STATE &&
-				    record.state() == AltosLib.ao_flight_landed)
-					break;
-			}
-		} catch (IOException io) {
-		} catch (ParseException pe) {
-		}
-		try {
-			input.close();
-		} catch (IOException ie) {
-		}
-	}
-}
diff --git a/altoslib/AltosEepromMiniIterable.java b/altoslib/AltosEepromMiniIterable.java
deleted file mode 100644
index 31e667d8..00000000
--- a/altoslib/AltosEepromMiniIterable.java
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
- * Copyright © 2010 Keith Packard <keithp@keithp.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
-
-package org.altusmetrum.altoslib_2;
-
-import java.io.*;
-import java.util.*;
-import java.text.*;
-
-public class AltosEepromMiniIterable implements Iterable<AltosEepromMini> {
-
-	static final int	seen_flight = 1;
-	static final int	seen_sensor = 2;
-
-	static final int	seen_basic = seen_flight|seen_sensor;
-
-	boolean			has_accel;
-	boolean			has_gps;
-	boolean			has_ignite;
-
-	AltosEepromMini	flight_record;
-
-	TreeSet<AltosOrderedMiniRecord>	records;
-
-	AltosMs5607		baro;
-
-	LinkedList<AltosRecord>	list;
-
-	class EepromState {
-		int	seen;
-		int	n_pad_samples;
-		double	ground_pres;
-		int	boost_tick;
-		int	sensor_tick;
-
-		EepromState() {
-			seen = 0;
-			n_pad_samples = 0;
-			ground_pres = 0.0;
-		}
-	}
-
-	void update_state(AltosRecordMini state, AltosEepromMini record, EepromState eeprom) {
-		state.tick = record.tick;
-		switch (record.cmd) {
-		case AltosLib.AO_LOG_FLIGHT:
-			eeprom.seen |= seen_flight;
-			state.ground_pres = record.ground_pres();
-			state.flight_pres = state.ground_pres;
-			state.flight = record.data16(0);
-			eeprom.boost_tick = record.tick;
-			break;
-		case AltosLib.AO_LOG_SENSOR:
-			baro.set(record.pres(), record.temp());
-			state.pres = baro.pa;
-			state.temp = baro.cc;
-			state.sense_m = record.sense_m();
-			state.sense_a = record.sense_a();
-			state.v_batt = record.v_batt();
-			if (state.state < AltosLib.ao_flight_boost) {
-				eeprom.n_pad_samples++;
-				eeprom.ground_pres += state.pres;
-				state.ground_pres = (int) (eeprom.ground_pres / eeprom.n_pad_samples);
-				state.flight_pres = state.ground_pres;
-			} else {
-				state.flight_pres = (state.flight_pres * 15 + state.pres) / 16;
-			}
-			if ((eeprom.seen & seen_sensor) == 0)
-				eeprom.sensor_tick = record.tick - 1;
-			eeprom.seen |= seen_sensor;
-			eeprom.sensor_tick = record.tick;
-			break;
-		case AltosLib.AO_LOG_STATE:
-			state.state = record.state();
-			break;
-		case AltosLib.AO_LOG_CONFIG_VERSION:
-			break;
-		case AltosLib.AO_LOG_MAIN_DEPLOY:
-			break;
-		case AltosLib.AO_LOG_APOGEE_DELAY:
-			break;
-		case AltosLib.AO_LOG_RADIO_CHANNEL:
-			break;
-		case AltosLib.AO_LOG_CALLSIGN:
-			state.callsign = record.data;
-			break;
-		case AltosLib.AO_LOG_RADIO_CAL:
-			break;
-		case AltosLib.AO_LOG_MANUFACTURER:
-			break;
-		case AltosLib.AO_LOG_PRODUCT:
-			break;
-		case AltosLib.AO_LOG_SERIAL_NUMBER:
-			state.serial = record.config_a;
-			break;
-		case AltosLib.AO_LOG_SOFTWARE_VERSION:
-			break;
-		case AltosLib.AO_LOG_BARO_RESERVED:
-			baro.reserved = record.config_a;
-			break;
-		case AltosLib.AO_LOG_BARO_SENS:
-			baro.sens =record.config_a;
-			break;
-		case AltosLib.AO_LOG_BARO_OFF:
-			baro.off =record.config_a;
-			break;
-		case AltosLib.AO_LOG_BARO_TCS:
-			baro.tcs =record.config_a;
-			break;
-		case AltosLib.AO_LOG_BARO_TCO:
-			baro.tco =record.config_a;
-			break;
-		case AltosLib.AO_LOG_BARO_TREF:
-			baro.tref =record.config_a;
-			break;
-		case AltosLib.AO_LOG_BARO_TEMPSENS:
-			baro.tempsens =record.config_a;
-			break;
-		case AltosLib.AO_LOG_BARO_CRC:
-			baro.crc =record.config_a;
-			break;
-		}
-		state.seen |= eeprom.seen;
-	}
-
-	LinkedList<AltosRecord> make_list() {
-		LinkedList<AltosRecord>		list = new LinkedList<AltosRecord>();
-		Iterator<AltosOrderedMiniRecord> iterator = records.iterator();
-		AltosOrderedMiniRecord		record = null;
-		AltosRecordMini			state = new AltosRecordMini();
-		//boolean			last_reported = false;
-		EepromState			eeprom = new EepromState();
-
-		state.state = AltosLib.ao_flight_pad;
-
-		/* Pull in static data from the flight records */
-		if (flight_record != null)
-			update_state(state, flight_record, eeprom);
-
-		while (iterator.hasNext()) {
-			record = iterator.next();
-			if ((eeprom.seen & seen_basic) == seen_basic && record.tick != state.tick) {
-				AltosRecordMini r = state.clone();
-				r.time = (r.tick - eeprom.boost_tick) / 100.0;
-				list.add(r);
-			}
-			update_state(state, record, eeprom);
-		}
-		AltosRecordMini r = state.clone();
-		r.time = (r.tick - eeprom.boost_tick) / 100.0;
-		list.add(r);
-		return list;
-	}
-
-	public Iterator<AltosRecord> iterator() {
-		if (list == null)
-			list = make_list();
-		return list.iterator();
-	}
-
-	public boolean has_gps() { return has_gps; }
-	public boolean has_accel() { return has_accel; }
-	public boolean has_ignite() { return has_ignite; }
-
-	public void write_comments(PrintStream out) {
-		Iterator<AltosOrderedMiniRecord>	iterator = records.iterator();
-		out.printf("# Comments\n");
-		while (iterator.hasNext()) {
-			AltosOrderedMiniRecord	record = iterator.next();
-			switch (record.cmd) {
-			case AltosLib.AO_LOG_CONFIG_VERSION:
-				out.printf("# Config version: %s\n", record.data);
-				break;
-			case AltosLib.AO_LOG_MAIN_DEPLOY:
-				out.printf("# Main deploy: %s\n", record.config_a);
-				break;
-			case AltosLib.AO_LOG_APOGEE_DELAY:
-				out.printf("# Apogee delay: %s\n", record.config_a);
-				break;
-			case AltosLib.AO_LOG_RADIO_CHANNEL:
-				out.printf("# Radio channel: %s\n", record.config_a);
-				break;
-			case AltosLib.AO_LOG_CALLSIGN:
-				out.printf("# Callsign: %s\n", record.data);
-				break;
-			case AltosLib.AO_LOG_ACCEL_CAL:
-				out.printf ("# Accel cal: %d %d\n", record.config_a, record.config_b);
-				break;
-			case AltosLib.AO_LOG_RADIO_CAL:
-				out.printf ("# Radio cal: %d\n", record.config_a);
-				break;
-			case AltosLib.AO_LOG_MAX_FLIGHT_LOG:
-				out.printf ("# Max flight log: %d\n", record.config_a);
-				break;
-			case AltosLib.AO_LOG_MANUFACTURER:
-				out.printf ("# Manufacturer: %s\n", record.data);
-				break;
-			case AltosLib.AO_LOG_PRODUCT:
-				out.printf ("# Product: %s\n", record.data);
-				break;
-			case AltosLib.AO_LOG_SERIAL_NUMBER:
-				out.printf ("# Serial number: %d\n", record.config_a);
-				break;
-			case AltosLib.AO_LOG_SOFTWARE_VERSION:
-				out.printf ("# Software version: %s\n", record.data);
-				break;
-			case AltosLib.AO_LOG_BARO_RESERVED:
-				out.printf ("# Baro reserved: %d\n", record.config_a);
-				break;
-			case AltosLib.AO_LOG_BARO_SENS:
-				out.printf ("# Baro sens: %d\n", record.config_a);
-				break;
-			case AltosLib.AO_LOG_BARO_OFF:
-				out.printf ("# Baro off: %d\n", record.config_a);
-				break;
-			case AltosLib.AO_LOG_BARO_TCS:
-				out.printf ("# Baro tcs: %d\n", record.config_a);
-				break;
-			case AltosLib.AO_LOG_BARO_TCO:
-				out.printf ("# Baro tco: %d\n", record.config_a);
-				break;
-			case AltosLib.AO_LOG_BARO_TREF:
-				out.printf ("# Baro tref: %d\n", record.config_a);
-				break;
-			case AltosLib.AO_LOG_BARO_TEMPSENS:
-				out.printf ("# Baro tempsens: %d\n", record.config_a);
-				break;
-			case AltosLib.AO_LOG_BARO_CRC:
-				out.printf ("# Baro crc: %d\n", record.config_a);
-				break;
-			}
-		}
-	}
-
-	/*
-	 * Read the whole file, dumping records into a RB tree so
-	 * we can enumerate them in time order -- the eeprom data
-	 * are sometimes out of order
-	 */
-	public AltosEepromMiniIterable (FileInputStream input) {
-		records = new TreeSet<AltosOrderedMiniRecord>();
-
-		AltosOrderedMiniRecord last_gps_time = null;
-
-		baro = new AltosMs5607();
-
-		int index = 0;
-		int prev_tick = 0;
-		boolean prev_tick_valid = false;
-		boolean missing_time = false;
-
-		try {
-			for (;;) {
-				String line = AltosLib.gets(input);
-				if (line == null)
-					break;
-				AltosOrderedMiniRecord record = new AltosOrderedMiniRecord(line, index++, prev_tick, prev_tick_valid);
-				if (record.cmd == AltosLib.AO_LOG_INVALID)
-					continue;
-				prev_tick = record.tick;
-				if (record.cmd < AltosLib.AO_LOG_CONFIG_VERSION)
-					prev_tick_valid = true;
-				if (record.cmd == AltosLib.AO_LOG_FLIGHT) {
-					flight_record = record;
-					continue;
-				}
-
-				records.add(record);
-
-				/* Bail after reading the 'landed' record; we're all done */
-				if (record.cmd == AltosLib.AO_LOG_STATE &&
-				    record.state() == AltosLib.ao_flight_landed)
-					break;
-			}
-		} catch (IOException io) {
-		} catch (ParseException pe) {
-		}
-		try {
-			input.close();
-		} catch (IOException ie) {
-		}
-	}
-}
diff --git a/altoslib/AltosEepromOldIterable.java b/altoslib/AltosEepromOldIterable.java
deleted file mode 100644
index 43b2362b..00000000
--- a/altoslib/AltosEepromOldIterable.java
+++ /dev/null
@@ -1,435 +0,0 @@
-/*
- * Copyright © 2010 Keith Packard <keithp@keithp.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
-
-package org.altusmetrum.altoslib_2;
-
-import java.io.*;
-import java.util.*;
-import java.text.*;
-
-public class AltosEepromOldIterable extends AltosRecordIterable {
-
-	static final int	seen_basic = AltosRecord.seen_flight|AltosRecord.seen_sensor;
-
-	boolean			has_accel;
-	boolean			has_gps;
-	boolean			has_ignite;
-
-	AltosEepromRecord	flight_record;
-	AltosEepromRecord	gps_date_record;
-
-	TreeSet<AltosOrderedRecord>	records;
-
-	LinkedList<AltosRecord>	list;
-
-	class EepromState {
-		int	seen;
-		int	n_pad_samples;
-		double	ground_pres;
-		int	gps_tick;
-		int	boost_tick;
-		int	sensor_tick;
-
-		EepromState() {
-			seen = 0;
-			n_pad_samples = 0;
-			ground_pres = 0.0;
-			gps_tick = 0;
-		}
-	}
-
-	void update_state(AltosRecordTM state, AltosEepromRecord record, EepromState eeprom) {
-		state.tick = record.tick;
-		switch (record.cmd) {
-		case AltosLib.AO_LOG_FLIGHT:
-			eeprom.seen |= AltosRecord.seen_flight;
-			state.ground_accel = record.a;
-			state.flight_accel = record.a;
-			state.flight = record.b;
-			eeprom.boost_tick = record.tick;
-			break;
-		case AltosLib.AO_LOG_SENSOR:
-			state.accel = record.a;
-			state.pres = record.b;
-			if (state.state < AltosLib.ao_flight_boost) {
-				eeprom.n_pad_samples++;
-				eeprom.ground_pres += state.pres;
-				state.ground_pres = (int) (eeprom.ground_pres / eeprom.n_pad_samples);
-				state.flight_pres = state.ground_pres;
-			} else {
-				state.flight_pres = (state.flight_pres * 15 + state.pres) / 16;
-			}
-			state.flight_accel = (state.flight_accel * 15 + state.accel) / 16;
-			if ((eeprom.seen & AltosRecord.seen_sensor) == 0)
-				eeprom.sensor_tick = record.tick - 1;
-			state.flight_vel += (state.accel_plus_g - state.accel) * (record.tick - eeprom.sensor_tick);
-			eeprom.seen |= AltosRecord.seen_sensor;
-			eeprom.sensor_tick = record.tick;
-			has_accel = true;
-			break;
-		case AltosLib.AO_LOG_PRESSURE:
-			state.pres = record.b;
-			state.flight_pres = state.pres;
-			if (eeprom.n_pad_samples == 0) {
-				eeprom.n_pad_samples++;
-				state.ground_pres = state.pres;
-			}
-			eeprom.seen |= AltosRecord.seen_sensor;
-			break;
-		case AltosLib.AO_LOG_TEMP_VOLT:
-			state.temp = record.a;
-			state.batt = record.b;
-			eeprom.seen |= AltosRecord.seen_temp_volt;
-			break;
-		case AltosLib.AO_LOG_DEPLOY:
-			state.drogue = record.a;
-			state.main = record.b;
-			eeprom.seen |= AltosRecord.seen_deploy;
-			has_ignite = true;
-			break;
-		case AltosLib.AO_LOG_STATE:
-			state.state = record.a;
-			break;
-		case AltosLib.AO_LOG_GPS_TIME:
-			eeprom.gps_tick = state.tick;
-			eeprom.seen |= AltosRecord.seen_gps_time;
-			AltosGPS old = state.gps;
-			state.gps = new AltosGPS();
-
-			/* GPS date doesn't get repeated through the file */
-			if (old != null) {
-				state.gps.year = old.year;
-				state.gps.month = old.month;
-				state.gps.day = old.day;
-			}
-			state.gps.hour = (record.a & 0xff);
-			state.gps.minute = (record.a >> 8);
-			state.gps.second = (record.b & 0xff);
-
-			int flags = (record.b >> 8);
-			state.gps.connected = (flags & AltosLib.AO_GPS_RUNNING) != 0;
-			state.gps.locked = (flags & AltosLib.AO_GPS_VALID) != 0;
-			state.gps.nsat = (flags & AltosLib.AO_GPS_NUM_SAT_MASK) >>
-				AltosLib.AO_GPS_NUM_SAT_SHIFT;
-			state.gps_sequence++;
-			has_gps = true;
-			break;
-		case AltosLib.AO_LOG_GPS_LAT:
-			eeprom.seen |= AltosRecord.seen_gps_lat;
-			int lat32 = record.a | (record.b << 16);
-			if (state.gps == null)
-				state.gps = new AltosGPS();
-			state.gps.lat = (double) lat32 / 1e7;
-			break;
-		case AltosLib.AO_LOG_GPS_LON:
-			eeprom.seen |= AltosRecord.seen_gps_lon;
-			int lon32 = record.a | (record.b << 16);
-			if (state.gps == null)
-				state.gps = new AltosGPS();
-			state.gps.lon = (double) lon32 / 1e7;
-			break;
-		case AltosLib.AO_LOG_GPS_ALT:
-			if (state.gps == null)
-				state.gps = new AltosGPS();
-			state.gps.alt = record.a;
-			break;
-		case AltosLib.AO_LOG_GPS_SAT:
-			if (state.tick == eeprom.gps_tick) {
-				int svid = record.a;
-				int c_n0 = record.b >> 8;
-				if (state.gps == null)
-					state.gps = new AltosGPS();
-				state.gps.add_sat(svid, c_n0);
-			}
-			break;
-		case AltosLib.AO_LOG_GPS_DATE:
-			if (state.gps == null)
-				state.gps = new AltosGPS();
-			state.gps.year = (record.a & 0xff) + 2000;
-			state.gps.month = record.a >> 8;
-			state.gps.day = record.b & 0xff;
-			break;
-
-		case AltosLib.AO_LOG_CONFIG_VERSION:
-			break;
-		case AltosLib.AO_LOG_MAIN_DEPLOY:
-			break;
-		case AltosLib.AO_LOG_APOGEE_DELAY:
-			break;
-		case AltosLib.AO_LOG_RADIO_CHANNEL:
-			break;
-		case AltosLib.AO_LOG_CALLSIGN:
-			state.callsign = record.data;
-			break;
-		case AltosLib.AO_LOG_ACCEL_CAL:
-			state.accel_plus_g = record.a;
-			state.accel_minus_g = record.b;
-			break;
-		case AltosLib.AO_LOG_RADIO_CAL:
-			break;
-		case AltosLib.AO_LOG_MANUFACTURER:
-			break;
-		case AltosLib.AO_LOG_PRODUCT:
-			break;
-		case AltosLib.AO_LOG_SERIAL_NUMBER:
-			state.serial = record.a;
-			break;
-		case AltosLib.AO_LOG_SOFTWARE_VERSION:
-			break;
-		}
-		state.seen |= eeprom.seen;
-	}
-
-	LinkedList<AltosRecord> make_list() {
-		LinkedList<AltosRecord>		list = new LinkedList<AltosRecord>();
-		Iterator<AltosOrderedRecord>	iterator = records.iterator();
-		AltosOrderedRecord		record = null;
-		AltosRecordTM			state = new AltosRecordTM();
-		//boolean				last_reported = false;
-		EepromState			eeprom = new EepromState();
-
-		state.state = AltosLib.ao_flight_pad;
-		state.accel_plus_g = 15758;
-		state.accel_minus_g = 16294;
-		state.flight_vel = 0;
-
-		/* Pull in static data from the flight and gps_date records */
-		if (flight_record != null)
-			update_state(state, flight_record, eeprom);
-		if (gps_date_record != null)
-			update_state(state, gps_date_record, eeprom);
-
-		while (iterator.hasNext()) {
-			record = iterator.next();
-			if ((eeprom.seen & seen_basic) == seen_basic && record.tick != state.tick) {
-				AltosRecordTM r = state.clone();
-				r.time = (r.tick - eeprom.boost_tick) / 100.0;
-				list.add(r);
-			}
-			update_state(state, record, eeprom);
-		}
-		AltosRecordTM r = state.clone();
-		r.time = (r.tick - eeprom.boost_tick) / 100.0;
-		list.add(r);
-	return list;
-	}
-
-	public Iterator<AltosRecord> iterator() {
-		if (list == null)
-			list = make_list();
-		return list.iterator();
-	}
-
-	public boolean has_gps() { return has_gps; }
-	public boolean has_accel() { return has_accel; }
-	public boolean has_ignite() { return has_ignite; }
-
-	public void write_comments(PrintStream out) {
-		Iterator<AltosOrderedRecord>	iterator = records.iterator();
-		out.printf("# Comments\n");
-		while (iterator.hasNext()) {
-			AltosOrderedRecord	record = iterator.next();
-			switch (record.cmd) {
-			case AltosLib.AO_LOG_CONFIG_VERSION:
-				out.printf("# Config version: %s\n", record.data);
-				break;
-			case AltosLib.AO_LOG_MAIN_DEPLOY:
-				out.printf("# Main deploy: %s\n", record.a);
-				break;
-			case AltosLib.AO_LOG_APOGEE_DELAY:
-				out.printf("# Apogee delay: %s\n", record.a);
-				break;
-			case AltosLib.AO_LOG_RADIO_CHANNEL:
-				out.printf("# Radio channel: %s\n", record.a);
-				break;
-			case AltosLib.AO_LOG_CALLSIGN:
-				out.printf("# Callsign: %s\n", record.data);
-				break;
-			case AltosLib.AO_LOG_ACCEL_CAL:
-				out.printf ("# Accel cal: %d %d\n", record.a, record.b);
-				break;
-			case AltosLib.AO_LOG_RADIO_CAL:
-				out.printf ("# Radio cal: %d\n", record.a);
-				break;
-			case AltosLib.AO_LOG_MAX_FLIGHT_LOG:
-				out.printf ("# Max flight log: %d\n", record.a);
-				break;
-			case AltosLib.AO_LOG_MANUFACTURER:
-				out.printf ("# Manufacturer: %s\n", record.data);
-				break;
-			case AltosLib.AO_LOG_PRODUCT:
-				out.printf ("# Product: %s\n", record.data);
-				break;
-			case AltosLib.AO_LOG_SERIAL_NUMBER:
-				out.printf ("# Serial number: %d\n", record.a);
-				break;
-			case AltosLib.AO_LOG_SOFTWARE_VERSION:
-				out.printf ("# Software version: %s\n", record.data);
-				break;
-			case AltosLib.AO_LOG_BARO_RESERVED:
-				out.printf ("# Baro reserved: %d\n", record.a);
-				break;
-			case AltosLib.AO_LOG_BARO_SENS:
-				out.printf ("# Baro sens: %d\n", record.a);
-				break;
-			case AltosLib.AO_LOG_BARO_OFF:
-				out.printf ("# Baro off: %d\n", record.a);
-				break;
-			case AltosLib.AO_LOG_BARO_TCS:
-				out.printf ("# Baro tcs: %d\n", record.a);
-				break;
-			case AltosLib.AO_LOG_BARO_TCO:
-				out.printf ("# Baro tco: %d\n", record.a);
-				break;
-			case AltosLib.AO_LOG_BARO_TREF:
-				out.printf ("# Baro tref: %d\n", record.a);
-				break;
-			case AltosLib.AO_LOG_BARO_TEMPSENS:
-				out.printf ("# Baro tempsens: %d\n", record.a);
-				break;
-			case AltosLib.AO_LOG_BARO_CRC:
-				out.printf ("# Baro crc: %d\n", record.a);
-				break;
-			}
-		}
-	}
-
-	/*
-	 * Given an AO_LOG_GPS_TIME record with correct time, and one
-	 * missing time, rewrite the missing time values with the good
-	 * ones, assuming that the difference between them is 'diff' seconds
-	 */
-	void update_time(AltosOrderedRecord good, AltosOrderedRecord bad) {
-
-		int diff = (bad.tick - good.tick + 50) / 100;
-
-		int hour = (good.a & 0xff);
-		int minute = (good.a >> 8);
-		int second = (good.b & 0xff);
-		int flags = (good.b >> 8);
-		int seconds = hour * 3600 + minute * 60 + second;
-
-		/* Make sure this looks like a good GPS value */
-		if ((flags & AltosLib.AO_GPS_NUM_SAT_MASK) >> AltosLib.AO_GPS_NUM_SAT_SHIFT < 4)
-			flags = (flags & ~AltosLib.AO_GPS_NUM_SAT_MASK) | (4 << AltosLib.AO_GPS_NUM_SAT_SHIFT);
-		flags |= AltosLib.AO_GPS_RUNNING;
-		flags |= AltosLib.AO_GPS_VALID;
-
-		int new_seconds = seconds + diff;
-		if (new_seconds < 0)
-			new_seconds += 24 * 3600;
-		int new_second = (new_seconds % 60);
-		int new_minutes = (new_seconds / 60);
-		int new_minute = (new_minutes % 60);
-		int new_hours = (new_minutes / 60);
-		int new_hour = (new_hours % 24);
-
-		bad.a = new_hour + (new_minute << 8);
-		bad.b = new_second + (flags << 8);
-	}
-
-	/*
-	 * Read the whole file, dumping records into a RB tree so
-	 * we can enumerate them in time order -- the eeprom data
-	 * are sometimes out of order with GPS data getting timestamps
-	 * matching the first packet out of the GPS unit but not
-	 * written until the final GPS packet has been received.
-	 */
-	public AltosEepromOldIterable (FileInputStream input) {
-		records = new TreeSet<AltosOrderedRecord>();
-
-		AltosOrderedRecord last_gps_time = null;
-
-		int index = 0;
-		int prev_tick = 0;
-		boolean prev_tick_valid = false;
-		boolean missing_time = false;
-
-		try {
-			for (;;) {
-				String line = AltosLib.gets(input);
-				if (line == null)
-					break;
-				AltosOrderedRecord record = new AltosOrderedRecord(line, index++, prev_tick, prev_tick_valid);
-				if (record.cmd == AltosLib.AO_LOG_INVALID)
-					continue;
-				prev_tick = record.tick;
-				if (record.cmd < AltosLib.AO_LOG_CONFIG_VERSION)
-					prev_tick_valid = true;
-				if (record.cmd == AltosLib.AO_LOG_FLIGHT) {
-					flight_record = record;
-					continue;
-				}
-
-				/* Two firmware bugs caused the loss of some GPS data.
-				 * The flight date would never be recorded, and often
-				 * the flight time would get overwritten by another
-				 * record. Detect the loss of the GPS date and fix up the
-				 * missing time records
-				 */
-				if (record.cmd == AltosLib.AO_LOG_GPS_DATE) {
-					gps_date_record = record;
-					continue;
-				}
-
-				/* go back and fix up any missing time values */
-				if (record.cmd == AltosLib.AO_LOG_GPS_TIME) {
-					last_gps_time = record;
-					if (missing_time) {
-						Iterator<AltosOrderedRecord> iterator = records.iterator();
-						while (iterator.hasNext()) {
-							AltosOrderedRecord old = iterator.next();
-							if (old.cmd == AltosLib.AO_LOG_GPS_TIME &&
-							    old.a == -1 && old.b == -1)
-							{
-								update_time(record, old);
-							}
-						}
-						missing_time = false;
-					}
-				}
-
-				if (record.cmd == AltosLib.AO_LOG_GPS_LAT) {
-					if (last_gps_time == null || last_gps_time.tick != record.tick) {
-						AltosOrderedRecord add_gps_time = new AltosOrderedRecord(AltosLib.AO_LOG_GPS_TIME,
-													 record.tick,
-													 -1, -1, index-1);
-						if (last_gps_time != null)
-							update_time(last_gps_time, add_gps_time);
-						else
-							missing_time = true;
-
-						records.add(add_gps_time);
-						record.index = index++;
-					}
-				}
-				records.add(record);
-
-				/* Bail after reading the 'landed' record; we're all done */
-				if (record.cmd == AltosLib.AO_LOG_STATE &&
-				    record.a == AltosLib.ao_flight_landed)
-					break;
-			}
-		} catch (IOException io) {
-		} catch (ParseException pe) {
-		}
-		try {
-			input.close();
-		} catch (IOException ie) {
-		}
-	}
-}
diff --git a/altoslib/AltosOrderedMetrumRecord.java b/altoslib/AltosOrderedMetrumRecord.java
deleted file mode 100644
index cc034bff..00000000
--- a/altoslib/AltosOrderedMetrumRecord.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright © 2013 Keith Packard <keithp@keithp.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
-
-package org.altusmetrum.altoslib_2;
-
-import java.text.ParseException;
-
-/*
- * AltosRecords with an index field so they can be sorted by tick while preserving
- * the original ordering for elements with matching ticks
- */
-class AltosOrderedMetrumRecord extends AltosEepromMetrum implements Comparable<AltosOrderedMetrumRecord> {
-
-	public int	index;
-
-	public AltosOrderedMetrumRecord(String line, int in_index, int prev_tick, boolean prev_tick_valid)
-		throws ParseException {
-		super(line);
-		if (prev_tick_valid) {
-			tick |= (prev_tick & ~0xffff);
-			if (tick < prev_tick) {
-				if (prev_tick - tick > 0x8000)
-					tick += 0x10000;
-			} else {
-				if (tick - prev_tick > 0x8000)
-					tick -= 0x10000;
-			}
-		}
-		index = in_index;
-	}
-
-	public int compareTo(AltosOrderedMetrumRecord o) {
-		int	tick_diff = tick - o.tick;
-		if (tick_diff != 0)
-			return tick_diff;
-		return index - o.index;
-	}
-}
diff --git a/altoslib/AltosRecordTM2.java b/altoslib/AltosRecordTM2.java
deleted file mode 100644
index da2d948c..00000000
--- a/altoslib/AltosRecordTM2.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Copyright © 2012 Keith Packard <keithp@keithp.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
-
-package org.altusmetrum.altoslib_2;
-
-public class AltosRecordTM2 extends AltosRecord {
-
-	/* Sensor values */
-	public int	accel;
-	public int	pres;
-	public int	temp;
-	
-	public int	v_batt;
-	public int	sense_a;
-	public int	sense_m;
-
-	public int      ground_accel;
-	public int      ground_pres;
-	public int      accel_plus_g;
-	public int      accel_minus_g;
-
-	public int	flight_accel;
-	public int	flight_vel;
-	public int	flight_pres;
-
-	static double adc(int raw) {
-		return raw / 4095.0;
-	}
-
-	public double pressure() {
-		if (pres != MISSING)
-			return pres;
-		return MISSING;
-	}
-
-	public double ground_pressure() {
-		if (ground_pres != MISSING)
-			return ground_pres;
-		return MISSING;
-	}
-
-	public double battery_voltage() {
-		if (v_batt != MISSING)
-			return 3.3 * adc(v_batt) * (15.0 + 27.0) / 27.0;
-		return MISSING;
-	}
-
-	static double pyro(int raw) {
-		if (raw != MISSING)
-			return 3.3 * adc(raw) * (100.0 + 27.0) / 27.0;
-		return MISSING;
-	}
-
-	public double main_voltage() {
-		return pyro(sense_m);
-	}
-
-	public double drogue_voltage() {
-		return pyro(sense_a);
-	}
-
-	public double temperature() {
-		if (temp != MISSING)
-			return temp / 100.0;
-		return MISSING;
-	}
-	
-	double accel_counts_per_mss() {
-		double	counts_per_g = Math.abs(accel_minus_g - accel_plus_g) / 2;
-
-		return counts_per_g / 9.80665;
-	}
-
-	public double acceleration() {
-		if (ground_accel == MISSING || accel == MISSING)
-			return MISSING;
-
-		if (accel_minus_g == MISSING || accel_plus_g == MISSING)
-			return MISSING;
-
-		return (ground_accel - accel) / accel_counts_per_mss();
-	}
-
-	public void copy (AltosRecordTM2 old) {
-		super.copy(old);
-
-		accel = old.accel;
-		pres = old.pres;
-		temp = old.temp;
-
-		v_batt = old.v_batt;
-		sense_a = old.sense_a;
-		sense_m = old.sense_m;
-
-		ground_accel = old.ground_accel;
-		ground_pres = old.ground_pres;
-		accel_plus_g = old.accel_plus_g;
-		accel_minus_g = old.accel_minus_g;
-		
-		flight_accel = old.flight_accel;
-		flight_vel = old.flight_vel;
-		flight_pres = old.flight_pres;
-	}
-
-	public AltosRecordTM2 clone() {
-		return new AltosRecordTM2(this);
-	}
-
-	void make_missing() {
-
-		accel = MISSING;
-		pres = MISSING;
-		temp = MISSING;
-
-		v_batt = MISSING;
-		sense_a = MISSING;
-		sense_m = MISSING;
-
-		ground_accel = MISSING;
-		ground_pres = MISSING;
-		accel_plus_g = MISSING;
-		accel_minus_g = MISSING;
-
-		flight_accel = 0;
-		flight_vel = 0;
-		flight_pres = 0;
-	}
-
-	public AltosRecordTM2(AltosRecord old) {
-		super.copy(old);
-		make_missing();
-	}
-
-	public AltosRecordTM2(AltosRecordTM2 old) {
-		copy(old);
-	}
-
-	public AltosRecordTM2() {
-		super();
-		make_missing();
-	}
-}