projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/micropeak-logging'
[fw/altos]
/
altosui
/
AltosUI.java
diff --git
a/altosui/AltosUI.java
b/altosui/AltosUI.java
index dcc0de600817aab22666705581ffe42afa8de996..70142a93b5d3beeb6d7e0a8c75b8308e31800273 100644
(file)
--- a/
altosui/AltosUI.java
+++ b/
altosui/AltosUI.java
@@
-23,8
+23,9
@@
import javax.swing.*;
import java.io.*;
import java.util.concurrent.*;
import org.altusmetrum.AltosLib.*;
import java.io.*;
import java.util.concurrent.*;
import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altosuilib.*;
-public class AltosUI extends AltosFrame {
+public class AltosUI extends Altos
UI
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) {
@@
-241,7
+242,7
@@
public class AltosUI extends AltosFrame {
}
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)