projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libaltos: Ignore cjnitest files for all targets
[fw/altos]
/
altosuilib
/
AltosEepromDelete.java
diff --git
a/altosuilib/AltosEepromDelete.java
b/altosuilib/AltosEepromDelete.java
index 87e80a51a75001a90d4d137075d5b0a4a522c04e..214ae530fafc92bd3e1196676efad5c134494698 100644
(file)
--- a/
altosuilib/AltosEepromDelete.java
+++ b/
altosuilib/AltosEepromDelete.java
@@
-16,13
+16,13
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altosuilib_1
2
;
+package org.altusmetrum.altosuilib_1
4
;
import java.awt.event.*;
import javax.swing.*;
import java.io.*;
import java.util.concurrent.*;
import java.awt.event.*;
import javax.swing.*;
import java.io.*;
import java.util.concurrent.*;
-import org.altusmetrum.altoslib_1
2
.*;
+import org.altusmetrum.altoslib_1
4
.*;
public class AltosEepromDelete implements Runnable {
AltosEepromList flights;
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... */
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(20000
0
);
if (line == null)
throw new TimeoutException();
if (line.equals("Erased"))
break;
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);
}
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) {
serial_line.start_remote();
for (AltosEepromLog log : flights) {
- if (log.selected) {
+ if (log.
delete_
selected) {
DeleteLog(log);
}
}
DeleteLog(log);
}
}