X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosIdleMonitor.java;h=84db49cac22b0d574cf0c61cc8cc8a01e8db5f80;hb=3ed101d634968666cd3ee2d8c49737970caf406b;hp=fc5d4cc889ef51bbe52227bb93d53b2409a9723e;hpb=0da4e201041a4420f273c2e0cda77eea78099518;p=fw%2Faltos

diff --git a/altoslib/AltosIdleMonitor.java b/altoslib/AltosIdleMonitor.java
index fc5d4cc8..84db49ca 100644
--- a/altoslib/AltosIdleMonitor.java
+++ b/altoslib/AltosIdleMonitor.java
@@ -16,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_12;
+package org.altusmetrum.altoslib_14;
 
 import java.io.*;
 import java.util.concurrent.*;
@@ -30,9 +30,10 @@ public class AltosIdleMonitor extends Thread {
 
 	boolean			remote;
 	boolean			close_on_exit;
-	double			frequency;
+	double			frequency = AltosLib.MISSING;
 	String			callsign;
 
+	AltosState		state;
 	AltosListenerState	listener_state;
 	AltosConfigData		config_data;
 	AltosGPS		gps;
@@ -52,20 +53,25 @@ public class AltosIdleMonitor extends Thread {
 		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();
-			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)
-					listener.set_rssi(link.rssi(), 0);
+					state.set_rssi(link.rssi(), 0);
 				listener_state.battery = link.monitor_battery();
 			}
 		}
@@ -92,14 +98,11 @@ public class AltosIdleMonitor extends Thread {
 	}
 
 	public void run() {
-		AltosState state = null;
+		state = null;
 		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) {