X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosUI.java;h=ecacffe5b55f2201e3e734836f4765fe2c5b5705;hb=024d077302f91bdb17abe70d3211ab0949dab8b9;hp=5c92b9b4d3c0d3ead2638158ab248c89e4de4b6b;hpb=e76b9cc32bbcc5176d9bdd6f8d79778024627382;p=fw%2Faltos

diff --git a/ao-tools/altosui/AltosUI.java b/ao-tools/altosui/AltosUI.java
index 5c92b9b4..ecacffe5 100644
--- a/ao-tools/altosui/AltosUI.java
+++ b/ao-tools/altosui/AltosUI.java
@@ -210,6 +210,7 @@ public class AltosUI extends JFrame {
 				System.exit(0);
 			}
 		});
+		voice.speak("Rocket flight monitor ready.");
 	}
 
 	public void info_reset() {
@@ -473,7 +474,6 @@ public class AltosUI extends JFrame {
 		void close() {
 			serial.close();
 			serial.remove_monitor(telem);
-			System.out.println("DisplayThread done");
 		}
 
 		public DeviceThread(AltosSerial s) {
@@ -490,6 +490,7 @@ public class AltosUI extends JFrame {
 			try {
 				serial_line.open(device);
 				DeviceThread thread = new DeviceThread(serial_line);
+				serial_line.set_channel(AltosPreferences.channel());
 				run_display(thread);
 			} catch (FileNotFoundException ee) {
 				JOptionPane.showMessageDialog(AltosUI.this,
@@ -706,12 +707,26 @@ 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
@@ -724,12 +739,13 @@ public class AltosUI extends JFrame {
 			for (int c = 0; c <= 9; c++) {
 				radioitem = new JRadioButtonMenuItem(String.format("Channel %1d (%7.3fMHz)", c,
 										   434.550 + c * 0.1),
-								     c == 0);
+								     c == AltosPreferences.channel());
 				radioitem.setActionCommand(String.format("%d", c));
 				radioitem.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);