X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosUI.java;h=5b48e26f16fda3c6cec6044580c8654908272cf5;hp=2cb0c47935d10ca6c77b70035b56f842c62b6d4d;hb=63bd34cd1b5a411489e8c3ab377f0fe0eec11f67;hpb=0e917f3ff822616adb147517ac961422e5fedbfd

diff --git a/ao-tools/altosui/AltosUI.java b/ao-tools/altosui/AltosUI.java
index 2cb0c479..5b48e26f 100644
--- a/ao-tools/altosui/AltosUI.java
+++ b/ao-tools/altosui/AltosUI.java
@@ -40,6 +40,10 @@ import altosui.AltosLog;
 import altosui.AltosVoice;
 import altosui.AltosFlightStatusTableModel;
 import altosui.AltosFlightInfoTableModel;
+import altosui.AltosChannelMenu;
+import altosui.AltosFlashUI;
+import altosui.AltosLogfileChooser;
+import altosui.AltosCSVUI;
 
 import libaltosJNI.*;
 
@@ -260,7 +264,7 @@ public class AltosUI extends JFrame {
 		private AltosState state;
 		int	reported_landing;
 
-		public void report(boolean last) {
+		public synchronized void report(boolean last) {
 			if (state == null)
 				return;
 
@@ -274,7 +278,16 @@ public class AltosUI extends JFrame {
 			}
 
 			/* If the rocket isn't on the pad, then report height */
-			if (state.state > Altos.ao_flight_pad) {
+			if (Altos.ao_flight_drogue <= state.state &&
+			    state.state < Altos.ao_flight_landed &&
+			    state.range >= 0)
+			{
+				voice.speak("Height %d, bearing %d, elevation %d, range %d.\n",
+					    (int) (state.height + 0.5),
+					    (int) (state.from_pad.bearing + 0.5),
+					    (int) (state.elevation + 0.5),
+					    (int) (state.range + 0.5));
+			} else if (state.state > Altos.ao_flight_pad) {
 				voice.speak("%d meters", (int) (state.height + 0.5));
 			} else {
 				reported_landing = 0;
@@ -284,7 +297,7 @@ public class AltosUI extends JFrame {
 			 * either we've got a landed report or we haven't heard from it in
 			 * a long time
 			 */
-			if (!state.ascent &&
+			if (state.state >= Altos.ao_flight_drogue &&
 			    (last ||
 			     System.currentTimeMillis() - state.report_time >= 15000 ||
 			     state.state == Altos.ao_flight_landed))
@@ -294,7 +307,7 @@ public class AltosUI extends JFrame {
 				else
 					voice.speak("rocket may have crashed");
 				if (state.from_pad != null)
-					voice.speak("bearing %d degrees, range %d meters",
+					voice.speak("Bearing %d degrees, range %d meters.",
 						    (int) (state.from_pad.bearing + 0.5),
 						    (int) (state.from_pad.distance + 0.5));
 				++reported_landing;
@@ -307,7 +320,7 @@ public class AltosUI extends JFrame {
 			state = null;
 			try {
 				for (;;) {
-					Thread.sleep(10000);
+					Thread.sleep(20000);
 					report(false);
 				}
 			} catch (InterruptedException ie) {
@@ -315,7 +328,10 @@ public class AltosUI extends JFrame {
 		}
 
 		public void notice(AltosState new_state) {
+			AltosState old_state = state;
 			state = new_state;
+			if (old_state != null && old_state.state != state.state)
+				report(false);
 		}
 	}
 
@@ -391,21 +407,12 @@ public class AltosUI extends JFrame {
 		}
 	}
 
-	class TelemetryThread extends DisplayThread {
-
-		String readline() throws InterruptedException { return null; }
-
-		AltosRecord read() throws InterruptedException, ParseException {
-			return new AltosTelemetry(readline());
-		}
-	}
-
-	class DeviceThread extends TelemetryThread {
+	class DeviceThread extends DisplayThread {
 		AltosSerial	serial;
 		LinkedBlockingQueue<String> telem;
 
-		String readline() throws InterruptedException {
-			return telem.take();
+		AltosRecord read() throws InterruptedException, ParseException {
+			return new AltosTelemetry(telem.take());
 		}
 
 		void close() {
@@ -422,13 +429,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,
@@ -449,40 +457,54 @@ 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
 	 */
 
-	class ReplayTelemetryThread extends TelemetryThread {
-		FileInputStream	replay;
-
-		ReplayTelemetryThread(FileInputStream in, String in_name) {
-			replay = in;
-			name = in_name;
-		}
+	class ReplayThread extends DisplayThread {
+		AltosReader	reader;
+		String		name;
 
-		String readline() {
+		public AltosRecord read() {
 			try {
-				String	line = AltosRecord.gets(replay);
-				System.out.printf("telemetry line %s\n", line);
-				return line;
-			} catch (IOException ee) {
+				return reader.read();
+			} catch (IOException ie) {
 				JOptionPane.showMessageDialog(AltosUI.this,
 							      name,
 							      "error reading",
 							      JOptionPane.ERROR_MESSAGE);
+			} catch (ParseException pe) {
 			}
 			return null;
 		}
 
-		void close () {
-			try {
-				replay.close();
-			} catch (IOException ee) {
-			}
+		public void close () {
 			report();
 		}
 
+		public ReplayThread(AltosReader in_reader, String in_name) {
+			reader = in_reader;
+		}
 		void update(AltosState state) throws InterruptedException {
 			/* Make it run in realtime after the rocket leaves the pad */
 			if (state.state > Altos.ao_flight_pad)
@@ -490,40 +512,16 @@ public class AltosUI extends JFrame {
 		}
 	}
 
-	class ReplayEepromThread extends DisplayThread {
-		FileInputStream	replay;
-
-		AltosEepromReader	reader;
-
-		ReplayEepromThread(FileInputStream in, String in_name) {
-			replay = in;
-			name = in_name;
-			reader = new AltosEepromReader (in);
+	class ReplayTelemetryThread extends ReplayThread {
+		ReplayTelemetryThread(FileInputStream in, String in_name) {
+			super(new AltosTelemetryReader(in), in_name);
 		}
 
-		AltosRecord read () throws ParseException {
-			try {
-				return reader.read();
-			} catch (IOException ee) {
-				JOptionPane.showMessageDialog(AltosUI.this,
-							      name,
-							      "error reading",
-							      JOptionPane.ERROR_MESSAGE);
-			}
-			return null;
-		}
+	}
 
-		void close () {
-			try {
-				replay.close();
-			} catch (IOException ee) {
-			}
-			report();
-		}
-		void update(AltosState state) throws InterruptedException {
-			/* Make it run in realtime after the rocket leaves the pad */
-			if (state.state > Altos.ao_flight_pad)
-				Thread.sleep((int) (Math.min(state.time_change,10) * 1000));
+	class ReplayEepromThread extends ReplayThread {
+		ReplayEepromThread(FileInputStream in, String in_name) {
+			super(new AltosEepromReader(in), in_name);
 		}
 	}
 
@@ -545,33 +543,12 @@ public class AltosUI extends JFrame {
 	 * Replay a flight from telemetry data
 	 */
 	private void Replay() {
-		JFileChooser	logfile_chooser = new JFileChooser();
-
-		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);
-
-		if (returnVal == JFileChooser.APPROVE_OPTION) {
-			File file = logfile_chooser.getSelectedFile();
-			if (file == null)
-				System.out.println("No file selected?");
-			String	filename = file.getName();
-			try {
-				FileInputStream	replay = new FileInputStream(file);
-				DisplayThread	thread;
-				if (filename.endsWith("eeprom"))
-				    thread = new ReplayEepromThread(replay, filename);
-				else
-				    thread = new ReplayTelemetryThread(replay, filename);
-				run_display(thread);
-			} catch (FileNotFoundException ee) {
-				JOptionPane.showMessageDialog(AltosUI.this,
-							      filename,
-							      "Cannot open telemetry file",
-							      JOptionPane.ERROR_MESSAGE);
-			}
-		}
+		AltosLogfileChooser chooser = new AltosLogfileChooser(
+			AltosUI.this);
+		AltosReader reader = chooser.runDialog();
+		if (reader != null)
+			run_display(new ReplayThread(reader,
+						     chooser.filename()));
 	}
 
 	/* Connect to TeleMetrum, either directly or through
@@ -581,6 +558,14 @@ public class AltosUI extends JFrame {
 		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);
+	}
+
 	/* Create the AltosUI menus
 	 */
 	private void createMenu() {
@@ -595,6 +580,38 @@ 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("Quit",KeyEvent.VK_Q);
 			item.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_Q,
 								   ActionEvent.CTRL_MASK));
@@ -630,20 +647,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
@@ -697,33 +716,82 @@ 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);
 
 	}
+
+	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 AltosReader open_logfile(String filename) {
+		File file = new File (filename);
+		try {
+			FileInputStream in;
+
+			in = new FileInputStream(file);
+			if (filename.endsWith("eeprom"))
+				return new AltosEepromReader(in);
+			else
+				return new AltosTelemetryReader(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);
+		AltosReader reader = open_logfile(input);
+		if (reader == null)
+			return;
+		AltosCSV writer = open_csv(output);
+		if (writer == null)
+			return;
+		writer.write(reader);
+		reader.close();
+		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