projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
[fw/altos]
/
altosui
/
AltosEepromDownload.java
diff --git
a/altosui/AltosEepromDownload.java
b/altosui/AltosEepromDownload.java
index 4a35c2f1c299b8bbb9121d2565fc7284a5e6208c..65cac7bd75f67084e0259f5c73be023f820f1974 100644
(file)
--- a/
altosui/AltosEepromDownload.java
+++ b/
altosui/AltosEepromDownload.java
@@
-134,7
+134,8
@@
public class AltosEepromDownload implements Runnable {
}
if (r.cmd == Altos.AO_LOG_STATE && r.a == Altos.ao_flight_landed)
done = true;
}
if (r.cmd == Altos.AO_LOG_STATE && r.a == Altos.ao_flight_landed)
done = true;
- any_valid = true;
+ if (r.cmd != AltosLib.AO_LOG_INVALID)
+ any_valid = true;
Log(r);
} catch (ParseException pe) {
if (parse_exception == null)
Log(r);
} catch (ParseException pe) {
if (parse_exception == null)
@@
-336,7
+337,7
@@
public class AltosEepromDownload implements Runnable {
state = 0; state_block = log.start_block;
for (block = log.start_block; !done && block < log.end_block; block++) {
state = 0; state_block = log.start_block;
for (block = log.start_block; !done && block < log.end_block; block++) {
- monitor.set_value(Altos
.state_to_string[state]
, state, block - state_block);
+ monitor.set_value(Altos
Lib.state_name(state)
, state, block - state_block);
AltosEepromChunk eechunk = new AltosEepromChunk(serial_line, block, block == log.start_block);
AltosEepromChunk eechunk = new AltosEepromChunk(serial_line, block, block == log.start_block);