use multimaint-merge to make Debian changelogs less ugly

[fw/altos] / altosui / AltosSerial.java

diff --git a/altosui/AltosSerial.java b/altosui/AltosSerial.java
index 8f8f99d7f458088aaa62abf3eb66cff23fb3e7af..0a531aa96faa8b2b0b27fc0f412b78c920648231 100644 (file)
--- a/altosui/AltosSerial.java
+++ b/altosui/AltosSerial.java
@@ -54,11 +54,12 @@ public class AltosSerial implements Runnable {
        int line_count;
        boolean monitor_mode;
        int telemetry;
-       int channel;
+       double frequency;
        static boolean debug;
        boolean remote;
        LinkedList<String> pending_output = new LinkedList<String>();
        Frame frame;
+       AltosConfigData config_data;
 
        static void set_debug(boolean new_debug) {
                debug = new_debug;
@@ -154,7 +155,7 @@ public class AltosSerial implements Runnable {
                Object[] options = { "Cancel" };
 
                JOptionPane     pane = new JOptionPane();
-               pane.setMessage(String.format("Connecting to %s", device.getPath()));
+               pane.setMessage(String.format("Connecting to %s, %7.3f MHz", device.toShortString(), frequency));
                pane.setOptions(options);
                pane.setInitialValue(null);
 
@@ -186,7 +187,7 @@ public class AltosSerial implements Runnable {
                return abort;
        }
 
-       public void flush_input() {
+       public void flush_input() throws InterruptedException {
                flush_output();
                boolean got_some;
 
@@ -194,10 +195,7 @@ public class AltosSerial implements Runnable {
                if (remote)
                        timeout = 500;
                do {
-                       try {
-                               Thread.sleep(timeout);
-                       } catch (InterruptedException ie) {
-                       }
+                       Thread.sleep(timeout);
                        got_some = !reply_queue.isEmpty();
                        synchronized(this) {
                                if (!"VERSION".startsWith(line) &&
@@ -208,42 +206,54 @@ public class AltosSerial implements Runnable {
                } while (got_some);
        }
 
-       public String get_reply() throws InterruptedException {
-               if (SwingUtilities.isEventDispatchThread())
-                       System.out.printf("Uh-oh, reading serial device from swing thread\n");
-               flush_output();
-               AltosLine line = reply_queue.take();
-               return line.line;
-       }
-
        int     in_reply;
 
        public String get_reply(int timeout) throws InterruptedException {
                boolean can_cancel = true;
-               ++in_reply;
+               String  reply = null;
 
-               if (SwingUtilities.isEventDispatchThread()) {
-                       can_cancel = false;
-                       System.out.printf("Uh-oh, reading serial device from swing thread\n");
-               }
-               flush_output();
-               if (remote && can_cancel) {
-                       timeout = 500;
-               }
-               abort = false;
-               timeout_started = false;
-               for (;;) {
-                       AltosLine line = reply_queue.poll(timeout, TimeUnit.MILLISECONDS);
-                       if (line != null) {
-                               stop_timeout_dialog();
-                               --in_reply;
-                               return line.line;
+               try {
+                       ++in_reply;
+
+                       if (SwingUtilities.isEventDispatchThread()) {
+                               can_cancel = false;
+                               if (remote)
+                                       System.out.printf("Uh-oh, reading remote serial device from swing thread\n");
                        }
-                       if (!remote || !can_cancel || check_timeout()) {
-                               --in_reply;
-                               return null;
+                       flush_output();
+                       if (remote && can_cancel) {
+                               timeout = 500;
+                       }
+                       abort = false;
+                       timeout_started = false;
+                       for (;;) {
+                               AltosLine line = reply_queue.poll(timeout, TimeUnit.MILLISECONDS);
+                               if (line != null) {
+                                       stop_timeout_dialog();
+                                       reply = line.line;
+                                       break;
+                               }
+                               if (!remote || !can_cancel || check_timeout()) {
+                                       reply = null;
+                                       break;
+                               }
                        }
+               } finally {
+                       --in_reply;
                }
+               return reply;
+       }
+
+       public String get_reply() throws InterruptedException {
+               return get_reply(5000);
+       }
+
+       public String get_reply_no_dialog(int timeout) throws InterruptedException, TimeoutException {
+               flush_output();
+               AltosLine line = reply_queue.poll(timeout, TimeUnit.MILLISECONDS);
+               if (line != null)
+                       return line.line;
+               return null;
        }
 
        public void add_monitor(LinkedBlockingQueue<AltosLine> q) {
@@ -258,6 +268,12 @@ public class AltosSerial implements Runnable {
        }
 
        public void close() {
+               if (remote) {
+                       try {
+                               stop_remote();
+                       } catch (InterruptedException ie) {
+                       }
+               }
                if (in_reply != 0)
                        System.out.printf("Uh-oh. Closing active serial device\n");
 
@@ -319,19 +335,11 @@ public class AltosSerial implements Runnable {
                flush_output();
        }
 
-       public void set_radio() {
-               telemetry = AltosPreferences.telemetry(device.getSerial());
-               channel = AltosPreferences.channel(device.getSerial());
-               set_channel(channel);
-               set_callsign(AltosPreferences.callsign());
-       }
-
        private int telemetry_len() {
                return Altos.telemetry_len(telemetry);
        }
 
-       public void set_channel(int in_channel) {
-               channel = in_channel;
+       private void set_channel(int channel) {
                if (altos != null) {
                        if (monitor_mode)
                                printf("m 0\nc r %d\nm %x\n",
@@ -342,6 +350,36 @@ public class AltosSerial implements Runnable {
                }
        }
 
+       private void set_radio_setting(int setting) {
+               if (altos != null) {
+                       if (monitor_mode)
+                               printf("m 0\nc R %d\nm %x\n",
+                                      setting, telemetry_len());
+                       else
+                               printf("c R %d\n", setting);
+                       flush_output();
+               }
+       }
+
+       public void set_radio_frequency(double frequency,
+                                       boolean has_setting,
+                                       int cal) {
+               if (debug)
+                       System.out.printf("set_radio_frequency %7.3f %b %d\n", frequency, has_setting, cal);
+               if (has_setting)
+                       set_radio_setting(AltosConvert.radio_frequency_to_setting(frequency, cal));
+               else
+                       set_channel(AltosConvert.radio_frequency_to_channel(frequency));
+       }
+
+       public void set_radio_frequency(double in_frequency) throws InterruptedException, TimeoutException {
+               frequency = in_frequency;
+               config_data();
+               set_radio_frequency(frequency,
+                                   config_data.radio_setting != 0,
+                                   config_data.radio_calibration);
+       }
+
        public void set_telemetry(int in_telemetry) {
                telemetry = in_telemetry;
                if (altos != null) {
@@ -369,16 +407,25 @@ public class AltosSerial implements Runnable {
                }
        }
 
-       public void start_remote() {
+       public AltosConfigData config_data() throws InterruptedException, TimeoutException {
+               if (config_data == null)
+                       config_data = new AltosConfigData(this);
+               return config_data;
+       }
+
+       public void start_remote() throws TimeoutException, InterruptedException {
                if (debug)
-                       System.out.printf("start remote\n");
-               set_radio();
+                       System.out.printf("start remote %7.3f\n", frequency);
+               if (frequency == 0.0)
+                       frequency = AltosPreferences.frequency(device.getSerial());
+               set_radio_frequency(frequency);
+               set_callsign(AltosPreferences.callsign());
                printf("p\nE 0\n");
                flush_input();
                remote = true;
        }
 
-       public void stop_remote() {
+       public void stop_remote() throws InterruptedException {
                if (debug)
                        System.out.printf("stop remote\n");
                try {