projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Easy Motor v2 x axis is inverted
[fw/altos]
/
altosui
/
AltosIdleMonitorUI.java
diff --git
a/altosui/AltosIdleMonitorUI.java
b/altosui/AltosIdleMonitorUI.java
index 4d5c3b2df7661f96c6f91b67a8e7120bcd7d830a..50994bb27293d55c71e3af9b5311339a49b4ffc6 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;
@@
-34,12
+34,12
@@
public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
AltosPad pad;
AltosInfoTable flightInfo;
AltosFlightStatus flightStatus;
AltosPad pad;
AltosInfoTable flightInfo;
AltosFlightStatus flightStatus;
- AltosIgnitor ignit
o
r;
+ AltosIgnitor ignit
e
r;
AltosIdleMonitor thread;
AltosUIMap sitemap;
int serial;
boolean remote;
AltosIdleMonitor thread;
AltosUIMap sitemap;
int serial;
boolean remote;
- boolean has_ignit
o
r;
+ boolean has_ignit
e
r;
boolean has_map;
void stop_display() {
boolean has_map;
void stop_display() {
@@
-75,15
+75,15
@@
public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
public void show(AltosState state, AltosListenerState listener_state) {
status_update.saved_state = state;
public void show(AltosState state, AltosListenerState listener_state) {
status_update.saved_state = state;
- if (ignit
o
r.should_show(state)) {
- if (!has_ignit
o
r) {
- pane.add("Ignitor", ignit
o
r);
- has_ignit
o
r = true;
+ if (ignit
e
r.should_show(state)) {
+ if (!has_ignit
e
r) {
+ pane.add("Ignitor", ignit
e
r);
+ has_ignit
e
r = true;
}
} else {
}
} else {
- if (has_ignit
o
r) {
- pane.remove(ignit
o
r);
- has_ignit
o
r = false;
+ if (has_ignit
e
r) {
+ pane.remove(ignit
e
r);
+ has_ignit
e
r = false;
}
}
if (state.gps != null && state.gps.connected) {
}
}
if (state.gps != null && state.gps.connected) {
@@
-102,8
+102,8
@@
public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
pad.show(state, listener_state);
flightStatus.show(state, listener_state);
flightInfo.show(state, listener_state);
pad.show(state, listener_state);
flightStatus.show(state, listener_state);
flightInfo.show(state, listener_state);
- if (has_ignit
o
r)
- ignit
o
r.show(state, listener_state);
+ if (has_ignit
e
r)
+ ignit
e
r.show(state, listener_state);
if (has_map)
sitemap.show(state, listener_state);
// } catch (Exception e) {
if (has_map)
sitemap.show(state, listener_state);
// } catch (Exception e) {
@@
-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()));
@@
-274,7
+274,7
@@
public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
flightInfo = new AltosInfoTable();
pane.add("Table", new JScrollPane(flightInfo));
flightInfo = new AltosInfoTable();
pane.add("Table", new JScrollPane(flightInfo));
- ignit
o
r = new AltosIgnitor();
+ ignit
e
r = new AltosIgnitor();
sitemap = new AltosUIMap();
sitemap = new AltosUIMap();
@@
-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);