X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosUI.java;h=de0673a209e396630fb3b166a2e1586bf2b7f7bb;hp=21c3e7a27367e9fd4815998709cdb3dc30a65bd4;hb=e2b9f47a205348d38756c70e928a2a9183de6884;hpb=65079f84ea64220fa928c3ad96652fed159bf74b

diff --git a/ao-tools/altosui/AltosUI.java b/ao-tools/altosui/AltosUI.java
index 21c3e7a2..de0673a2 100644
--- a/ao-tools/altosui/AltosUI.java
+++ b/ao-tools/altosui/AltosUI.java
@@ -21,75 +21,94 @@ import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.AbstractTableModel;
+import javax.swing.table.*;
 import java.io.*;
 import java.util.*;
 import java.text.*;
-import gnu.io.CommPortIdentifier;
+import java.util.prefs.*;
+import java.util.concurrent.LinkedBlockingQueue;
 
+import altosui.Altos;
 import altosui.AltosSerial;
 import altosui.AltosSerialMonitor;
+import altosui.AltosRecord;
 import altosui.AltosTelemetry;
 import altosui.AltosState;
+import altosui.AltosDeviceDialog;
+import altosui.AltosPreferences;
+import altosui.AltosLog;
+import altosui.AltosVoice;
+import altosui.AltosFlightInfoTableModel;
+import altosui.AltosChannelMenu;
+import altosui.AltosFlashUI;
+import altosui.AltosLogfileChooser;
+import altosui.AltosCSVUI;
+import altosui.AltosLine;
+import altosui.AltosStatusTable;
+import altosui.AltosInfoTable;
+import altosui.AltosDisplayThread;
+
+import libaltosJNI.*;
 
