summaryrefslogtreecommitdiff
path: root/altoslib/AltosLink.java
diff options
context:
space:
mode:
authorBdale Garbee <bdale@gag.com>2018-08-05 11:21:37 +0800
committerBdale Garbee <bdale@gag.com>2018-08-05 11:21:37 +0800
commitd8627bb7b46fc991786835afa38cd720e9e75812 (patch)
treee14ae029a4ead29a4a7ccccb39af556e32413d36 /altoslib/AltosLink.java
parent59e23c27c2a85d7d748223e444b24d19937afe47 (diff)
parent8830fbc99565f753c0ae1f3d9f4b079860c2634a (diff)
Merge branch 'master' into branch-1.8
Diffstat (limited to 'altoslib/AltosLink.java')
-rw-r--r--altoslib/AltosLink.java19
1 files changed, 16 insertions, 3 deletions
diff --git a/altoslib/AltosLink.java b/altoslib/AltosLink.java
index 829a1a63..3ad34891 100644
--- a/altoslib/AltosLink.java
+++ b/altoslib/AltosLink.java
@@ -339,9 +339,22 @@ public abstract class AltosLink implements Runnable {
public void flush_input() throws InterruptedException {
- if (remote)
- flush_input(500);
- else
+ if (remote) {
+ int timeout = 500;
+ switch (telemetry_rate) {
+ case AltosLib.ao_telemetry_rate_38400:
+ default:
+ timeout = 500;
+ break;
+ case AltosLib.ao_telemetry_rate_9600:
+ timeout = 1000;
+ break;
+ case AltosLib.ao_telemetry_rate_2400:
+ timeout = 2000;
+ break;
+ }
+ flush_input(timeout);
+ } else
flush_input(100);
}