X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosIdleMonitor.java;h=74536204affee2471c2a83ca3c71faed585c8052;hp=d858845a1af0dbe0ea10837191cfa053507439d7;hb=cb23b992be8ba40c97d8988c134a814a13ccd58c;hpb=488a527267decece48e6682e0e0c7fc29cbed329

diff --git a/altoslib/AltosIdleMonitor.java b/altoslib/AltosIdleMonitor.java
index d858845a..74536204 100644
--- a/altoslib/AltosIdleMonitor.java
+++ b/altoslib/AltosIdleMonitor.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_2;
+package org.altusmetrum.altoslib_7;
 
 import java.io.*;
 import java.util.concurrent.*;
@@ -35,20 +35,6 @@ public class AltosIdleMonitor extends Thread {
 	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 +44,30 @@ 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 update_state(AltosState state) throws InterruptedException, TimeoutException {
 		boolean		worked = false;
+		boolean		aborted = false;
 
 		try {
 			start_link();
 			fetch.update_state(state);
-			worked = true;
+			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,32 +80,37 @@ 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();
 		try {
-			while (!link.has_error) {
+			for (;;) {
 				try {
 					link.config_data();
 					update_state(state);
 					listener.update(state, listener_state);
 				} catch (TimeoutException te) {
 				}
+				if (link.has_error || link.reply_abort) {
+					listener.failed();
+					break;
+				}
 				Thread.sleep(1000);
 			}
 		} catch (InterruptedException ie) {
 		}
-		link.close();
+		try {
+			link.close();
+		} catch (InterruptedException ie) {
+		}
 	}
 
 	public AltosIdleMonitor(AltosIdleMonitorListener in_listener, AltosLink in_link, boolean in_remote)