projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Hack up AltosEepromFile to support new eeprom code
[fw/altos]
/
altoslib
/
AltosEepromFile.java
diff --git
a/altoslib/AltosEepromFile.java
b/altoslib/AltosEepromFile.java
index 5544ec37935a2a102d394ad362be01f167c03433..bb8abf87fa334cfa3be713ba271a464f7804a780 100644
(file)
--- a/
altoslib/AltosEepromFile.java
+++ b/
altoslib/AltosEepromFile.java
@@
-58,6
+58,7
@@
public class AltosEepromFile extends AltosStateIterable {
AltosEepromIterable headers;
AltosEepromIterable body;
AltosEepromIterable headers;
AltosEepromIterable body;
+ AltosEepromRecordSet set;
AltosState start;
public void write_comments(PrintStream out) {
AltosState start;
public void write_comments(PrintStream out) {
@@
-69,6
+70,11
@@
public class AltosEepromFile extends AltosStateIterable {
body.write(out);
}
body.write(out);
}
+ public AltosEepromFile(Reader input) throws IOException {
+ set = new AltosEepromRecordSet(input);
+
+ }
+
public AltosEepromFile(FileInputStream input) {
headers = new AltosEepromIterable(AltosEepromHeader.read(input));
public AltosEepromFile(FileInputStream input) {
headers = new AltosEepromIterable(AltosEepromHeader.read(input));
@@
-130,6
+136,9
@@
public class AltosEepromFile extends AltosStateIterable {
}
public Iterator<AltosState> iterator() {
}
public Iterator<AltosState> iterator() {
+ if (set != null)
+ return set.iterator();
+
AltosState state = start.clone();
Iterator<AltosEeprom> i = body.iterator();
AltosState state = start.clone();
Iterator<AltosEeprom> i = body.iterator();