first cut at turnon scripts for EasyTimer v2

[fw/altos] / altosui / AltosIdleMonitorUI.java

diff --git a/altosui/AltosIdleMonitorUI.java b/altosui/AltosIdleMonitorUI.java
index fc76b2b658c87db172a8043bce7e6912679ae7fa..ba894c71885663a4a2962c719718c73f25c2a369 100644 (file)
--- a/altosui/AltosIdleMonitorUI.java
+++ b/altosui/AltosIdleMonitorUI.java
@@ -25,8 +25,8 @@ import javax.swing.event.*;
 import java.io.*;
 import java.util.concurrent.*;
 import java.util.Arrays;
-import org.altusmetrum.altoslib_13.*;
-import org.altusmetrum.altosuilib_13.*;
+import org.altusmetrum.altoslib_14.*;
+import org.altusmetrum.altosuilib_14.*;
 
 public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDisplay, AltosIdleMonitorListener, DocumentListener {
        AltosDevice             device;
@@ -209,7 +209,7 @@ public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
 
                device = AltosDeviceUIDialog.show(in_owner, Altos.product_any);
                remote = false;
-               if (!device.matchProduct(Altos.product_altimeter))
+               if (device.matchProduct(Altos.product_basestation))
                        remote = true;
 
                serial = device.getSerial();
@@ -226,7 +226,7 @@ public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
                /* We let the user set the freq/callsign, so don't bother with the cancel dialog */
                link.set_cancel_enable(false);
 
-               bag = getContentPane();
+               bag = getScrollablePane();
                bag.setLayout(new GridBagLayout());
 
                setTitle(String.format("AltOS %s", device.toShortString()));
@@ -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();