X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosIdleMonitor.java;h=99d3192133f116e3cdbc5a89f48b9c34d548d160;hp=d858845a1af0dbe0ea10837191cfa053507439d7;hb=6023ff81f1bbd240169b9548209133d3b02d475f;hpb=5b976a6651f4eb05d30afc08b9e1f27c7e52ae00

diff --git a/altoslib/AltosIdleMonitor.java b/altoslib/AltosIdleMonitor.java
index d858845a..99d31921 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_2;
+package org.altusmetrum.altoslib_13;
 
 import java.io.*;
 import java.util.concurrent.*;
@@ -28,27 +29,15 @@ public class AltosIdleMonitor extends Thread {
 	AltosIdleFetch		fetch;
 
 	boolean			remote;
+	boolean			close_on_exit;
 	double			frequency;
 	String			callsign;
 
+	AltosState		state;
 	AltosListenerState	listener_state;
 	AltosConfigData		config_data;
 	AltosGPS		gps;
 
-	int AltosRSSI() throws TimeoutException, InterruptedException {
-		link.printf("s\n");
-		String line = link.get_reply_no_dialog(5000);
-		if (line == null)
-			throw new TimeoutException();
-		String[] items = line.split("\\s+");
-		if (items.length < 2)
-			return 0;
-		if (!items[0].equals("RSSI:"))
-			return 0;
-		int rssi = Integer.parseInt(items[1]);
-		return rssi;
-	}
-
 	void start_link() throws InterruptedException, TimeoutException {
 		if (remote) {
 			link.set_radio_frequency(frequency);
@@ -58,26 +47,33 @@ public class AltosIdleMonitor extends Thread {
 			link.flush_input();
 	}
 
-	void stop_link() throws InterruptedException, TimeoutException {
+	boolean stop_link() throws InterruptedException, TimeoutException {
 		if (remote)
 			link.stop_remote();
+		return link.reply_abort;
 	}
 
-	void 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);
-			worked = true;
+			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 {
-			stop_link();
+			aborted = stop_link();
 			if (worked) {
 				if (remote)
 					state.set_rssi(link.rssi(), 0);
 				listener_state.battery = link.monitor_battery();
 			}
 		}
+		return aborted;
 	}
 
 	public void set_frequency(double in_frequency) {
@@ -90,40 +86,53 @@ public class AltosIdleMonitor extends Thread {
 		link.abort_reply();
 	}
 
-	public void abort() {
-		if (isAlive()) {
+	public void abort() throws InterruptedException {
+		while (isAlive()) {
 			interrupt();
 			link.abort_reply();
-			try {
-				join();
-			} catch (InterruptedException ie) {
-			}
+			Thread.sleep(100);
 		}
+		join();
 	}
 
 	public void run() {
-		AltosState state = new AltosState();
+		state = null;
 		try {
-			while (!link.has_error) {
+			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();
+					break;
 				}
 				Thread.sleep(1000);
 			}
 		} catch (InterruptedException ie) {
 		}
-		link.close();
+		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;
+		close_on_exit = in_close_on_exit;
 		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);
+	}
 }
+