X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosIdleMonitor.java;h=834d9aa54055a981ab209c008811f603266668ed;hp=bcf20ef36fe767c940767a9ee9c20e4499785791;hb=d1d98e408311c5ba18138a18f4c88448e4254626;hpb=204ae5142702044eb8ad2697a55028e904067958

diff --git a/altoslib/AltosIdleMonitor.java b/altoslib/AltosIdleMonitor.java
index bcf20ef3..834d9aa5 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_10;
+package org.altusmetrum.altoslib_12;
 
 import java.io.*;
 import java.util.concurrent.*;
@@ -32,6 +33,7 @@ public class AltosIdleMonitor extends Thread {
 	double			frequency;
 	String			callsign;
 
+	AltosState		state;
 	AltosListenerState	listener_state;
 	AltosConfigData		config_data;
 	AltosGPS		gps;
@@ -51,13 +53,16 @@ public class AltosIdleMonitor extends Thread {
 		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();
-			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 {
@@ -91,14 +96,15 @@ 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) {
+					listener.error(String.format("Unknown product \"%s\"", ae.product));
 				}
 				if (link.has_error || link.reply_abort) {
 					listener.failed();