X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=micropeak%2FMicroDownload.java;h=6f0ca4f653b400ef5a817baed849d877bb14e2e0;hb=eba7b2ef8ef23bdb61b0390e47be6f27ffde31dc;hp=2e328b4a450121e7b3ffb8ce69740ee33817fc00;hpb=d83587c3c66b730cc54ca153714eee520ee40b2c;p=fw%2Faltos diff --git a/micropeak/MicroDownload.java b/micropeak/MicroDownload.java index 2e328b4a..6f0ca4f6 100644 --- a/micropeak/MicroDownload.java +++ b/micropeak/MicroDownload.java @@ -23,8 +23,8 @@ import javax.swing.*; import java.io.*; import java.util.concurrent.*; import java.util.*; -import org.altusmetrum.AltosLib.*; -import org.altusmetrum.altosuilib.*; +import org.altusmetrum.altoslib_1.*; +import org.altusmetrum.altosuilib_1.*; public class MicroDownload extends AltosUIDialog implements Runnable, ActionListener { MicroPeak owner; @@ -37,10 +37,17 @@ public class MicroDownload extends AltosUIDialog implements Runnable, ActionList private void done_internal() { setVisible(false); if (data != null) { - owner = owner.SetData(data); - MicroSave save = new MicroSave(owner, data); - if (save.runDialog()) - owner.SetName(data.name); + if (data.crc_valid) { + owner = owner.SetData(data); + MicroSave save = new MicroSave(owner, data); + if (save.runDialog()) + owner.SetName(data.name); + } else { + JOptionPane.showMessageDialog(owner, + "Flight data corrupted", + "Download Failed", + JOptionPane.ERROR_MESSAGE); + } } dispose(); } @@ -81,9 +88,7 @@ public class MicroDownload extends AltosUIDialog implements Runnable, ActionList } public void actionPerformed(ActionEvent ae) { - System.out.printf ("command %s\n", ae.getActionCommand()); if (serial_thread != null) { - System.out.printf ("Interrupting serial_thread\n"); serial.close(); serial_thread.interrupt(); }