altosui: switch channel selector to combo box. Shorten displayed device names

[fw/altos] / ao-tools / altosui / AltosTelemetryReader.java

diff --git a/ao-tools/altosui/AltosTelemetryReader.java b/ao-tools/altosui/AltosTelemetryReader.java
index 0b5509ebedb203a5dcc5057972cb815ba3a97fe5..de5f50e93052895ac7d7e9aefd06ec48ccdae8c9 100644 (file)
--- a/ao-tools/altosui/AltosTelemetryReader.java
+++ b/ao-tools/altosui/AltosTelemetryReader.java
@@ -50,11 +50,12 @@ class AltosTelemetryReader extends AltosFlightReader {
                serial.set_callsign(callsign);
        }
 
-       public AltosTelemetryReader (AltosDevice in_device) throws FileNotFoundException, IOException {
+       public AltosTelemetryReader (AltosDevice in_device)
+               throws FileNotFoundException, AltosSerialInUseException, IOException {
                device = in_device;
-               serial = new AltosSerial();
+               serial = new AltosSerial(device);
                log = new AltosLog(serial);
-               name = device.getPath();
+               name = device.toShortString();
 
                telem = new LinkedBlockingQueue<AltosLine>();
                serial.add_monitor(telem);