X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosuilib%2FAltosEepromDelete.java;h=214ae530fafc92bd3e1196676efad5c134494698;hb=ff3a2de3223f5cf3fd87f40cd9961e2c2890a867;hp=87e80a51a75001a90d4d137075d5b0a4a522c04e;hpb=c8dbcaf69cd538a31ab6e2b568237ae7c8656a9a;p=fw%2Faltos diff --git a/altosuilib/AltosEepromDelete.java b/altosuilib/AltosEepromDelete.java index 87e80a51..214ae530 100644 --- a/altosuilib/AltosEepromDelete.java +++ b/altosuilib/AltosEepromDelete.java @@ -16,13 +16,13 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -package org.altusmetrum.altosuilib_12; +package org.altusmetrum.altosuilib_14; import java.awt.event.*; import javax.swing.*; import java.io.*; import java.util.concurrent.*; -import org.altusmetrum.altoslib_12.*; +import org.altusmetrum.altoslib_14.*; public class AltosEepromDelete implements Runnable { AltosEepromList flights; @@ -45,11 +45,13 @@ public class AltosEepromDelete implements Runnable { serial_line.printf("d %d\n", log.flight); for (;;) { /* It can take a while to erase the flash... */ - String line = serial_line.get_reply(20000); + String line = serial_line.get_reply(200000); if (line == null) throw new TimeoutException(); if (line.equals("Erased")) break; + if (line.equals("Failed to erase")) + throw new IOException(line); if (line.startsWith("No such")) throw new IOException(line); } @@ -84,7 +86,7 @@ public class AltosEepromDelete implements Runnable { serial_line.start_remote(); for (AltosEepromLog log : flights) { - if (log.selected) { + if (log.delete_selected) { DeleteLog(log); } }