projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Disable ao_btm debug. Avoids breaking 's' command
[fw/altos]
/
altosuilib
/
AltosFlashUI.java
diff --git
a/altosuilib/AltosFlashUI.java
b/altosuilib/AltosFlashUI.java
index 37ab96614af52f73d4ab116aa9c39f9d457f480e..7186e91b33024f14fc7c1e21d3c0dda5f99a6cfe 100644
(file)
--- a/
altosuilib/AltosFlashUI.java
+++ b/
altosuilib/AltosFlashUI.java
@@
-481,12
+481,24
@@
public class AltosFlashUI
public void run () {
try {
AltosLink link = null;
public void run () {
try {
AltosLink link = null;
+ boolean new_device = false;
for (;;) {
System.out.printf("Attempting to open %s\n", device.toShortString());
for (;;) {
System.out.printf("Attempting to open %s\n", device.toShortString());
- link = new AltosSerial(device);
+ for (int i = 0; i < 20; i++) {
+ link = new AltosSerial(device);
+ if (link != null)
+ break;
+
+ if (!new_device)
+ break;
+
+ System.out.printf("Waiting for device to become ready\n");
+
+ Thread.sleep(1000);
+ }
if (link == null)
throw new IOException(String.format("%s: open failed",
device.toShortString()));
if (link == null)
throw new IOException(String.format("%s: open failed",
device.toShortString()));
@@
-536,6
+548,7
@@
public class AltosFlashUI
if (!matched) {
System.out.printf("Identified new device %s\n", d.toShortString());
device = (AltosUSBDevice) d;
if (!matched) {
System.out.printf("Identified new device %s\n", d.toShortString());
device = (AltosUSBDevice) d;
+ new_device = true;
break;
}
}
break;
}
}