X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosIdleMonitor.java;h=f2f75bbb60f80dc21cf388a70459e7c239c76b37;hp=2c4965ff42047dc027f0073993b21ae4ce0375b8;hb=d029acad6a992be9b7b4498e70605f8a1e1a4ef6;hpb=e69a433fd93b9f6bd2297d8045eb075fee29e73b

diff --git a/altoslib/AltosIdleMonitor.java b/altoslib/AltosIdleMonitor.java
index 2c4965ff..f2f75bbb 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();
@@ -97,7 +99,7 @@ public class AltosIdleMonitor extends Thread {
 			else if (has_sensor_mm(config_data))
 				record = sensor_mm(config_data);
 			else
-				record = new AltosRecord();
+				record = new AltosRecordNone();
 
 			if (has_gps(config_data))
 				gps = new AltosGPSQuery(link, config_data);
@@ -126,12 +128,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 (;;) {