X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosConfig.java;h=b1acd41072e35d138f00c2d47b027ec263165117;hb=f3233985a132e1d660e6df12d0056b6729f16faf;hp=19503dcbe78e5f89c8fcf3fabfa5296f4ffb8188;hpb=9ffc2eb53a47e435f39b02896b0e43ae5f47f450;p=fw%2Faltos

diff --git a/ao-tools/altosui/AltosConfig.java b/ao-tools/altosui/AltosConfig.java
index 19503dcb..b1acd410 100644
--- a/ao-tools/altosui/AltosConfig.java
+++ b/ao-tools/altosui/AltosConfig.java
@@ -109,9 +109,8 @@ public class AltosConfig implements Runnable, ActionListener {
 
 	void start_serial() throws InterruptedException {
 		if (remote) {
-			serial_line.set_channel(AltosPreferences.channel(device.getSerial()));
-			serial_line.set_callsign(AltosPreferences.callsign());
-			serial_line.printf("p\n");
+			serial_line.set_radio();
+			serial_line.printf("p\nE 0\n");
 			serial_line.flush_input();
 		}
 	}
@@ -128,7 +127,7 @@ public class AltosConfig implements Runnable, ActionListener {
 			start_serial();
 			serial_line.printf("c s\nv\n");
 			for (;;) {
-				String line = serial_line.get_reply(1000);
+				String line = serial_line.get_reply(5000);
 				if (line == null)
 					throw new TimeoutException();
 				get_int(line, "serial-number", serial);
@@ -150,7 +149,7 @@ public class AltosConfig implements Runnable, ActionListener {
 	}
 
 	void init_ui () throws InterruptedException, TimeoutException {
-		config_ui = new AltosConfigUI(owner);
+		config_ui = new AltosConfigUI(owner, remote);
 		config_ui.addActionListener(this);
 		set_ui();
 	}
@@ -158,7 +157,7 @@ public class AltosConfig implements Runnable, ActionListener {
 	void abort() {
 		JOptionPane.showMessageDialog(owner,
 					      String.format("Connection to \"%s\" failed",
-							    device.toString()),
+							    device.toShortString()),
 					      "Connection Failed",
 					      JOptionPane.ERROR_MESSAGE);
 		serial_line.close();
@@ -192,8 +191,10 @@ public class AltosConfig implements Runnable, ActionListener {
 			start_serial();
 			serial_line.printf("c m %d\n", main_deploy.get());
 			serial_line.printf("c d %d\n", apogee_delay.get());
-			serial_line.printf("c r %d\n", radio_channel.get());
-			serial_line.printf("c f %d\n", radio_calibration.get());
+			if (!remote) {
+				serial_line.printf("c r %d\n", radio_channel.get());
+				serial_line.printf("c f %d\n", radio_calibration.get());
+			}
 			serial_line.printf("c c %s\n", callsign.get());
 			serial_line.printf("c w\n");
 		} catch (InterruptedException ie) {
@@ -266,18 +267,18 @@ public class AltosConfig implements Runnable, ActionListener {
 			} catch (FileNotFoundException ee) {
 				JOptionPane.showMessageDialog(owner,
 							      String.format("Cannot open device \"%s\"",
-									    device.toString()),
+									    device.toShortString()),
 							      "Cannot open target device",
 							      JOptionPane.ERROR_MESSAGE);
 			} catch (AltosSerialInUseException si) {
 				JOptionPane.showMessageDialog(owner,
 							      String.format("Device \"%s\" already in use",
-									    device.toString()),
+									    device.toShortString()),
 							      "Device in use",
 							      JOptionPane.ERROR_MESSAGE);
 			} catch (IOException ee) {
 				JOptionPane.showMessageDialog(owner,
-							      device.toString(),
+							      device.toShortString(),
 							      ee.getLocalizedMessage(),
 							      JOptionPane.ERROR_MESSAGE);
 			}