X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosSerial.java;h=cb82a574ed4381d5c87862f2d9de23757dad5afb;hb=3cc2eed6cdafe788a8617ab45c6664077e76411e;hp=3666cb4142e65b9d3de42c344271b5d9faa2ea29;hpb=7fd9b8f720add559b262e81d61ededc9df16ca94;p=fw%2Faltos

diff --git a/altosui/AltosSerial.java b/altosui/AltosSerial.java
index 3666cb41..cb82a574 100644
--- a/altosui/AltosSerial.java
+++ b/altosui/AltosSerial.java
@@ -25,6 +25,7 @@ import java.lang.*;
 import java.io.*;
 import java.util.concurrent.*;
 import java.util.*;
+import java.text.*;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
@@ -232,12 +233,14 @@ public class AltosSerial implements Runnable {
 		abort = false;
 		timeout_started = false;
 		for (;;) {
+			System.out.printf("timeout %d\n", timeout);
 			AltosLine line = reply_queue.poll(timeout, TimeUnit.MILLISECONDS);
 			if (line != null) {
 				stop_timeout_dialog();
 				--in_reply;
 				return line.line;
 			}
+			System.out.printf("no line remote %b can_cancel %b\n", remote, can_cancel);
 			if (!remote || !can_cancel || check_timeout()) {
 				--in_reply;
 				return null;
@@ -245,6 +248,14 @@ public class AltosSerial implements Runnable {
 		}
 	}
 
+	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) {
 		set_monitor(true);
 		monitors.add(q);
@@ -326,13 +337,7 @@ public class AltosSerial implements Runnable {
 	}
 
 	private int telemetry_len() {
-		switch (telemetry) {
-		case 1:
-		default:
-			return Altos.ao_telemetry_legacy_len;
-		case 2:
-			return Altos.ao_telemetry_split_len;
-		}
+		return Altos.telemetry_len(telemetry);
 	}
 
 	public void set_channel(int in_channel) {
@@ -404,7 +409,7 @@ public class AltosSerial implements Runnable {
 		line = "";
 		monitor_mode = false;
 		frame = null;
-		telemetry = Altos.ao_telemetry_split;
+		telemetry = Altos.ao_telemetry_standard;
 		monitors = new LinkedList<LinkedBlockingQueue<AltosLine>> ();
 		reply_queue = new LinkedBlockingQueue<AltosLine> ();
 		open();