projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
[fw/altos]
/
altosui
/
AltosConfigFC.java
diff --git
a/altosui/AltosConfigFC.java
b/altosui/AltosConfigFC.java
index beff71b7279db119e094f10f8cae37688dfcae14..01ba9c0d37639c02417a21b3a10f42935e86ad77 100644
(file)
--- a/
altosui/AltosConfigFC.java
+++ b/
altosui/AltosConfigFC.java
@@
-23,8
+23,8
@@
import javax.swing.*;
import java.io.*;
import java.util.concurrent.*;
import java.text.*;
import java.io.*;
import java.util.concurrent.*;
import java.text.*;
-import org.altusmetrum.altoslib_1
2
.*;
-import org.altusmetrum.altosuilib_1
2
.*;
+import org.altusmetrum.altoslib_1
3
.*;
+import org.altusmetrum.altosuilib_1
3
.*;
public class AltosConfigFC implements ActionListener {
public class AltosConfigFC implements ActionListener {
@@
-268,6
+268,13
@@
public class AltosConfigFC implements ActionListener {
if (serial_line != null)
serial_line.close();
}
if (serial_line != null)
serial_line.close();
}
+ else if (cmd.equals("Accel")) {
+ if (data.pad_orientation != AltosLib.MISSING) {
+ AltosUIAccelCal accel_ui = new AltosUIAccelCal(owner, serial_line, config_ui);
+ if (accel_ui != null)
+ accel_ui.doit();
+ }
+ }
} catch (InterruptedException ie) {
abort();
} catch (TimeoutException te) {
} catch (InterruptedException ie) {
abort();
} catch (TimeoutException te) {