-class AltosUIMonitor implements AltosSerialMonitor {
-	public void data(String data) {
-		System.out.println(data);
-	}
-}
-
-class AltosFlightStatusTableModel extends AbstractTableModel {
-	private String[] columnNames = {"Height (m)", "State", "RSSI (dBm)", "Speed (m/s)" };
-	private Object[] data = { 0, "idle", 0, 0 };
+public class AltosUI extends JFrame {
+	private int channel = -1;
 
-	public int getColumnCount() { return columnNames.length; }
-	public int getRowCount() { return 1; }
-	public String getColumnName(int col) { return columnNames[col]; }
-	public Object getValueAt(int row, int col) { return data[col]; }
+	private AltosStatusTable flightStatus;
+	private AltosInfoTable flightInfo;
+	private AltosSerial serial_line;
+	private AltosLog altos_log;
+	private Box vbox;
 
-	public void setValueAt(Object value, int col) {
-		data[col] = value;
-		fireTableCellUpdated(0, col);
-	}
+	private Font statusFont = new Font("SansSerif", Font.BOLD, 24);
+	private Font infoLabelFont = new Font("SansSerif", Font.PLAIN, 14);
+	private Font infoValueFont = new Font("Monospaced", Font.PLAIN, 14);
 
-	public void setValueAt(Object value, int row, int col) {
-		setValueAt(value, col);
-	}
+	public AltosVoice voice = new AltosVoice();
 
-	public void set(AltosState state) {
-		setValueAt(state.height, 0);
-		setValueAt(state.data.state, 1);
-		setValueAt(state.data.rssi, 2);
-		setValueAt(state.speed, 3);
+	public static boolean load_library(Frame frame) {
+		if (!AltosDevice.load_library()) {
+			JOptionPane.showMessageDialog(frame,
+						      String.format("No AltOS library in \"%s\"",
+								    System.getProperty("java.library.path","<undefined>")),
+						      "Cannot load device access library",
+						      JOptionPane.ERROR_MESSAGE);
+			return false;
+		}
+		return true;
 	}
-}
-
-public class AltosUI extends JFrame {
-	private int channel = -1;
-
-	private JTable flightStatus;
-	private JTable flightInfo;
-	private AltosSerial serialLine;
 
 	public AltosUI() {
 
+		load_library(null);
+
 		String[] statusNames = { "Height (m)", "State", "RSSI (dBm)", "Speed (m/s)" };
 		Object[][] statusData = { { "0", "pad", "-50", "0" } };
 
-		flightStatus = new JTable(statusData, statusNames);
+		java.net.URL imgURL = AltosUI.class.getResource("/altus-metrum-16x16.jpg");
+		if (imgURL != null)
+			setIconImage(new ImageIcon(imgURL).getImage());
+
+		AltosPreferences.init(this);
 
-		flightStatus.setShowGrid(false);
+		vbox = Box.createVerticalBox();
+		this.add(vbox);
 
-		this.add(flightStatus);
+		flightStatus = new AltosStatusTable(this);
+
+		vbox.add(flightStatus);
+
+		flightInfo = new AltosInfoTable();
+		vbox.add(flightInfo.box());
 
 		setTitle("AltOS");
 
 		createMenu();
 
-		serialLine = new AltosSerial();
-		serialLine.monitor(new AltosUIMonitor());
+		serial_line = new AltosSerial();
+		altos_log = new AltosLog(serial_line);
 		int dpi = Toolkit.getDefaultToolkit().getScreenResolution();
-		this.setSize(new Dimension (dpi * 5, dpi * 4));
+		this.setSize(new Dimension (flightInfo.width(),
+					    flightStatus.height() + flightInfo.height()));
 		this.validate();
 		setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
 		addWindowListener(new WindowAdapter() {
@@ -98,128 +117,143 @@ public class AltosUI extends JFrame {
 				System.exit(0);
 			}
 		});
+		voice.speak("Rocket flight monitor ready.");
 	}
 
-	final JFileChooser deviceChooser = new JFileChooser();
-	final JFileChooser logdirChooser = new JFileChooser();
-	final String logdirName = "TeleMetrum";
-	File logdir = null;
+	class DeviceThread extends AltosDisplayThread {
+		AltosSerial	serial;
+		LinkedBlockingQueue<AltosLine> telem;
 
-	private void setLogdir() {
-		if (logdir == null)
-			logdir = new File(logdirChooser.getCurrentDirectory(), logdirName);
-		logdirChooser.setCurrentDirectory(logdir);
-	}
+		AltosRecord read() throws InterruptedException, ParseException, AltosCRCException, IOException {
+			AltosLine l = telem.take();
+			if (l.line == null)
+				throw new IOException("IO error");
+			return new AltosTelemetry(l.line);
+		}
 
-	private void makeLogdir() {
-		setLogdir();
-		if (!logdir.exists()) {
-			if (!logdir.mkdirs())
-				JOptionPane.showMessageDialog(AltosUI.this,
-							      logdir.getName(),
-							      "Cannot create directory",
-							      JOptionPane.ERROR_MESSAGE);
-		} else if (!logdir.isDirectory()) {
-			JOptionPane.showMessageDialog(AltosUI.this,
-						      logdir.getName(),
-						      "Is not a directory",
-						      JOptionPane.ERROR_MESSAGE);
+		void close(boolean interrupted) {
+			serial.close();
+			serial.remove_monitor(telem);
 		}
-	}
 
-	private void PickSerialDevice() {
-		java.util.Enumeration<CommPortIdentifier> port_list = CommPortIdentifier.getPortIdentifiers();
-		while (port_list.hasMoreElements()) {
-			CommPortIdentifier identifier = port_list.nextElement();
-			System.out.println("Serial port " + identifier.getName());
+		public DeviceThread(AltosSerial s, String in_name, AltosVoice voice, AltosStatusTable status, AltosInfoTable info) {
+			super(AltosUI.this, voice, status, info);
+			serial = s;
+			telem = new LinkedBlockingQueue<AltosLine>();
+			serial.add_monitor(telem);
+			name = in_name;
 		}
 	}
 
 	private void ConnectToDevice() {
-		PickSerialDevice();
-		int returnVal = deviceChooser.showOpenDialog(AltosUI.this);
+		AltosDevice	device = AltosDeviceDialog.show(AltosUI.this,
+								AltosDevice.product_basestation);
 
-		if (returnVal == JFileChooser.APPROVE_OPTION) {
-			File file = deviceChooser.getSelectedFile();
+		if (device != null) {
 			try {
-				serialLine.open(file);
+				stop_display();
+				serial_line.open(device);
+				DeviceThread thread = new DeviceThread(serial_line, device.getPath(), voice, flightStatus, flightInfo);
+				serial_line.set_channel(AltosPreferences.channel());
+				serial_line.set_callsign(AltosPreferences.callsign());
+				run_display(thread);
 			} catch (FileNotFoundException ee) {
 				JOptionPane.showMessageDialog(AltosUI.this,
-							      file.getName(),
-							      "Cannot open serial port",
+							      String.format("Cannot open device \"%s\"",
+									    device.getPath()),
+							      "Cannot open target device",
+							      JOptionPane.ERROR_MESSAGE);
+			} catch (IOException ee) {
+				JOptionPane.showMessageDialog(AltosUI.this,
+							      device.getPath(),
+							      "Unkonwn I/O error",
 							      JOptionPane.ERROR_MESSAGE);
 			}
 		}
 	}
 
-	String readline(FileInputStream s) throws IOException {
-		int c;
-		String	line = "";
+	void DisconnectFromDevice () {
+		stop_display();
+	}
 
-		while ((c = s.read()) != -1) {
-			if (c == '\r')
-				continue;
-			if (c == '\n')
-				return line;
-			line = line + (char) c;
+	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);
 		}
-		return null;
 	}
 
-	/*
-	 * Open an existing telemetry file and replay it in realtime
-	 */
+	void ConfigureTeleMetrum() {
+		new AltosConfig(AltosUI.this);
+	}
 
-	private void Replay() {
-		setLogdir();
-		logdirChooser.setDialogTitle("Select Telemetry File");
-		logdirChooser.setFileFilter(new FileNameExtensionFilter("Telemetry file", "telem"));
-		int returnVal = logdirChooser.showOpenDialog(AltosUI.this);
-
-		if (returnVal == JFileChooser.APPROVE_OPTION) {
-			File file = logdirChooser.getSelectedFile();
-			if (file == null)
-				System.out.println("No file selected?");
-			String	filename = file.getName();
+	void FlashImage() {
+		new AltosFlashUI(AltosUI.this);
+	}
+
+
+	Thread		display_thread;
+
+	private void stop_display() {
+		if (display_thread != null && display_thread.isAlive()) {
+			display_thread.interrupt();
 			try {
-				FileInputStream	replay = new FileInputStream(file);
-				String	line;
-
-				try {
-					while ((line = readline(replay)) != null) {
-						try {
-							AltosTelemetry	t = new AltosTelemetry(line);
-							System.out.println ("Version " + t.version + t.callsign);
-						} catch (ParseException pp) {
-							JOptionPane.showMessageDialog(AltosUI.this,
-										      line,
-										      "error parsing",
-										      JOptionPane.ERROR_MESSAGE);
-							break;
-						}
-					}
-				} catch (IOException ee) {
-					JOptionPane.showMessageDialog(AltosUI.this,
-								      filename,
-								      "error reading",
-								      JOptionPane.ERROR_MESSAGE);
-				} finally {
-					try {
-						replay.close();
-					} catch (IOException e) {}
-				}
-			} catch (FileNotFoundException ee) {
-				JOptionPane.showMessageDialog(AltosUI.this,
-							      filename,
-							      "Cannot open serial port",
-							      JOptionPane.ERROR_MESSAGE);
-			}
+				display_thread.join();
+			} catch (InterruptedException ie) {}
 		}
+		display_thread = null;
+	}
+
+	private void run_display(Thread thread) {
+		stop_display();
+		display_thread = thread;
+		display_thread.start();
+	}
+
+	/*
+	 * Replay a flight from telemetry data
+	 */
+	private void Replay() {
+		AltosLogfileChooser chooser = new AltosLogfileChooser(
+			AltosUI.this);
+		AltosRecordIterable iterable = chooser.runDialog();
+		if (iterable != null)
+			run_display(new AltosReplayThread(this, iterable.iterator(),
+							  chooser.filename(),
+							  voice,
+							  flightStatus,
+							  flightInfo));
 	}
 
+	/* Connect to TeleMetrum, either directly or through
+	 * a TeleDongle over the packet link
+	 */
 	private void SaveFlightData() {
+		new AltosEepromDownload(AltosUI.this);
+	}
+
+	/* Load a flight log file and write out a CSV file containing
+	 * all of the data in standard units
+	 */
+
+	private void ExportData() {
+		new AltosCSVUI(AltosUI.this);
 	}
 
+	/* Load a flight log CSV file and display a pretty graph.
+	 */
+
+	private void GraphData() {
+		new AltosGraphUI(AltosUI.this);
+	}
+
+	/* Create the AltosUI menus
+	 */
 	private void createMenu() {
 		JMenuBar menubar = new JMenuBar();
 		JMenu menu;
@@ -232,6 +266,46 @@ 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("Export Data",KeyEvent.VK_F);
+			item.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						ExportData();
+					}
+				});
+			menu.add(item);
+
+			item = new JMenuItem("Graph Data",KeyEvent.VK_F);
+			item.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						GraphData();
+					}
+				});
+			menu.add(item);
+
 			item = new JMenuItem("Quit",KeyEvent.VK_Q);
 			item.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_Q,
 								   ActionEvent.CTRL_MASK));
