projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Import cleanup
[fw/altos]
/
altoslib
/
AltosIdleMonitor.java
diff --git
a/altoslib/AltosIdleMonitor.java
b/altoslib/AltosIdleMonitor.java
index 1b62f385fac0714b2667cde1a8bd032e721e0c40..99d3192133f116e3cdbc5a89f48b9c34d548d160 100644
(file)
--- a/
altoslib/AltosIdleMonitor.java
+++ b/
altoslib/AltosIdleMonitor.java
@@
-3,7
+3,8
@@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-15,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_
8
;
+package org.altusmetrum.altoslib_
13
;
import java.io.*;
import java.util.concurrent.*;
import java.io.*;
import java.util.concurrent.*;
@@
-28,9
+29,11
@@
public class AltosIdleMonitor extends Thread {
AltosIdleFetch fetch;
boolean remote;
AltosIdleFetch fetch;
boolean remote;
+ boolean close_on_exit;
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;
@@
-50,13
+53,16
@@
public class AltosIdleMonitor extends Thread {
return link.reply_abort;
}
return link.reply_abort;
}
- boolean
update_state(AltosState state) throws InterruptedException, TimeoutException
{
+ 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 {
@@
-90,14
+96,15
@@
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) {
listener.update(state, listener_state);
} catch (TimeoutException te) {
+ } catch (AltosUnknownProduct ae) {
+ listener.error(String.format("Unknown product \"%s\"", ae.product));
}
if (link.has_error || link.reply_abort) {
listener.failed();
}
if (link.has_error || link.reply_abort) {
listener.failed();
@@
-107,18
+114,25
@@
public class AltosIdleMonitor extends Thread {
}
} catch (InterruptedException ie) {
}
}
} catch (InterruptedException ie) {
}
- try {
- link.close();
- } catch (InterruptedException ie) {
+ if (close_on_exit) {
+ try {
+ link.close();
+ } catch (InterruptedException ie) {
+ }
}
}
}
}
- public AltosIdleMonitor(AltosIdleMonitorListener in_listener, AltosLink in_link, boolean in_remote)
- throws FileNotFoundException, InterruptedException, TimeoutException {
+ public AltosIdleMonitor(AltosIdleMonitorListener in_listener, AltosLink in_link, boolean in_remote, boolean in_close_on_exit) {
listener = in_listener;
link = in_link;
remote = in_remote;
listener = in_listener;
link = in_link;
remote = in_remote;
+ close_on_exit = in_close_on_exit;
listener_state = new AltosListenerState();
fetch = new AltosIdleFetch(link);
}
listener_state = new AltosListenerState();
fetch = new AltosIdleFetch(link);
}
+
+ public AltosIdleMonitor(AltosIdleMonitorListener in_listener, AltosLink in_link, boolean in_remote) {
+ this(in_listener, in_link, in_remote, true);
+ }
}
}
+