X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosUI.java;h=75a12ecef1b6d0f174e37281098ae49d76e7ebd6;hb=cf1e95810559584705d0b8a787375938c68e07c6;hp=8799d560767a6d8f532bdc47914e6b228f498121;hpb=7ecde50fbebe68a2e2200a2f8d081fd37074f840;p=fw%2Faltos

diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java
index 8799d560..75a12ece 100644
--- a/altosui/AltosUI.java
+++ b/altosui/AltosUI.java
@@ -165,28 +165,29 @@ public class AltosUI extends AltosFrame {
 				}
 			});
 		b.setToolTipText("Global AltosUI settings");
-		b = addButton(2, 1, "Flash Image");
+
+		b = addButton(2, 1, "Configure Ground Station");
 		b.addActionListener(new ActionListener() {
 				public void actionPerformed(ActionEvent e) {
-					FlashImage();
+					ConfigureTeleDongle();
 				}
 			});
-		b.setToolTipText("Replace the firmware in any AltusMetrum product");
 
-		b = addButton(3, 1, "Fire Igniter");
+		b = addButton(3, 1, "Flash Image");
 		b.addActionListener(new ActionListener() {
 				public void actionPerformed(ActionEvent e) {
-					FireIgniter();
+					FlashImage();
 				}
 			});
-		b.setToolTipText("Remote control of igniters for deployment testing");
-		b = addButton(4, 1, "Quit");
+		b.setToolTipText("Replace the firmware in any AltusMetrum product");
+
+		b = addButton(4, 1, "Fire Igniter");
 		b.addActionListener(new ActionListener() {
 				public void actionPerformed(ActionEvent e) {
-					System.exit(0);
+					FireIgniter();
 				}
 			});
-		b.setToolTipText("Close all active windows and terminate AltosUI");
+		b.setToolTipText("Remote control of igniters for deployment testing");
 		b = addButton(0, 2, "Scan Channels");
 		b.addActionListener(new ActionListener() {
 				public void actionPerformed(ActionEvent e) {
@@ -216,6 +217,14 @@ public class AltosUI extends AltosFrame {
 				}
 			});
 
+		b = addButton(4, 2, "Quit");
+		b.addActionListener(new ActionListener() {
+				public void actionPerformed(ActionEvent e) {
+					System.exit(0);
+				}
+			});
+		b.setToolTipText("Close all active windows and terminate AltosUI");
+
 		setTitle("AltOS");
 
 		pane.doLayout();
@@ -262,6 +271,10 @@ public class AltosUI extends AltosFrame {
 		new AltosConfig(AltosUI.this);
 	}
 
+	void ConfigureTeleDongle() {
+		new AltosConfigTD(AltosUI.this);
+	}
+
 	void FlashImage() {
 		AltosFlashUI.show(AltosUI.this);
 	}
@@ -423,17 +436,17 @@ public class AltosUI extends AltosFrame {
 		}
 	}
 
-	static AltosRecordIterable record_iterable_file(String filename) {
+	static AltosRecordIterable record_iterable(File file) {
 		FileInputStream in;
 		try {
-			in = new FileInputStream(filename);
+			in = new FileInputStream(file);
 		} catch (Exception e) {
-			System.out.printf("Failed to open file '%s'\n", filename);
+			System.out.printf("Failed to open file '%s'\n", file);
 			return null;
 		}
 		AltosRecordIterable recs;
 		AltosReplayReader reader;
-		if (filename.endsWith("eeprom")) {
+		if (file.getName().endsWith("eeprom")) {
 			recs = new AltosEepromIterable(in);
 		} else {
 			recs = new AltosTelemetryIterable(in);
@@ -441,6 +454,10 @@ public class AltosUI extends AltosFrame {
 		return recs;
 	}
 
+	static AltosRecordIterable record_iterable_file(String filename) {
+		return record_iterable (new File(filename));
+	}
+
 	static AltosReplayReader replay_file(String filename) {
 		AltosRecordIterable recs = record_iterable_file(filename);
 		if (recs == null)
@@ -466,9 +483,9 @@ public class AltosUI extends AltosFrame {
 	}
 	
 	static void process_summary(String filename) {
-		AltosReplayReader reader = replay_file(filename);
+		AltosRecordIterable iterable = record_iterable_file(filename);
 		try {
-			AltosFlightStats stats = new AltosFlightStats(reader);
+			AltosFlightStats stats = new AltosFlightStats(iterable);
 			if (stats.serial > 0)
 				System.out.printf("Serial:       %5d\n", stats.serial);
 			if (stats.flight > 0)