projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Split out UI-specific preferences
[fw/altos]
/
altosui
/
AltosIdleMonitorUI.java
diff --git
a/altosui/AltosIdleMonitorUI.java
b/altosui/AltosIdleMonitorUI.java
index dbac2d332c5fbbf84812fc18549e3e806ea3b667..8eb0d520c339f88ad5d99c5a87d1f9561e580dfd 100644
(file)
--- a/
altosui/AltosIdleMonitorUI.java
+++ b/
altosui/AltosIdleMonitorUI.java
@@
-90,7
+90,9
@@
class AltosADC {
}
class AltosGPSQuery extends AltosGPS {
}
class AltosGPSQuery extends AltosGPS {
- public AltosGPSQuery (AltosSerial serial) throws TimeoutException, InterruptedException {
+ public AltosGPSQuery (AltosSerial serial, AltosConfigData config_data)
+ throws TimeoutException, InterruptedException {
+ boolean says_done = config_data.compare_version("1.0") >= 0;
serial.printf("g\n");
for (;;) {
String line = serial.get_reply_no_dialog(5000);
serial.printf("g\n");
for (;;) {
String line = serial.get_reply_no_dialog(5000);
@@
-140,6
+142,8
@@
class AltosGPSQuery extends AltosGPS {
int status = Integer.decode(bits[1]);
connected = (status & Altos.AO_GPS_RUNNING) != 0;
locked = (status & Altos.AO_GPS_VALID) != 0;
int status = Integer.decode(bits[1]);
connected = (status & Altos.AO_GPS_RUNNING) != 0;
locked = (status & Altos.AO_GPS_VALID) != 0;
+ if (!says_done)
+ break;
continue;
}
if (line.startsWith("Sats:")) {
continue;
}
if (line.startsWith("Sats:")) {
@@
-184,7
+188,7
@@
class AltosIdleMonitor extends Thread {
serial.flush_input();
config_data = new AltosConfigData(serial);
adc = new AltosADC(serial);
serial.flush_input();
config_data = new AltosConfigData(serial);
adc = new AltosADC(serial);
- gps = new AltosGPSQuery(serial);
+ gps = new AltosGPSQuery(serial
, config_data
);
} finally {
if (remote)
serial.stop_remote();
} finally {
if (remote)
serial.stop_remote();
@@
-237,6
+241,8
@@
class AltosIdleMonitor extends Thread {
update_state();
post_state();
} catch (TimeoutException te) {
update_state();
post_state();
} catch (TimeoutException te) {
+ if (AltosSerial.debug)
+ System.out.printf ("monitor idle data timeout\n");
}
Thread.sleep(1000);
}
}
Thread.sleep(1000);
}
@@
-336,12
+342,12
@@
public class AltosIdleMonitorUI extends AltosFrame implements AltosFlightDisplay
/* Stick frequency selector at top of table for telemetry monitoring */
if (remote && serial >= 0) {
// Frequency menu
/* Stick frequency selector at top of table for telemetry monitoring */
if (remote && serial >= 0) {
// Frequency menu
- frequencies = new AltosFreqList(AltosPreferences.frequency(serial));
+ frequencies = new AltosFreqList(Altos
UI
Preferences.frequency(serial));
frequencies.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
double frequency = frequencies.frequency();
thread.set_frequency(frequency);
frequencies.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
double frequency = frequencies.frequency();
thread.set_frequency(frequency);
- AltosPreferences.set_frequency(device.getSerial(),
+ Altos
UI
Preferences.set_frequency(device.getSerial(),
frequency);
}
});
frequency);
}
});
@@
-385,7
+391,7
@@
public class AltosIdleMonitorUI extends AltosFrame implements AltosFlightDisplay
setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
- AltosPreferences.register_font_listener(this);
+ Altos
UI
Preferences.register_font_listener(this);
addWindowListener(new WindowAdapter() {
@Override
addWindowListener(new WindowAdapter() {
@Override
@@
-393,7
+399,7
@@
public class AltosIdleMonitorUI extends AltosFrame implements AltosFlightDisplay
disconnect();
setVisible(false);
dispose();
disconnect();
setVisible(false);
dispose();
- AltosPreferences.unregister_font_listener(AltosIdleMonitorUI.this);
+ Altos
UI
Preferences.unregister_font_listener(AltosIdleMonitorUI.this);
}
});
}
});