X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosConfig.java;h=a0fdb6236cfc3491cfb45abf7eb2d8dba4ab2360;hp=b7474f3b2fa56faea8ee6d14858da68916e064f1;hb=483346a03c94b200692f5e6d59f3feee4dcf2ace;hpb=a6f30fae906bd87dff192c5fd4d10df283f99930

diff --git a/ao-tools/altosui/AltosConfig.java b/ao-tools/altosui/AltosConfig.java
index b7474f3b..a0fdb623 100644
--- a/ao-tools/altosui/AltosConfig.java
+++ b/ao-tools/altosui/AltosConfig.java
@@ -28,20 +28,6 @@ import java.text.*;
 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.AltosFlightStatusTableModel;
-import altosui.AltosFlightInfoTableModel;
-import altosui.AltosConfigUI;
-
 import libaltosJNI.*;
 
 public class AltosConfig implements Runnable, ActionListener {
@@ -212,12 +198,26 @@ public class AltosConfig implements Runnable, ActionListener {
 
 	public void actionPerformed(ActionEvent e) {
 		String	cmd = e.getActionCommand();
-		if (cmd.equals("save")) {
+		if (cmd.equals("Save")) {
 			save_data();
 			set_ui();
-		} else if (cmd.equals("reset")) {
+		} else if (cmd.equals("Reset")) {
 			set_ui();
-		} else if (cmd.equals("close")) {
+		} else if (cmd.equals("Reboot")) {
+			if (serial_line != null) {
+				try {
+					start_serial();
+					serial_line.printf("r eboot\n");
+				} catch (InterruptedException ie) {
+				} finally {
+					try {
+						stop_serial();
+					} catch (InterruptedException ie) {
+					}
+				}
+				serial_line.close();
+			}
+		} else if (cmd.equals("Close")) {
 			if (serial_line != null)
 				serial_line.close();
 		}
@@ -245,10 +245,9 @@ public class AltosConfig implements Runnable, ActionListener {
 		product = new string_ref("unknown");
 
 		device = AltosDeviceDialog.show(owner, AltosDevice.product_any);
-		serial_line = new AltosSerial();
 		if (device != null) {
 			try {
-				serial_line.open(device);
+				serial_line = new AltosSerial(device);
 				if (!device.matchProduct(AltosDevice.product_telemetrum))
 					remote = true;
 				config_thread = new Thread(this);
@@ -259,6 +258,12 @@ public class AltosConfig implements Runnable, ActionListener {
 									    device.getPath()),
 							      "Cannot open target device",
 							      JOptionPane.ERROR_MESSAGE);
+			} catch (AltosSerialInUseException si) {
+				JOptionPane.showMessageDialog(owner,
+							      String.format("Device \"%s\" already in use",
+									    device.getPath()),
+							      "Device in use",
+							      JOptionPane.ERROR_MESSAGE);
 			} catch (IOException ee) {
 				JOptionPane.showMessageDialog(owner,
 							      device.getPath(),