projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump java lib versions in preparation for 1.9.2
[fw/altos]
/
altoslib
/
AltosIdleMonitor.java
diff --git
a/altoslib/AltosIdleMonitor.java
b/altoslib/AltosIdleMonitor.java
index fc5d4cc889ef51bbe52227bb93d53b2409a9723e..84db49cac22b0d574cf0c61cc8cc8a01e8db5f80 100644
(file)
--- a/
altoslib/AltosIdleMonitor.java
+++ b/
altoslib/AltosIdleMonitor.java
@@
-16,7
+16,7
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_1
2
;
+package org.altusmetrum.altoslib_1
4
;
import java.io.*;
import java.util.concurrent.*;
import java.io.*;
import java.util.concurrent.*;
@@
-30,9
+30,10
@@
public class AltosIdleMonitor extends Thread {
boolean remote;
boolean close_on_exit;
boolean remote;
boolean close_on_exit;
- double frequency;
+ double frequency
= AltosLib.MISSING
;
String callsign;
String callsign;
+ AltosState state;
AltosListenerState listener_state;
AltosConfigData config_data;
AltosGPS gps;
AltosListenerState listener_state;
AltosConfigData config_data;
AltosGPS gps;
@@
-52,20
+53,25
@@
public class AltosIdleMonitor extends Thread {
return link.reply_abort;
}
return link.reply_abort;
}
- boolean provide_data(
AltosDataListener listener
) throws InterruptedException, TimeoutException, AltosUnknownProduct {
+ boolean provide_data() throws InterruptedException, TimeoutException, AltosUnknownProduct {
boolean worked = false;
boolean aborted = false;
try {
start_link();
boolean worked = false;
boolean aborted = false;
try {
start_link();
- fetch.provide_data(listener);
+ link.config_data();
+ if (state == null)
+ state = new AltosState(new AltosCalData(link.config_data()));
+ fetch.provide_data(state);
+ if (frequency != AltosLib.MISSING)
+ state.set_frequency(frequency);
if (!link.has_error && !link.reply_abort)
worked = true;
} finally {
aborted = stop_link();
if (worked) {
if (remote)
if (!link.has_error && !link.reply_abort)
worked = true;
} finally {
aborted = stop_link();
if (worked) {
if (remote)
-
listener
.set_rssi(link.rssi(), 0);
+
state
.set_rssi(link.rssi(), 0);
listener_state.battery = link.monitor_battery();
}
}
listener_state.battery = link.monitor_battery();
}
}
@@
-92,14
+98,11
@@
public class AltosIdleMonitor extends Thread {
}
public void run() {
}
public void run() {
-
AltosState
state = null;
+ state = null;
try {
for (;;) {
try {
try {
for (;;) {
try {
- link.config_data();
- if (state == null)
- state = new AltosState(new AltosCalData(link.config_data()));
- provide_data(state);
+ provide_data();
listener.update(state, listener_state);
} catch (TimeoutException te) {
} catch (AltosUnknownProduct ae) {
listener.update(state, listener_state);
} catch (TimeoutException te) {
} catch (AltosUnknownProduct ae) {