@@ -260,27 +334,29 @@ public class AltosUI extends JFrame {
 			item = new JMenuItem("Disconnect from Device",KeyEvent.VK_D);
 			item.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
-						serialLine.close();
+						DisconnectFromDevice();
 					}
 				});
 			menu.add(item);
 
 			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
@@ -299,6 +375,7 @@ public class AltosUI extends JFrame {
 			item = new JMenuItem("Configure Log",KeyEvent.VK_C);
 			item.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
+						AltosPreferences.ConfigureLog();
 					}
 				});
 			menu.add(item);
@@ -309,42 +386,105 @@ public class AltosUI extends JFrame {
 			menu.setMnemonic(KeyEvent.VK_V);
 			menubar.add(menu);
 
-			radioitem = new JRadioButtonMenuItem("Enable Voice");
+			radioitem = new JRadioButtonMenuItem("Enable Voice", AltosPreferences.voice());
 			radioitem.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
+						JRadioButtonMenuItem item = (JRadioButtonMenuItem) e.getSource();
+						boolean enabled = item.isSelected();
+						AltosPreferences.set_voice(enabled);
+						if (enabled)
+							voice.speak_always("Enable voice.");
+						else
+							voice.speak_always("Disable voice.");
 					}
 				});
 			menu.add(radioitem);
