altosui: Interrupt MonitorIdle when changing frequency/callsign

[fw/altos] / altoslib / AltosLink.java

diff --git a/altoslib/AltosLink.java b/altoslib/AltosLink.java
index fd5db7e977fd7092ee7a79077a7343abb3905029..9eb25ce0ac47b53092e706606e88be0104d15f20 100644 (file)
--- a/altoslib/AltosLink.java
+++ b/altoslib/AltosLink.java
@@ -15,15 +15,13 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.AltosLib;
+package org.altusmetrum.altoslib_1;
 
-import java.lang.*;
 import java.io.*;
 import java.util.concurrent.*;
 import java.util.*;
-import java.text.*;
 
-public abstract class AltosLink {
+public abstract class AltosLink implements Runnable {
 
        public final static int ERROR = -1;
        public final static int TIMEOUT = -2;
@@ -251,6 +249,7 @@ public abstract class AltosLink {
        public boolean monitor_mode = false;
        public int telemetry = AltosLib.ao_telemetry_standard;
        public double frequency;
+       public String callsign;
        AltosConfigData config_data;
 
        private int telemetry_len() {
@@ -286,8 +285,8 @@ public abstract class AltosLink {
                frequency = in_frequency;
                config_data();
                set_radio_frequency(frequency,
-                                   config_data.radio_frequency != 0,
-                                   config_data.radio_setting != 0,
+                                   config_data.radio_frequency > 0,
+                                   config_data.radio_setting > 0,
                                    config_data.radio_calibration);
        }
 
@@ -332,6 +331,7 @@ public abstract class AltosLink {
        }
 
        public void set_callsign(String callsign) {
+               this.callsign = callsign;
                printf ("c c %s\n", callsign);
                flush_output();
        }
@@ -341,10 +341,10 @@ public abstract class AltosLink {
        public String name;
 
        public void start_remote() throws TimeoutException, InterruptedException {
-               if (debug)
-                       System.out.printf("start remote %7.3f\n", frequency);
                if (frequency == 0.0)
                        frequency = AltosPreferences.frequency(serial);
+               if (debug)
+                       System.out.printf("start remote %7.3f\n", frequency);
                set_radio_frequency(frequency);
                set_callsign(AltosPreferences.callsign());
                printf("p\nE 0\n");
@@ -365,5 +365,6 @@ public abstract class AltosLink {
        }
 
        public AltosLink() {
+               callsign = "";
        }
 }