projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
doc: Start filling in details about Altos Droid flight monitoring
[fw/altos]
/
altosui
/
AltosUI.java
diff --git
a/altosui/AltosUI.java
b/altosui/AltosUI.java
index 89f66c0604521bf89e3de6c10d25586345bd2658..9f8f6ddac4285a0bee154d6267b52e429ec01d54 100644
(file)
--- a/
altosui/AltosUI.java
+++ b/
altosui/AltosUI.java
@@
-20,17
+20,12
@@
package altosui;
import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
-import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.*;
import java.io.*;
import java.io.*;
-import java.util.*;
-import java.text.*;
-import java.util.prefs.*;
import java.util.concurrent.*;
import java.util.concurrent.*;
+import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altosuilib_1.*;
-import libaltosJNI.*;
-
-public class AltosUI extends AltosFrame {
+public class AltosUI extends AltosUIFrame {
public AltosVoice voice = new AltosVoice();
public static boolean load_library(Frame frame) {
public AltosVoice voice = new AltosVoice();
public static boolean load_library(Frame frame) {
@@
-47,13
+42,13
@@
public class AltosUI extends AltosFrame {
void telemetry_window(AltosDevice device) {
try {
void telemetry_window(AltosDevice device) {
try {
- AltosFlightReader reader = new AltosTelemetryReader(
device
);
+ AltosFlightReader reader = new AltosTelemetryReader(
new AltosSerial(device)
);
if (reader != null)
new AltosFlightUI(voice, reader, device.getSerial());
} catch (FileNotFoundException ee) {
JOptionPane.showMessageDialog(AltosUI.this,
ee.getMessage(),
if (reader != null)
new AltosFlightUI(voice, reader, device.getSerial());
} catch (FileNotFoundException ee) {
JOptionPane.showMessageDialog(AltosUI.this,
ee.getMessage(),
-
"Cannot open target device"
,
+
String.format ("Cannot open %s", device.toShortString())
,
JOptionPane.ERROR_MESSAGE);
} catch (AltosSerialInUseException si) {
JOptionPane.showMessageDialog(AltosUI.this,
JOptionPane.ERROR_MESSAGE);
} catch (AltosSerialInUseException si) {
JOptionPane.showMessageDialog(AltosUI.this,
@@
-63,17
+58,17
@@
public class AltosUI extends AltosFrame {
JOptionPane.ERROR_MESSAGE);
} catch (IOException ee) {
JOptionPane.showMessageDialog(AltosUI.this,
JOptionPane.ERROR_MESSAGE);
} catch (IOException ee) {
JOptionPane.showMessageDialog(AltosUI.this,
-
device.toShortString(
),
- "Unk
on
wn I/O error",
+
String.format ("Unknown I/O error on %s", device.toShortString()
),
+ "Unk
no
wn I/O error",
JOptionPane.ERROR_MESSAGE);
} catch (TimeoutException te) {
JOptionPane.showMessageDialog(this,
JOptionPane.ERROR_MESSAGE);
} catch (TimeoutException te) {
JOptionPane.showMessageDialog(this,
-
device.toShortString(
),
+
String.format ("Timeout on %s", device.toShortString()
),
"Timeout error",
JOptionPane.ERROR_MESSAGE);
} catch (InterruptedException ie) {
JOptionPane.showMessageDialog(this,
"Timeout error",
JOptionPane.ERROR_MESSAGE);
} catch (InterruptedException ie) {
JOptionPane.showMessageDialog(this,
-
device.toShortString(
),
+
String.format("Interrupted %s", device.toShortString()
),
"Interrupted exception",
JOptionPane.ERROR_MESSAGE);
}
"Interrupted exception",
JOptionPane.ERROR_MESSAGE);
}
@@
-93,7
+88,7
@@
public class AltosUI extends AltosFrame {
c.weighty = 1;
b = new JButton(label);
c.weighty = 1;
b = new JButton(label);
- Dimension ps = b.getPreferredSize();
+
//
Dimension ps = b.getPreferredSize();
gridbag.setConstraints(b, c);
add(b, c);
gridbag.setConstraints(b, c);
add(b, c);
@@
-104,11
+99,7
@@
public class AltosUI extends AltosFrame {
load_library(null);
load_library(null);
- java.net.URL imgURL = AltosUI.class.getResource("/altus-metrum-16x16.jpg");
- if (imgURL != null)
- setIconImage(new ImageIcon(imgURL).getImage());
-
- AltosPreferences.set_component(this);
+ AltosUIPreferences.set_component(this);
pane = getContentPane();
gridbag = new GridBagLayout();
pane = getContentPane();
gridbag = new GridBagLayout();
@@
-165,28
+156,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) {
@@
-209,12
+201,20
@@
public class AltosUI extends AltosFrame {
});
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");
@@
-224,14
+224,6
@@
public class AltosUI extends AltosFrame {
doLayout();
validate();
doLayout();
validate();
- setVisible(true);
-
- Insets i = getInsets();
- Dimension ps = rootPane.getPreferredSize();
- ps.width += i.left + i.right;
- ps.height += i.top + i.bottom;
- setPreferredSize(ps);
- setSize(ps);
setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
addWindowListener(new WindowAdapter() {
@Override
setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
addWindowListener(new WindowAdapter() {
@Override
@@
-239,10
+231,15
@@
public class AltosUI extends AltosFrame {
System.exit(0);
}
});
System.exit(0);
}
});
+
+ setLocationByPlatform(false);
+
+ /* Insets aren't set before the window is visible */
+ setVisible(true);
}
private void ConnectToDevice() {
}
private void ConnectToDevice() {
- AltosDevice device = AltosDeviceDialog.show(AltosUI.this,
+ AltosDevice device = AltosDevice
UI
Dialog.show(AltosUI.this,
Altos.product_basestation);
if (device != null)
Altos.product_basestation);
if (device != null)
@@
-253,15
+250,19
@@
public class AltosUI extends AltosFrame {
String result;
result = JOptionPane.showInputDialog(AltosUI.this,
"Configure Callsign",
String result;
result = JOptionPane.showInputDialog(AltosUI.this,
"Configure Callsign",
- AltosPreferences.callsign());
+ Altos
UI
Preferences.callsign());
if (result != null)
if (result != null)
- AltosPreferences.set_callsign(result);
+ Altos
UI
Preferences.set_callsign(result);
}
void ConfigureTeleMetrum() {
new AltosConfig(AltosUI.this);
}
}
void ConfigureTeleMetrum() {
new AltosConfig(AltosUI.this);
}
+ void ConfigureTeleDongle() {
+ new AltosConfigTD(AltosUI.this);
+ }
+
void FlashImage() {
AltosFlashUI.show(AltosUI.this);
}
void FlashImage() {
AltosFlashUI.show(AltosUI.this);
}
@@
-327,7
+328,7
@@
public class AltosUI extends AltosFrame {
if (record_reader == null)
return;
try {
if (record_reader == null)
return;
try {
- new AltosGraphUI(record_reader, chooser.file
name
());
+ new AltosGraphUI(record_reader, chooser.file());
} catch (InterruptedException ie) {
} catch (IOException ie) {
}
} catch (InterruptedException ie) {
} catch (IOException ie) {
}
@@
-344,14
+345,15
@@
public class AltosUI extends AltosFrame {
}
}
}
}
- static AltosRecordIterable open_logfile(String filename) {
- File file = new File (filename);
+ static AltosRecordIterable open_logfile(File file) {
try {
FileInputStream in;
in = new FileInputStream(file);
try {
FileInputStream in;
in = new FileInputStream(file);
- if (file
name
.endsWith("eeprom"))
+ if (file
.getName()
.endsWith("eeprom"))
return new AltosEepromIterable(in);
return new AltosEepromIterable(in);
+ else if (file.getName().endsWith("mega"))
+ return new AltosEepromMegaIterable(in);
else
return new AltosTelemetryIterable(in);
} catch (FileNotFoundException fe) {
else
return new AltosTelemetryIterable(in);
} catch (FileNotFoundException fe) {
@@
-360,8
+362,7
@@
public class AltosUI extends AltosFrame {
}
}
}
}
- static AltosWriter open_csv(String filename) {
- File file = new File (filename);
+ static AltosWriter open_csv(File file) {
try {
return new AltosCSV(file);
} catch (FileNotFoundException fe) {
try {
return new AltosCSV(file);
} catch (FileNotFoundException fe) {
@@
-370,8
+371,7
@@
public class AltosUI extends AltosFrame {
}
}
}
}
- static AltosWriter open_kml(String filename) {
- File file = new File (filename);
+ static AltosWriter open_kml(File file) {
try {
return new AltosKML(file);
} catch (FileNotFoundException fe) {
try {
return new AltosKML(file);
} catch (FileNotFoundException fe) {
@@
-387,39
+387,43
@@
public class AltosUI extends AltosFrame {
static final int process_replay = 4;
static final int process_summary = 5;
static final int process_replay = 4;
static final int process_summary = 5;
- static
void process_csv(String
input) {
+ static
boolean process_csv(File
input) {
AltosRecordIterable iterable = open_logfile(input);
if (iterable == null)
AltosRecordIterable iterable = open_logfile(input);
if (iterable == null)
- return;
+ return
false
;
-
String
output = Altos.replace_extension(input,".csv");
+
File
output = Altos.replace_extension(input,".csv");
System.out.printf("Processing \"%s\" to \"%s\"\n", input, output);
if (input.equals(output)) {
System.out.printf("Not processing '%s'\n", input);
System.out.printf("Processing \"%s\" to \"%s\"\n", input, output);
if (input.equals(output)) {
System.out.printf("Not processing '%s'\n", input);
+ return false;
} else {
AltosWriter writer = open_csv(output);
if (writer == null)
} else {
AltosWriter writer = open_csv(output);
if (writer == null)
- return;
+ return
false
;
writer.write(iterable);
writer.close();
}
writer.write(iterable);
writer.close();
}
+ return true;
}
}
- static
void process_kml(String
input) {
+ static
boolean process_kml(File
input) {
AltosRecordIterable iterable = open_logfile(input);
if (iterable == null)
AltosRecordIterable iterable = open_logfile(input);
if (iterable == null)
- return;
+ return
false
;
-
String
output = Altos.replace_extension(input,".kml");
+
File
output = Altos.replace_extension(input,".kml");
System.out.printf("Processing \"%s\" to \"%s\"\n", input, output);
if (input.equals(output)) {
System.out.printf("Not processing '%s'\n", input);
System.out.printf("Processing \"%s\" to \"%s\"\n", input, output);
if (input.equals(output)) {
System.out.printf("Not processing '%s'\n", input);
+ return false;
} else {
AltosWriter writer = open_kml(output);
if (writer == null)
} else {
AltosWriter writer = open_kml(output);
if (writer == null)
- return;
+ return
false
;
writer.write(iterable);
writer.close();
writer.write(iterable);
writer.close();
+ return true;
}
}
}
}
@@
-432,45
+436,50
@@
public class AltosUI extends AltosFrame {
return null;
}
AltosRecordIterable recs;
return null;
}
AltosRecordIterable recs;
- AltosReplayReader reader;
+
//
AltosReplayReader reader;
if (file.getName().endsWith("eeprom")) {
recs = new AltosEepromIterable(in);
if (file.getName().endsWith("eeprom")) {
recs = new AltosEepromIterable(in);
+ } else if (file.getName().endsWith("mega")) {
+ recs = new AltosEepromMegaIterable(in);
} else {
recs = new AltosTelemetryIterable(in);
}
return recs;
}
} else {
recs = new AltosTelemetryIterable(in);
}
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);
+ static AltosReplayReader replay_file(File file) {
+ AltosRecordIterable recs = record_iterable(file);
if (recs == null)
return null;
if (recs == null)
return null;
- return new AltosReplayReader(recs.iterator(),
new File(filename)
);
+ return new AltosReplayReader(recs.iterator(),
file
);
}
}
- static void process_replay(String filename) {
- AltosReplayReader reader = replay_file(filename);
+ static boolean process_replay(File file) {
+ AltosReplayReader reader = replay_file(file);
+ if (reader == null)
+ return false;
AltosFlightUI flight_ui = new AltosFlightUI(new AltosVoice(), reader);
flight_ui.set_exit_on_close();
AltosFlightUI flight_ui = new AltosFlightUI(new AltosVoice(), reader);
flight_ui.set_exit_on_close();
+ return true;
}
}
- static
void process_graph(String filenam
e) {
- AltosRecordIterable recs = record_iterable
_file(filenam
e);
+ static
boolean process_graph(File fil
e) {
+ AltosRecordIterable recs = record_iterable
(fil
e);
if (recs == null)
if (recs == null)
- return;
+ return
false
;
try {
try {
- new AltosGraphUI(recs, filename);
+ new AltosGraphUI(recs, file);
+ return true;
} catch (InterruptedException ie) {
} catch (IOException ie) {
}
} catch (InterruptedException ie) {
} catch (IOException ie) {
}
+ return false;
}
}
- static void process_summary(String filename) {
- AltosRecordIterable iterable = record_iterable_file(filename);
+ static boolean process_summary(File file) {
+ AltosRecordIterable iterable = record_iterable(file);
+ if (iterable == null)
+ return false;
try {
AltosFlightStats stats = new AltosFlightStats(iterable);
if (stats.serial > 0)
try {
AltosFlightStats stats = new AltosFlightStats(iterable);
if (stats.serial > 0)
@@
-505,9
+514,11
@@
public class AltosUI extends AltosFrame {
System.out.printf("Flight time: %6.0f s\n",
stats.state_end[Altos.ao_flight_main] -
stats.state_start[Altos.ao_flight_boost]);
System.out.printf("Flight time: %6.0f s\n",
stats.state_end[Altos.ao_flight_main] -
stats.state_start[Altos.ao_flight_boost]);
+ return true;
} catch (InterruptedException ie) {
} catch (IOException ie) {
}
} catch (InterruptedException ie) {
} catch (IOException ie) {
}
+ return false;
}
public static void help(int code) {
}
public static void help(int code) {
@@
-522,14
+533,15
@@
public class AltosUI extends AltosFrame {
}
public static void main(final String[] args) {
}
public static void main(final String[] args) {
+ int errors = 0;
+ load_library(null);
try {
try {
- UIManager.setLookAndFeel(AltosPreferences.look_and_feel());
+ UIManager.setLookAndFeel(Altos
UI
Preferences.look_and_feel());
} catch (Exception e) {
}
/* Handle batch-mode */
if (args.length == 0) {
AltosUI altosui = new AltosUI();
} catch (Exception e) {
}
/* Handle batch-mode */
if (args.length == 0) {
AltosUI altosui = new AltosUI();
- altosui.setVisible(true);
java.util.List<AltosDevice> devices = AltosUSBDevice.list(Altos.product_basestation);
for (AltosDevice device : devices)
java.util.List<AltosDevice> devices = AltosUSBDevice.list(Altos.product_basestation);
for (AltosDevice device : devices)
@@
-561,26
+573,34
@@
public class AltosUI extends AltosFrame {
else if (args[i].startsWith("--"))
help(1);
else {
else if (args[i].startsWith("--"))
help(1);
else {
+ File file = new File(args[i]);
switch (process) {
case process_none:
case process_graph:
switch (process) {
case process_none:
case process_graph:
- process_graph(args[i]);
+ if (!process_graph(file))
+ ++errors;
break;
case process_replay:
break;
case process_replay:
- process_replay(args[i]);
+ if (!process_replay(file))
+ ++errors;
break;
case process_kml:
break;
case process_kml:
- process_kml(args[i]);
+ if (!process_kml(file))
+ ++errors;
break;
case process_csv:
break;
case process_csv:
- process_csv(args[i]);
+ if (!process_csv(file))
+ ++errors;
break;
case process_summary:
break;
case process_summary:
- process_summary(args[i]);
+ if (!process_summary(file))
+ ++errors;
break;
}
}
}
}
break;
}
}
}
}
+ if (errors != 0)
+ System.exit(errors);
}
}
}
}