altosui & altoslib: Move a pile of debug/programming bits to altoslib

[fw/altos] / altosui / AltosFlash.java

diff --git a/altosui/AltosFlash.java b/altosui/AltosFlash.java
index 7a98ee144cd2c4ee6391317e07862d57cdf86f98..b409a611bb926590c182e14362ee8a185290c344 100644 (file)
--- a/altosui/AltosFlash.java
+++ b/altosui/AltosFlash.java
@@ -20,7 +20,8 @@ package altosui;
 import java.awt.event.*;
 import javax.swing.*;
 import java.io.*;
-import org.altusmetrum.altosuilib.*;
+import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altosuilib_1.*;
 
 public class AltosFlash {
        File            file;
@@ -362,7 +363,7 @@ public class AltosFlash {
                file = in_file;
                debug_dongle = in_debug_dongle;
                if (debug_dongle != null)
-                       debug = new AltosDebug(in_debug_dongle);
+                       debug = new AltosDebug(new AltosSerial(in_debug_dongle));
                input = new FileInputStream(file);
                image = new AltosHexfile(input);
                if (debug != null && !debug.check_connection()) {