Get AltOS version numbers into Mac 'about' dialog
[fw/altos] / altosui / AltosScanUI.java
index 2b9137d80c4f2c1d47301cf4631556f64560e758..44eeda6dcc83ff228c21efe0415a1bf4f7de5bfa 100644 (file)
@@ -28,6 +28,7 @@ import java.util.*;
 import java.text.*;
 import java.util.prefs.*;
 import java.util.concurrent.*;
+import org.altusmetrum.AltosLib.*;
 
 class AltosScanResult {
        String          callsign;
@@ -207,7 +208,7 @@ public class AltosScanUI
        }
        
        void next() throws InterruptedException, TimeoutException {
-               reader.serial.set_monitor(false);
+               reader.set_monitor(false);
                Thread.sleep(100);
                ++frequency_index;
                if (frequency_index >= frequencies.length ||
@@ -223,7 +224,7 @@ public class AltosScanUI
                }
                set_frequency();
                set_label();
-               reader.serial.set_monitor(true);
+               reader.set_monitor(true);
        }
 
 
@@ -311,7 +312,7 @@ public class AltosScanUI
                if (device == null)
                        return false;
                try {
-                       reader = new AltosTelemetryReader(device);
+                       reader = new AltosTelemetryReader(new AltosSerial(device));
                        set_frequency();
                        set_telemetry();
                        try {