X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosUI.java;h=6a24d8a996899f915d98d8f9587834d0a892d5a3;hb=e905042879147dd86241bf2dcc7437e5a6eb7578;hp=0fc6583ca11c46771eaf32df6d18a41414fec4a5;hpb=9cdef76c1275b343099d0d01af82d7eadd36a410;p=fw%2Faltos

diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java
index 0fc6583c..6a24d8a9 100644
--- a/altosui/AltosUI.java
+++ b/altosui/AltosUI.java
@@ -99,7 +99,7 @@ public class AltosUI extends JFrame {
 		if (imgURL != null)
 			setIconImage(new ImageIcon(imgURL).getImage());
 
-		AltosPreferences.init(this);
+		AltosPreferences.set_component(this);
 
 		pane = getContentPane();
 		gridbag = new GridBagLayout();
@@ -172,6 +172,14 @@ public class AltosUI extends JFrame {
 				}
 			});
 
+
+		b = addButton(0, 2, "Scan Channels");
+		b.addActionListener(new ActionListener() {
+				public void actionPerformed(ActionEvent e) {
+					ScanChannels();
+				}
+			});
+
 		setTitle("AltOS");
 
 		pane.doLayout();
@@ -198,10 +206,6 @@ public class AltosUI extends JFrame {
 	}
 
 	private void ConnectToDevice() {
-		AltosBTManage	bt_manage;
-
-		bt_manage = new AltosBTManage(AltosBTDevice.bt_product_any, this);
-		bt_manage.list();
 		AltosDevice	device = AltosDeviceDialog.show(AltosUI.this,
 								Altos.product_basestation);
 
@@ -223,13 +227,17 @@ public class AltosUI extends JFrame {
 	}
 
 	void FlashImage() {
-		new AltosFlashUI(AltosUI.this);
+		AltosFlashUI.show(AltosUI.this);
 	}
 
 	void FireIgniter() {
 		new AltosIgniteUI(AltosUI.this);
 	}
 
+	void ScanChannels() {
+		new AltosScanUI(AltosUI.this);
+	}
+
 	/*
 	 * Replay a flight from telemetry data
 	 */
@@ -401,9 +409,9 @@ public class AltosUI extends JFrame {
 			AltosUI altosui = new AltosUI();
 			altosui.setVisible(true);
 
-			AltosDevice[] devices = AltosUSBDevice.list(Altos.product_basestation);
-			for (int i = 0; i < devices.length; i++)
-				altosui.telemetry_window(devices[i]);
+			java.util.List<AltosDevice> devices = AltosUSBDevice.list(Altos.product_basestation);
+			for (AltosDevice device : devices)
+				altosui.telemetry_window(device);
 		}
 	}
 }