X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosUI.java;h=6993abab92ae2e49bb03cf621f537b56e50f065a;hb=bdfcc9112c41c494de23594963980a730b625cc4;hp=89f66c0604521bf89e3de6c10d25586345bd2658;hpb=170510bb183715e9ba580b180f20657d6602644e;p=fw%2Faltos diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java index 89f66c06..6993abab 100644 --- a/altosui/AltosUI.java +++ b/altosui/AltosUI.java @@ -165,28 +165,29 @@ public class AltosUI extends AltosFrame { } }); b.setToolTipText("Global AltosUI settings"); - b = addButton(2, 1, "Flash Image"); + + b = addButton(2, 1, "Configure Ground Station"); b.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - FlashImage(); + ConfigureTeleDongle(); } }); - b.setToolTipText("Replace the firmware in any AltusMetrum product"); - b = addButton(3, 1, "Fire Igniter"); + b = addButton(3, 1, "Flash Image"); b.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - FireIgniter(); + FlashImage(); } }); - b.setToolTipText("Remote control of igniters for deployment testing"); - b = addButton(4, 1, "Quit"); + b.setToolTipText("Replace the firmware in any AltusMetrum product"); + + b = addButton(4, 1, "Fire Igniter"); b.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - System.exit(0); + FireIgniter(); } }); - b.setToolTipText("Close all active windows and terminate AltosUI"); + b.setToolTipText("Remote control of igniters for deployment testing"); b = addButton(0, 2, "Scan Channels"); b.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -209,12 +210,20 @@ public class AltosUI extends AltosFrame { }); b.setToolTipText("Check flight readiness of altimeter in idle mode"); - b = addButton(3, 2, "Launch Controller"); +// b = addButton(3, 2, "Launch Controller"); +// b.addActionListener(new ActionListener() { +// public void actionPerformed(ActionEvent e) { +// LaunchController(); +// } +// }); + + b = addButton(4, 2, "Quit"); b.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - LaunchController(); + System.exit(0); } }); + b.setToolTipText("Close all active windows and terminate AltosUI"); setTitle("AltOS"); @@ -262,6 +271,10 @@ public class AltosUI extends AltosFrame { new AltosConfig(AltosUI.this); } + void ConfigureTeleDongle() { + new AltosConfigTD(AltosUI.this); + } + void FlashImage() { AltosFlashUI.show(AltosUI.this); }