summaryrefslogtreecommitdiff
path: root/altosui/AltosEepromDownload.java
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2011-08-08 01:47:29 -0700
committerKeith Packard <keithp@keithp.com>2011-08-08 12:13:29 -0700
commit0e3e4f9c1e6a6bf972514f12c9d622258aa2aec2 (patch)
treec84c97e27556d0686bf26ea9e4f1af976cd9b1c7 /altosui/AltosEepromDownload.java
parentf03ca0ab8799bfa5100eaa2577cfd7b9c37d05bf (diff)
altosui: Convert from channels to frequencies
Major areas: * Preferences are stored as frequencies instead of channels * Serial configuration is done using frequencies * UI is presented with frequency lists Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'altosui/AltosEepromDownload.java')
-rw-r--r--altosui/AltosEepromDownload.java13
1 files changed, 7 insertions, 6 deletions
diff --git a/altosui/AltosEepromDownload.java b/altosui/AltosEepromDownload.java
index 82f01ef5..64dcdff7 100644
--- a/altosui/AltosEepromDownload.java
+++ b/altosui/AltosEepromDownload.java
@@ -264,11 +264,11 @@ public class AltosEepromDownload implements Runnable {
}
public void run () {
- if (remote)
- serial_line.start_remote();
-
try {
boolean failed = false;
+ if (remote)
+ serial_line.start_remote();
+
for (AltosEepromLog log : flights) {
parse_exception = null;
if (log.download) {
@@ -295,11 +295,12 @@ public class AltosEepromDownload implements Runnable {
serial_line.device.toShortString()),
"Connection Failed",
JOptionPane.ERROR_MESSAGE);
+ } finally {
+ if (remote)
+ serial_line.stop_remote();
+ serial_line.flush_output();
}
- if (remote)
- serial_line.stop_remote();
monitor.done();
- serial_line.flush_output();
if (listener != null) {
Runnable r = new Runnable() {
public void run() {