projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Add Configure Ground Station dialog (trac #29)
[fw/altos]
/
altosui
/
AltosUI.java
diff --git
a/altosui/AltosUI.java
b/altosui/AltosUI.java
index 89f66c0604521bf89e3de6c10d25586345bd2658..75a12ecef1b6d0f174e37281098ae49d76e7ebd6 100644
(file)
--- a/
altosui/AltosUI.java
+++ b/
altosui/AltosUI.java
@@
-165,28
+165,29
@@
public class AltosUI extends AltosFrame {
}
});
b.setToolTipText("Global AltosUI settings");
}
});
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) {
b.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
-
FlashImag
e();
+
ConfigureTeleDongl
e();
}
});
}
});
- b.setToolTipText("Replace the firmware in any AltusMetrum product");
- b = addButton(3, 1, "F
ire Igniter
");
+ b = addButton(3, 1, "F
lash Image
");
b.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
b.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
- F
ireIgniter
();
+ F
lashImage
();
}
});
}
});
- 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) {
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) {
b = addButton(0, 2, "Scan Channels");
b.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
@@
-216,6
+217,14
@@
public class AltosUI extends AltosFrame {
}
});
}
});
+ b = addButton(4, 2, "Quit");
+ b.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ System.exit(0);
+ }
+ });
+ b.setToolTipText("Close all active windows and terminate AltosUI");
+
setTitle("AltOS");
pane.doLayout();
setTitle("AltOS");
pane.doLayout();
@@
-262,6
+271,10
@@
public class AltosUI extends AltosFrame {
new AltosConfig(AltosUI.this);
}
new AltosConfig(AltosUI.this);
}
+ void ConfigureTeleDongle() {
+ new AltosConfigTD(AltosUI.this);
+ }
+
void FlashImage() {
AltosFlashUI.show(AltosUI.this);
}
void FlashImage() {
AltosFlashUI.show(AltosUI.this);
}