X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=teststand%2FTestStand.java;h=d13906a23cdf2f374b667b44945cafa5f4e5ba49;hb=279ca77a197a2382dffa20fc540610cb8dd4a3b7;hp=3cdf2dafa56e6b886ee306e8851c209e70b41789;hpb=01cd1603859aa53d593999ef0adb0e0df053f62c;p=fw%2Faltos

diff --git a/teststand/TestStand.java b/teststand/TestStand.java
index 3cdf2daf..d13906a2 100644
--- a/teststand/TestStand.java
+++ b/teststand/TestStand.java
@@ -134,7 +134,7 @@ public class TestStand extends AltosUIFrame implements AltosEepromGrapher {
 					}
 				});
 		b.setToolTipText("Connect to TeleDongle and monitor telemetry");
-		b = addButton(1, 0, "Save Flight Data");
+		b = addButton(1, 0, "Save Data");
 		b.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
 						SaveFlightData();
@@ -185,13 +185,6 @@ public class TestStand extends AltosUIFrame implements AltosEepromGrapher {
 			});
 		b.setToolTipText("Replace the firmware in any AltusMetrum product");
 
-		b = addButton(4, 1, "Fire Igniter");
-		b.addActionListener(new ActionListener() {
-				public void actionPerformed(ActionEvent e) {
-					FireIgniter();
-				}
-			});
-		b.setToolTipText("Remote control of igniters for deployment testing");
 		b = addButton(0, 2, "Scan Channels");
 		b.addActionListener(new ActionListener() {
 				public void actionPerformed(ActionEvent e) {
@@ -208,7 +201,7 @@ public class TestStand extends AltosUIFrame implements AltosEepromGrapher {
 			});
 		b.setToolTipText("Close all active windows and terminate TestStand");
 
-		setTitle("AltOS");
+		setTitle("Altus Metrum Test Stand");
 
 		pane.doLayout();
 		pane.validate();
@@ -259,18 +252,10 @@ public class TestStand extends AltosUIFrame implements AltosEepromGrapher {
 		AltosFlashUI.show(TestStand.this);
 	}
 
-	void FireIgniter() {
-		new AltosIgniteUI(TestStand.this);
-	}
-
 	void ScanChannels() {
 		new AltosScanUI(TestStand.this, true);
 	}
 
-	void LaunchController() {
-		new AltosLaunchUI(TestStand.this);
-	}
-
 	/* Connect to TeleMetrum, either directly or through
 	 * a TeleDongle over the packet link
 	 */
@@ -337,15 +322,6 @@ public class TestStand extends AltosUIFrame implements AltosEepromGrapher {
 		}
 	}
 
-	static AltosWriter open_kml(File file) {
-		try {
-			return new AltosKML(file);
-		} catch (FileNotFoundException fe) {
-			System.out.printf("%s\n", fe.getMessage());
-			return null;
-		}
-	}
-
 	static AltosRecordSet record_set(File input) {
 		try {
 			return AltosLib.record_set(input);
@@ -360,7 +336,6 @@ public class TestStand extends AltosUIFrame implements AltosEepromGrapher {
 
 	static final int process_none = 0;
 	static final int process_csv = 1;
-	static final int process_kml = 2;
 	static final int process_graph = 3;
 	static final int process_summary = 4;
 	static final int process_oneline = 5;
@@ -386,28 +361,6 @@ public class TestStand extends AltosUIFrame implements AltosEepromGrapher {
 		return true;
 	}
 
-	static boolean process_kml(File input) {
-		AltosRecordSet set = record_set(input);
-		if (set == null)
-			return false;
-
-		File output = Altos.replace_extension(input,".kml");
-		System.out.printf("Processing \"%s\" to \"%s\"\n", input, output);
-		if (input.equals(output)) {
-			System.out.printf("Not processing '%s'\n", input);
-			return false;
-		} else {
-			AltosWriter writer = open_kml(output);
-			if (writer == null)
-				return false;
-			AltosFlightSeries series = make_series(set);
-			series.finish();
-			writer.write(series);
-			writer.close();
-			return true;
-		}
-	}
-
 	static boolean process_graph(File file) {
 		AltosRecordSet set = record_set(file);
 		if (set == null)
@@ -427,7 +380,7 @@ public class TestStand extends AltosUIFrame implements AltosEepromGrapher {
 			return false;
 		System.out.printf("%s:\n", file.toString());
 		AltosFlightSeries series = make_series(set);
-		AltosFlightStats stats = new AltosFlightStats(series);
+		TestStats stats = new TestStats(series);
 		if (stats.serial != AltosLib.MISSING)
 			System.out.printf("Serial:       %5d\n", stats.serial);
 		if (stats.flight != AltosLib.MISSING)
@@ -477,7 +430,7 @@ public class TestStand extends AltosUIFrame implements AltosEepromGrapher {
 			return false;
 		System.out.printf("%s", file.toString());
 		AltosFlightSeries series = make_series(set);
-		AltosFlightStats stats = new AltosFlightStats(series);
+		TestStats stats = new TestStats(series);
 		if (stats.max_height != AltosLib.MISSING)
 			System.out.printf(" height  %6.0f m", stats.max_height);
 		if (stats.max_speed != AltosLib.MISSING)
@@ -497,7 +450,6 @@ public class TestStand extends AltosUIFrame implements AltosEepromGrapher {
 		System.out.printf("    --summary <filename>\t\tText summary of a flight\n");
 		System.out.printf("    --oneline <filename>\t\tOne line summary of a flight\n");
 		System.out.printf("    --csv\tgenerate comma separated output for spreadsheets, etc\n");
-		System.out.printf("    --kml\tgenerate KML output for use with Google Earth\n");
 		System.exit(code);
 	}
 
@@ -522,8 +474,6 @@ public class TestStand extends AltosUIFrame implements AltosEepromGrapher {
 			for (int i = 0; i < args.length; i++) {
 				if (args[i].equals("--help"))
 					help(0);
-				else if (args[i].equals("--kml"))
-					process = process_kml;
 				else if (args[i].equals("--csv"))
 					process = process_csv;
 				else if (args[i].equals("--graph"))
@@ -544,10 +494,6 @@ public class TestStand extends AltosUIFrame implements AltosEepromGrapher {
 						if (!process_graph(file))
 							++errors;
 						break;
-					case process_kml:
-						if (!process_kml(file))
-							++errors;
-						break;
 					case process_csv:
 						if (!process_csv(file))
 							++errors;