summaryrefslogtreecommitdiff
path: root/altosui/AltosEepromBlock.java
diff options
context:
space:
mode:
Diffstat (limited to 'altosui/AltosEepromBlock.java')
-rw-r--r--altosui/AltosEepromBlock.java9
1 files changed, 7 insertions, 2 deletions
diff --git a/altosui/AltosEepromBlock.java b/altosui/AltosEepromBlock.java
index f223f3fb..11438df8 100644
--- a/altosui/AltosEepromBlock.java
+++ b/altosui/AltosEepromBlock.java
@@ -56,7 +56,7 @@ public class AltosEepromBlock extends ArrayList<AltosEepromRecord> {
has_lon = false;
has_time = false;
serial_line.printf("e %x\n", block);
- for (addr = 0; !done && addr < 0x100;) {
+ for (addr = 0; addr < 0x100;) {
try {
AltosEepromRecord r = new AltosEepromRecord(serial_line, block * 256 + addr);
@@ -93,10 +93,15 @@ public class AltosEepromBlock extends ArrayList<AltosEepromRecord> {
lon = (double) (r.a | (r.b << 16)) / 1e7;
has_lon = true;
}
+ if (!done)
+ add(addr / 8, r);
if (r.cmd == Altos.AO_LOG_STATE && r.a == Altos.ao_flight_landed)
done = true;
- add(addr / 8, r);
} catch (ParseException pe) {
+ AltosEepromRecord r = new AltosEepromRecord(Altos.AO_LOG_INVALID,
+ 0, 0, 0);
+ if (!done)
+ add(addr/8, r);
}
addr += 8;
}