From a88989faebdc3a4b5198c4150096e6f626d76a96 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sat, 8 Feb 2020 23:09:50 -0800 Subject: [PATCH] altosui: Set idle mode frequency before starting link This makes sure the link doesn't try to start at the wrong frequency. Signed-off-by: Keith Packard --- altoslib/AltosLink.java | 4 ++-- altosui/AltosIdleMonitorUI.java | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/altoslib/AltosLink.java b/altoslib/AltosLink.java index 44202c0c..78861915 100644 --- a/altoslib/AltosLink.java +++ b/altoslib/AltosLink.java @@ -392,7 +392,7 @@ public abstract class AltosLink implements Runnable { int cal) { if (debug) System.out.printf("set_radio_frequency %7.3f (freq %b) (set %b) %d\n", frequency, has_frequency, has_setting, cal); - if (frequency == 0) + if (frequency == 0 || frequency == AltosLib.MISSING) return; if (has_frequency) set_radio_freq((int) Math.floor (frequency * 1000 + 0.5)); @@ -519,7 +519,7 @@ public abstract class AltosLink implements Runnable { public String name; public void start_remote() throws TimeoutException, InterruptedException { - if (frequency == 0.0) + if (frequency == 0.0 || frequency == AltosLib.MISSING) frequency = AltosPreferences.frequency(serial); if (debug) System.out.printf("start remote %7.3f\n", frequency); diff --git a/altosui/AltosIdleMonitorUI.java b/altosui/AltosIdleMonitorUI.java index fc76b2b6..bc3060e0 100644 --- a/altosui/AltosIdleMonitorUI.java +++ b/altosui/AltosIdleMonitorUI.java @@ -297,6 +297,8 @@ public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl thread = new AltosIdleMonitor(this, link, (boolean) remote); + thread.set_frequency(AltosUIPreferences.frequency(serial)); + status_update = new AltosFlightStatusUpdate(flightStatus); new javax.swing.Timer(100, status_update).start(); -- 2.30.2