altosui: Add EasyMini bits to fat distribution images. Update telemetrum.inf

[fw/altos] / altosui / AltosScanUI.java

diff --git a/altosui/AltosScanUI.java b/altosui/AltosScanUI.java
index 2a6e140ac34f786e5f363b6a3c73ab949847c677..a5ccb15aac379a6d6cb82dc8a0a4850b8eb567f0 100644 (file)
--- a/altosui/AltosScanUI.java
+++ b/altosui/AltosScanUI.java
@@ -25,7 +25,8 @@ import java.io.*;
 import java.util.*;
 import java.text.*;
 import java.util.concurrent.*;
-import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altoslib_2.*;
+import org.altusmetrum.altosuilib_1.*;
 
 class AltosScanResult {
        String          callsign;
@@ -121,7 +122,7 @@ class AltosScanResults extends LinkedList<AltosScanResult> implements ListModel
 }
 
 public class AltosScanUI
-       extends AltosDialog
+       extends AltosUIDialog
        implements ActionListener
 {
        AltosUI                         owner;
@@ -183,13 +184,13 @@ public class AltosScanUI
                        try {
                                for (;;) {
                                        try {
-                                               AltosRecord     record = reader.read();
-                                               if (record == null)
+                                               AltosState      state = reader.read();
+                                               if (state == null)
                                                        continue;
-                                               if ((record.seen & AltosRecord.seen_flight) != 0) {
-                                                       final AltosScanResult   result = new AltosScanResult(record.callsign,
-                                                                                                    record.serial,
-                                                                                                    record.flight,
+                                               if (state.flight != AltosLib.MISSING) {
+                                                       final AltosScanResult   result = new AltosScanResult(state.callsign,
+                                                                                                    state.serial,
+                                                                                                    state.flight,
                                                                                                     frequencies[frequency_index],
                                                                                                     telemetry);
                                                        Runnable r = new Runnable() {
@@ -327,7 +328,7 @@ public class AltosScanUI
        }
 
        private boolean open() {
-               device = AltosDeviceDialog.show(owner, Altos.product_basestation);
+               device = AltosDeviceUIDialog.show(owner, Altos.product_basestation);
                if (device == null)
                        return false;
                try {