projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Simplify discovery of log end position
[fw/altos]
/
altosui
/
AltosIdleMonitorUI.java
diff --git
a/altosui/AltosIdleMonitorUI.java
b/altosui/AltosIdleMonitorUI.java
index afa9b944eb9a6a8f338760db898beb31abbf7914..ba894c71885663a4a2962c719718c73f25c2a369 100644
(file)
--- a/
altosui/AltosIdleMonitorUI.java
+++ b/
altosui/AltosIdleMonitorUI.java
@@
-25,8
+25,8
@@
import javax.swing.event.*;
import java.io.*;
import java.util.concurrent.*;
import java.util.Arrays;
import java.io.*;
import java.util.concurrent.*;
import java.util.Arrays;
-import org.altusmetrum.altoslib_1
1
.*;
-import org.altusmetrum.altosuilib_1
1
.*;
+import org.altusmetrum.altoslib_1
4
.*;
+import org.altusmetrum.altosuilib_1
4
.*;
public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDisplay, AltosIdleMonitorListener, DocumentListener {
AltosDevice device;
public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDisplay, AltosIdleMonitorListener, DocumentListener {
AltosDevice device;
@@
-209,7
+209,7
@@
public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
device = AltosDeviceUIDialog.show(in_owner, Altos.product_any);
remote = false;
device = AltosDeviceUIDialog.show(in_owner, Altos.product_any);
remote = false;
- if (
!device.matchProduct(Altos.product_altimeter
))
+ if (
device.matchProduct(Altos.product_basestation
))
remote = true;
serial = device.getSerial();
remote = true;
serial = device.getSerial();
@@
-226,7
+226,7
@@
public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
/* We let the user set the freq/callsign, so don't bother with the cancel dialog */
link.set_cancel_enable(false);
/* We let the user set the freq/callsign, so don't bother with the cancel dialog */
link.set_cancel_enable(false);
- bag = get
Content
Pane();
+ bag = get
Scrollable
Pane();
bag.setLayout(new GridBagLayout());
setTitle(String.format("AltOS %s", device.toShortString()));
bag.setLayout(new GridBagLayout());
setTitle(String.format("AltOS %s", device.toShortString()));
@@
-295,7
+295,9
@@
public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
pack();
setVisible(true);
pack();
setVisible(true);
- thread = new AltosIdleMonitor((AltosIdleMonitorListener) this, link, (boolean) remote);
+ thread = new AltosIdleMonitor(this, link, (boolean) remote);
+
+ thread.set_frequency(AltosUIPreferences.frequency(serial));
status_update = new AltosFlightStatusUpdate(flightStatus);
status_update = new AltosFlightStatusUpdate(flightStatus);