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 6c687f5f17c0ab21c93f715b5a3e7e368dcd0ba1..0a531aa96faa8b2b0b27fc0f412b78c920648231 100644 (file)
--- a/altosui/AltosSerial.java
+++ b/altosui/AltosSerial.java
@@ -187,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;
 
@@ -195,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) &&
@@ -213,31 +210,38 @@ public class AltosSerial implements Runnable {
 
        public String get_reply(int timeout) throws InterruptedException {
                boolean can_cancel = true;
-               ++in_reply;
+               String  reply = null;
 
-               System.out.printf("get_reply %d\n", timeout);
-               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 {
@@ -246,7 +250,6 @@ public class AltosSerial implements Runnable {
 
        public String get_reply_no_dialog(int timeout) throws InterruptedException, TimeoutException {
                flush_output();
-               System.out.printf("get_reply_no_dialog\n");
                AltosLine line = reply_queue.poll(timeout, TimeUnit.MILLISECONDS);
                if (line != null)
                        return line.line;
@@ -265,8 +268,12 @@ public class AltosSerial implements Runnable {
        }
 
        public void close() {
-               if (remote)
-                       stop_remote();
+               if (remote) {
+                       try {
+                               stop_remote();
+                       } catch (InterruptedException ie) {
+                       }
+               }
                if (in_reply != 0)
                        System.out.printf("Uh-oh. Closing active serial device\n");
 
@@ -346,16 +353,19 @@ public class AltosSerial implements Runnable {
        private void set_radio_setting(int setting) {
                if (altos != null) {
                        if (monitor_mode)
-                               printf("m 0\nc R %d\nc r 0\nm %x\n",
+                               printf("m 0\nc R %d\nm %x\n",
                                       setting, telemetry_len());
                        else
-                               printf("c R %d\nc r 0\n", setting);
+                               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
@@ -405,7 +415,7 @@ public class AltosSerial implements Runnable {
 
        public void start_remote() throws TimeoutException, InterruptedException {
                if (debug)
-                       System.out.printf("start remote\n");
+                       System.out.printf("start remote %7.3f\n", frequency);
                if (frequency == 0.0)
                        frequency = AltosPreferences.frequency(device.getSerial());
                set_radio_frequency(frequency);
@@ -415,7 +425,7 @@ public class AltosSerial implements Runnable {
                remote = true;
        }
 
-       public void stop_remote() {
+       public void stop_remote() throws InterruptedException {
                if (debug)
                        System.out.printf("stop remote\n");
                try {