altoslib: Clean up random rebase failures

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

3 files changed, 0 insertions, 73 deletions

diff --git a/altosui/Altos.java b/altosui/Altos.java
index 380796cc..334ddb07 100644
--- a/altosui/Altos.java
+++ b/altosui/Altos.java
@@ -28,73 +28,6 @@ import org.altusmetrum.AltosLib.*;
 
 public class Altos extends AltosLib {
 
-	/* Added for header fields in eeprom files */
-	static final int AO_LOG_CONFIG_VERSION = 1000;
-	static final int AO_LOG_MAIN_DEPLOY = 1001;
-	static final int AO_LOG_APOGEE_DELAY = 1002;
-	static final int AO_LOG_RADIO_CHANNEL = 1003;
-	static final int AO_LOG_CALLSIGN = 1004;
-	static final int AO_LOG_ACCEL_CAL = 1005;
-	static final int AO_LOG_RADIO_CAL = 1006;
-	static final int AO_LOG_MAX_FLIGHT_LOG = 1007;
-	static final int AO_LOG_MANUFACTURER = 2000;
-	static final int AO_LOG_PRODUCT = 2001;
-	static final int AO_LOG_SERIAL_NUMBER = 2002;
-	static final int AO_LOG_LOG_FORMAT = 2003;
-
-	/* Added for header fields in megametrum files */
-	static final int AO_LOG_BARO_RESERVED = 3000;
-	static final int AO_LOG_BARO_SENS = 3001;
-	static final int AO_LOG_BARO_OFF = 3002;
-	static final int AO_LOG_BARO_TCS = 3004;
-	static final int AO_LOG_BARO_TCO = 3005;
-	static final int AO_LOG_BARO_TREF = 3006;
-	static final int AO_LOG_BARO_TEMPSENS = 3007;
-	static final int AO_LOG_BARO_CRC = 3008;
-
-	static final int AO_LOG_SOFTWARE_VERSION = 9999;
-
-	/* Added to flag invalid records */
-	static final int AO_LOG_INVALID = -1;
-
-	/* Flight state numbers and names */
-	static final int ao_flight_startup = 0;
-	static final int ao_flight_idle = 1;
-	static final int ao_flight_pad = 2;
-	static final int ao_flight_boost = 3;
-	static final int ao_flight_fast = 4;
-	static final int ao_flight_coast = 5;
-	static final int ao_flight_drogue = 6;
-	static final int ao_flight_main = 7;
-	static final int ao_flight_landed = 8;
-	static final int ao_flight_invalid = 9;
-
-	/* Telemetry modes */
-	static final int ao_telemetry_off = 0;
-	static final int ao_telemetry_min = 1;
-	static final int ao_telemetry_standard = 1;
-	static final int ao_telemetry_0_9 = 2;
-	static final int ao_telemetry_0_8 = 3;
-	static final int ao_telemetry_max = 3;
-
-	static final String[] ao_telemetry_name = {
-		"Off", "Standard Telemetry", "TeleMetrum v0.9", "TeleMetrum v0.8"
-	};
-
-	static final String launch_sites_url = "http://www.altusmetrum.org/AltOS/launch-sites.txt";
-
-	static final int ao_telemetry_standard_len = 32;
-	static final int ao_telemetry_0_9_len = 95;
-	static final int ao_telemetry_0_8_len = 94;
-
-	static final int[] ao_telemetry_len = {
-		0, 32, 95, 94
-	};
-
-	static HashMap<String,Integer>	string_to_state = new HashMap<String,Integer>();
-
-	static boolean map_initialized = false;
-
 	static final int tab_elt_pad = 5;
 
 	static Font label_font;
diff --git a/altosui/AltosSerial.java b/altosui/AltosSerial.java
index 54cdcba7..3abdb645 100644
--- a/altosui/AltosSerial.java
+++ b/altosui/AltosSerial.java
@@ -264,7 +264,6 @@ public class AltosSerial extends AltosLink implements Runnable {
 		flush_output();
 	}
 
-<<<<<<< HEAD
 	private int telemetry_len() {
 		return Altos.telemetry_len(telemetry);
 	}
@@ -386,8 +385,6 @@ public class AltosSerial extends AltosLink implements Runnable {
 		remote = false;
 	}
 
-=======
->>>>>>> bc5e669... altosui: Pull most of AltosSerial into AltosLink
 	public void set_frame(Frame in_frame) {
 		frame = in_frame;
 	}
diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index 0a6ae59e..9fc7b5b3 100644
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -27,8 +27,6 @@ altosui_JAVA = \
 	AltosConfigureUI.java \
 	AltosConfigTD.java \
 	AltosConfigTDUI.java \
-	AltosConvert.java \
-	AltosCRCException.java \
 	AltosCSV.java \
 	AltosCSVUI.java \
 	AltosDebug.java \
@@ -42,7 +40,6 @@ altosui_JAVA = \
 	AltosEepromList.java \
 	AltosEepromManage.java \
 	AltosEepromMonitor.java \
-	AltosEepromTeleScience.java \
 	AltosEepromMega.java \
 	AltosEepromMegaIterable.java \
 	AltosEepromSelect.java \