projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/stm32f4: Use full printf/scanf (including floats)
[fw/altos]
/
altoslib
/
AltosIdleMonitor.java
diff --git
a/altoslib/AltosIdleMonitor.java
b/altoslib/AltosIdleMonitor.java
index c374b6015d5563350844c035136949eaa78facef..99d3192133f116e3cdbc5a89f48b9c34d548d160 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
1
;
+package org.altusmetrum.altoslib_1
3
;
import java.io.*;
import java.util.concurrent.*;
import java.io.*;
import java.util.concurrent.*;
@@
-33,6
+33,7
@@
public class AltosIdleMonitor extends Thread {
double frequency;
String callsign;
double frequency;
String callsign;
+ AltosState state;
AltosListenerState listener_state;
AltosConfigData config_data;
AltosGPS gps;
AltosListenerState listener_state;
AltosConfigData config_data;
AltosGPS gps;
@@
-52,13
+53,16
@@
public class AltosIdleMonitor extends Thread {
return link.reply_abort;
}
return link.reply_abort;
}
- boolean
update_state(AltosState state
) 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.update_state(state);
+ link.config_data();
+ if (state == null)
+ state = new AltosState(new AltosCalData(link.config_data()));
+ fetch.provide_data(state);
if (!link.has_error && !link.reply_abort)
worked = true;
} finally {
if (!link.has_error && !link.reply_abort)
worked = true;
} finally {
@@
-92,12
+96,11
@@
public class AltosIdleMonitor extends Thread {
}
public void run() {
}
public void run() {
-
AltosState state = new AltosState()
;
+
state = null
;
try {
for (;;) {
try {
try {
for (;;) {
try {
- link.config_data();
- update_state(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) {