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

diff --git a/altoslib/AltosIdleMonitor.java b/altoslib/AltosIdleMonitor.java
index fde8c101..84db49ca 100644
--- 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
- * 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
@@ -15,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_14;
 
 import java.io.*;
 import java.util.concurrent.*;
@@ -29,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;
@@ -51,13 +53,18 @@ public class AltosIdleMonitor extends Thread {
 		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();
-			fetch.update_state(state);
+			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 {
@@ -91,12 +98,11 @@ public class AltosIdleMonitor extends Thread {
 	}
 
 	public void run() {
-		AltosState state = new AltosState();
+		state = null;
 		try {
 			for (;;) {
 				try {
-					link.config_data();
-					update_state(state);
+					provide_data();
 					listener.update(state, listener_state);
 				} catch (TimeoutException te) {
 				} catch (AltosUnknownProduct ae) {