+			item = new JMenuItem("Test Voice",KeyEvent.VK_T);
+			item.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						voice.speak("That's one small step for man; one giant leap for mankind.");
+					}
+				});
+			menu.add(item);
 		}
 
 		// 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 == 0);
-				radioitem.setActionCommand(String.format("%d", c));
-				radioitem.addActionListener(new ActionListener() {
+			menu = new AltosChannelMenu(AltosPreferences.channel());
+			menu.addActionListener(new ActionListener() {
 						public void actionPerformed(ActionEvent e) {
-							System.out.println("Command: " + e.getActionCommand() + " param: " +
-									   e.paramString());
+							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);
 
 	}
+
+	static String replace_extension(String input, String extension) {
+		int dot = input.lastIndexOf(".");
+		if (dot > 0)
+			input = input.substring(0,dot);
+		return input.concat(extension);
+	}
+
+	static AltosRecordIterable open_logfile(String filename) {
+		File file = new File (filename);
+		try {
+			FileInputStream in;
+
+			in = new FileInputStream(file);
+			if (filename.endsWith("eeprom"))
+				return new AltosEepromIterable(in);
+			else
+				return new AltosTelemetryIterable(in);
+		} catch (FileNotFoundException fe) {
+			System.out.printf("Cannot open '%s'\n", filename);
+			return null;
+		}
+	}
+
+	static AltosCSV open_csv(String filename) {
+		File file = new File (filename);
+		try {
+			return new AltosCSV(file);
+		} catch (FileNotFoundException fe) {
+			System.out.printf("Cannot open '%s'\n", filename);
+			return null;
+		}
+	}
+
+	static void process_file(String input) {
+		String output = replace_extension(input,".csv");
+		if (input.equals(output)) {
+			System.out.printf("Not processing '%s'\n", input);
+			return;
+		}
+		System.out.printf("Processing \"%s\" to \"%s\"\n", input, output);
+		AltosRecordIterable iterable = open_logfile(input);
+		if (iterable == null)
+			return;
+		AltosCSV writer = open_csv(output);
+		if (writer == null)
+			return;
+		writer.write(iterable);
+		writer.close();
+	}
+
 	public static void main(final String[] args) {
-		AltosUI altosui = new AltosUI();
-		altosui.setVisible(true);
+
+		/* Handle batch-mode */
+		if (args.length > 0) {
+			for (int i = 0; i < args.length; i++)
+				process_file(args[i]);
+		} else {
+			AltosUI altosui = new AltosUI();
+			altosui.setVisible(true);
+		}
 	}
-}
\ No newline at end of file
+}