X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosUI.java;h=64f96cddce15139cfdf00e696bc90e9242eb2941;hp=7d5ac93ac32adb1497160c0867654d32fd90da9f;hb=a55b132668a819cc26478a609cb79bd9190deb9d;hpb=f317f1324b69b4241f4bb192e164b33d712d5a43

diff --git a/ao-tools/altosui/AltosUI.java b/ao-tools/altosui/AltosUI.java
index 7d5ac93a..64f96cdd 100644
--- a/ao-tools/altosui/AltosUI.java
+++ b/ao-tools/altosui/AltosUI.java
@@ -40,6 +40,9 @@ import altosui.AltosLog;
 import altosui.AltosVoice;
 import altosui.AltosFlightStatusTableModel;
 import altosui.AltosFlightInfoTableModel;
+import altosui.AltosChannelMenu;
+import altosui.AltosFlashUI;
+import altosui.AltosLogfileChooser;
 
 import libaltosJNI.*;
 
@@ -413,13 +416,14 @@ public class AltosUI extends JFrame {
 	}
 
 	private void ConnectToDevice() {
-		altos_device	device = AltosDeviceDialog.show(AltosUI.this, "TeleDongle");
+		AltosDevice	device = AltosDeviceDialog.show(AltosUI.this, AltosDevice.BaseStation);
 
 		if (device != null) {
 			try {
 				serial_line.open(device);
 				DeviceThread thread = new DeviceThread(serial_line);
 				serial_line.set_channel(AltosPreferences.channel());
+				serial_line.set_callsign(AltosPreferences.callsign());
 				run_display(thread);
 			} catch (FileNotFoundException ee) {
 				JOptionPane.showMessageDialog(AltosUI.this,
@@ -440,6 +444,26 @@ public class AltosUI extends JFrame {
 		stop_display();
 	}
 
+	void ConfigureCallsign() {
+		String	result;
+		result = JOptionPane.showInputDialog(AltosUI.this,
+						     "Configure Callsign",
+						     AltosPreferences.callsign());
+		if (result != null) {
+			AltosPreferences.set_callsign(result);
+			if (serial_line != null)
+				serial_line.set_callsign(result);
+		}
+	}
+
+	void ConfigureTeleMetrum() {
+		new AltosConfig(AltosUI.this);
+	}
+
+	void FlashImage() {
+		new AltosFlashUI(AltosUI.this);
+	}
+
 	/*
 	 * Open an existing telemetry file and replay it in realtime
 	 */
@@ -506,17 +530,12 @@ public class AltosUI extends JFrame {
 	 * Replay a flight from telemetry data
 	 */
 	private void Replay() {
-		JFileChooser	logfile_chooser = new JFileChooser();
+		AltosLogfileChooser chooser = new AltosLogfileChooser(
+			AltosUI.this);
 
-		logfile_chooser.setDialogTitle("Select Flight Record File");
-		logfile_chooser.setFileFilter(new FileNameExtensionFilter("Flight data file", "eeprom", "telem"));
-		logfile_chooser.setCurrentDirectory(AltosPreferences.logdir());
-		int returnVal = logfile_chooser.showOpenDialog(AltosUI.this);
+		File file = chooser.runDialog();
 
-		if (returnVal == JFileChooser.APPROVE_OPTION) {
-			File file = logfile_chooser.getSelectedFile();
-			if (file == null)
-				System.out.println("No file selected?");
+		if (file != null) {
 			String	filename = file.getName();
 			try {
 				FileInputStream	replay = new FileInputStream(file);
@@ -556,6 +575,30 @@ public class AltosUI extends JFrame {
 			menu.setMnemonic(KeyEvent.VK_F);
 			menubar.add(menu);
 
+			item = new JMenuItem("Replay File",KeyEvent.VK_R);
+			item.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						Replay();
+					}
+				});
+			menu.add(item);
+
+			item = new JMenuItem("Save Flight Data",KeyEvent.VK_S);
+			item.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						SaveFlightData();
+					}
+				});
+			menu.add(item);
+
+			item = new JMenuItem("Flash Image",KeyEvent.VK_F);
+			item.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						FlashImage();
+					}
+				});
+			menu.add(item);
+
 			item = new JMenuItem("Quit",KeyEvent.VK_Q);
 			item.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_Q,
 								   ActionEvent.CTRL_MASK));
@@ -591,20 +634,22 @@ public class AltosUI extends JFrame {
 
 			menu.addSeparator();
 
-			item = new JMenuItem("Save Flight Data",KeyEvent.VK_S);
+			item = new JMenuItem("Set Callsign",KeyEvent.VK_S);
 			item.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
-						SaveFlightData();
+						ConfigureCallsign();
 					}
 				});
+
 			menu.add(item);
 
-			item = new JMenuItem("Replay",KeyEvent.VK_R);
+			item = new JMenuItem("Configure TeleMetrum device",KeyEvent.VK_T);
 			item.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
-						Replay();
+						ConfigureTeleMetrum();
 					}
 				});
+
 			menu.add(item);
 		}
 		// Log menu
@@ -658,26 +703,16 @@ public class AltosUI extends JFrame {
 
 		// Channel menu
 		{
-			menu = new JMenu("Channel", true);
-			menu.setMnemonic(KeyEvent.VK_C);
-			menubar.add(menu);
-			ButtonGroup group = new ButtonGroup();
-
-			for (int c = 0; c <= 9; c++) {
-				radioitem = new JRadioButtonMenuItem(String.format("Channel %1d (%7.3fMHz)", c,
-										   434.550 + c * 0.1),
-								     c == AltosPreferences.channel());
-				radioitem.setActionCommand(String.format("%d", c));
-				radioitem.addActionListener(new ActionListener() {
+			menu = new AltosChannelMenu(AltosPreferences.channel());
+			menu.addActionListener(new ActionListener() {
 						public void actionPerformed(ActionEvent e) {
 							int new_channel = Integer.parseInt(e.getActionCommand());
 							AltosPreferences.set_channel(new_channel);
 							serial_line.set_channel(new_channel);
 						}
-					});
-				menu.add(radioitem);
-				group.add(radioitem);
-			}
+				});
+			menu.setMnemonic(KeyEvent.VK_C);
+			menubar.add(menu);
 		}
 
 		this.setJMenuBar(menubar);