projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Shorten help strings
[fw/altos]
/
altosui
/
AltosUI.java
diff --git
a/altosui/AltosUI.java
b/altosui/AltosUI.java
index 3e5bcf434fc5b8b8276fe2074873e528d8032d74..6993abab92ae2e49bb03cf621f537b56e50f065a 100644
(file)
--- a/
altosui/AltosUI.java
+++ b/
altosui/AltosUI.java
@@
-30,7
+30,7
@@
import java.util.concurrent.*;
import libaltosJNI.*;
import libaltosJNI.*;
-public class AltosUI extends
J
Frame {
+public class AltosUI extends
Altos
Frame {
public AltosVoice voice = new AltosVoice();
public static boolean load_library(Frame frame) {
public AltosVoice voice = new AltosVoice();
public static boolean load_library(Frame frame) {
@@
-165,28
+165,29
@@
public class AltosUI extends JFrame {
}
});
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) {
@@
-209,12
+210,20
@@
public class AltosUI extends JFrame {
});
b.setToolTipText("Check flight readiness of altimeter in idle mode");
});
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) {
b.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
-
LaunchController(
);
+
System.exit(0
);
}
});
}
});
+ b.setToolTipText("Close all active windows and terminate AltosUI");
setTitle("AltOS");
setTitle("AltOS");
@@
-262,6
+271,10
@@
public class AltosUI extends JFrame {
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);
}
@@
-423,17
+436,17
@@
public class AltosUI extends JFrame {
}
}
}
}
- static AltosRecordIterable record_iterable
_file(String filenam
e) {
+ static AltosRecordIterable record_iterable
(File fil
e) {
FileInputStream in;
try {
FileInputStream in;
try {
- in = new FileInputStream(file
name
);
+ in = new FileInputStream(file);
} catch (Exception e) {
} catch (Exception e) {
- System.out.printf("Failed to open file '%s'\n", file
name
);
+ System.out.printf("Failed to open file '%s'\n", file);
return null;
}
AltosRecordIterable recs;
AltosReplayReader reader;
return null;
}
AltosRecordIterable recs;
AltosReplayReader reader;
- if (file
name
.endsWith("eeprom")) {
+ if (file
.getName()
.endsWith("eeprom")) {
recs = new AltosEepromIterable(in);
} else {
recs = new AltosTelemetryIterable(in);
recs = new AltosEepromIterable(in);
} else {
recs = new AltosTelemetryIterable(in);
@@
-441,6
+454,10
@@
public class AltosUI extends JFrame {
return recs;
}
return recs;
}
+ static AltosRecordIterable record_iterable_file(String filename) {
+ return record_iterable (new File(filename));
+ }
+
static AltosReplayReader replay_file(String filename) {
AltosRecordIterable recs = record_iterable_file(filename);
if (recs == null)
static AltosReplayReader replay_file(String filename) {
AltosRecordIterable recs = record_iterable_file(filename);
if (recs == null)
@@
-466,9
+483,9
@@
public class AltosUI extends JFrame {
}
static void process_summary(String filename) {
}
static void process_summary(String filename) {
- AltosRe
playReader reader = replay
_file(filename);
+ AltosRe
cordIterable iterable = record_iterable
_file(filename);
try {
try {
- AltosFlightStats stats = new AltosFlightStats(
reader
);
+ AltosFlightStats stats = new AltosFlightStats(
iterable
);
if (stats.serial > 0)
System.out.printf("Serial: %5d\n", stats.serial);
if (stats.flight > 0)
if (stats.serial > 0)
System.out.printf("Serial: %5d\n", stats.serial);
if (stats.flight > 0)
@@
-519,7
+536,7
@@
public class AltosUI extends JFrame {
public static void main(final String[] args) {
try {
public static void main(final String[] args) {
try {
- UIManager.setLookAndFeel(
UIManager.getSystemLookAndFeelClassName
());
+ UIManager.setLookAndFeel(
AltosPreferences.look_and_feel
());
} catch (Exception e) {
}
/* Handle batch-mode */
} catch (Exception e) {
}
/* Handle batch-mode */