X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosIdleMonitor.java;h=ec51b9c1906ecb63f63dad3b1555650db5a2dcca;hp=07d8930d36e45a23229886957d8c577a61434556;hb=398c02b945a58634c8932f07df2c2be8438da7d1;hpb=7894c27b2b2c3c46a7c107c8acd5977830f006cf

diff --git a/altoslib/AltosIdleMonitor.java b/altoslib/AltosIdleMonitor.java
index 07d8930d..ec51b9c1 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;
+package org.altusmetrum.altoslib_1;
 
 import java.io.*;
 import java.util.concurrent.*;
@@ -27,6 +27,7 @@ public class AltosIdleMonitor extends Thread {
 	AltosState		state;
 	boolean			remote;
 	double			frequency;
+	String			callsign;
 	AltosState		previous_state;
 	AltosConfigData		config_data;
 	AltosGPS		gps;
@@ -87,6 +88,7 @@ public class AltosIdleMonitor extends Thread {
 		try {
 			if (remote) {
 				link.set_radio_frequency(frequency);
+				link.set_callsign(callsign);
 				link.start_remote();
 			} else
 				link.flush_input();
@@ -114,8 +116,10 @@ public class AltosIdleMonitor extends Thread {
 		} finally {
 			if (remote) {
 				link.stop_remote();
-				if (record != null)
-					record.rssi = AltosRSSI();
+				if (record != null) {
+					record.rssi = link.rssi();
+					record.monitor_battery = link.monitor_battery();
+				}
 			} else {
 				if (record != null)
 					record.rssi = 0;
@@ -126,12 +130,29 @@ public class AltosIdleMonitor extends Thread {
 
 	public void set_frequency(double in_frequency) {
 		frequency = in_frequency;
+		link.abort_reply();
+	}
+
+	public void set_callsign(String in_callsign) {
+		callsign = in_callsign;
+		link.abort_reply();
 	}
 
 	public void post_state() {
 		listener.update(state);
 	}
 
+	public void abort() {
+		if (isAlive()) {
+			interrupt();
+			link.abort_reply();
+			try {
+				join();
+			} catch (InterruptedException ie) {
+			}
+		}
+	}
+
 	public void run() {
 		try {
 			for (;;) {