projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Execute self-test on MMA655X part
[fw/altos]
/
altosui
/
AltosConfig.java
diff --git
a/altosui/AltosConfig.java
b/altosui/AltosConfig.java
index e1ffebb4b95f1129144e1a86c70dadf2915ae78d..e1805fc12be91d70b1365f86d08dc8e019985ea1 100644
(file)
--- a/
altosui/AltosConfig.java
+++ b/
altosui/AltosConfig.java
@@
-21,8
+21,9
@@
import java.awt.event.*;
import javax.swing.*;
import java.io.*;
import java.util.concurrent.*;
import javax.swing.*;
import java.io.*;
import java.util.concurrent.*;
-import org.altusmetrum.AltosLib.*;
import java.text.*;
import java.text.*;
+import org.altusmetrum.altoslib_3.*;
+import org.altusmetrum.altosuilib_1.*;
public class AltosConfig implements ActionListener {
public class AltosConfig implements ActionListener {
@@
-160,9
+161,9
@@
public class AltosConfig implements ActionListener {
} finally {
try {
stop_serial();
} finally {
try {
stop_serial();
+ serial_line.close();
} catch (InterruptedException ie) {
}
} catch (InterruptedException ie) {
}
- serial_line.close();
}
}
}
}
@@
-270,7
+271,7
@@
public class AltosConfig implements ActionListener {
public AltosConfig(JFrame given_owner) {
owner = given_owner;
public AltosConfig(JFrame given_owner) {
owner = given_owner;
- device = AltosDeviceDialog.show(owner, Altos.product_any);
+ device = AltosDevice
UI
Dialog.show(owner, Altos.product_any);
if (device != null) {
try {
serial_line = new AltosSerial(device);
if (device != null) {
try {
serial_line = new AltosSerial(device);