X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosUI.java;h=0fc6583ca11c46771eaf32df6d18a41414fec4a5;hb=9cdef76c1275b343099d0d01af82d7eadd36a410;hp=94c4dd2aa4b10bb2ae6424268344f0c9ace981f6;hpb=f01096c4b42f9a4720ed0414826c2a283a992545;p=fw%2Faltos diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java index 94c4dd2a..0fc6583c 100644 --- a/altosui/AltosUI.java +++ b/altosui/AltosUI.java @@ -34,7 +34,7 @@ public class AltosUI extends JFrame { public AltosVoice voice = new AltosVoice(); public static boolean load_library(Frame frame) { - if (!AltosDevice.load_library()) { + if (!Altos.load_library()) { JOptionPane.showMessageDialog(frame, String.format("No AltOS library in \"%s\"", System.getProperty("java.library.path","")), @@ -198,8 +198,12 @@ public class AltosUI extends JFrame { } private void ConnectToDevice() { + AltosBTManage bt_manage; + + bt_manage = new AltosBTManage(AltosBTDevice.bt_product_any, this); + bt_manage.list(); AltosDevice device = AltosDeviceDialog.show(AltosUI.this, - AltosDevice.product_basestation); + Altos.product_basestation); if (device != null) telemetry_window(device); @@ -245,7 +249,7 @@ public class AltosUI extends JFrame { * a TeleDongle over the packet link */ private void SaveFlightData() { - new AltosEepromDownload(AltosUI.this); + new AltosEepromManage(AltosUI.this); } /* Load a flight log file and write out a CSV file containing @@ -328,7 +332,7 @@ public class AltosUI extends JFrame { if (input.equals(output)) { System.out.printf("Not processing '%s'\n", input); } else { - AltosWriter writer = open_csv(output); + AltosWriter writer = open_csv("/dev/stdout"); if (writer != null) { writer.write(iterable); writer.close(); @@ -397,7 +401,7 @@ public class AltosUI extends JFrame { AltosUI altosui = new AltosUI(); altosui.setVisible(true); - AltosDevice[] devices = AltosDevice.list(AltosDevice.product_basestation); + AltosDevice[] devices = AltosUSBDevice.list(Altos.product_basestation); for (int i = 0; i < devices.length; i++) altosui.telemetry_window(devices[i]); }