projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Ensure eeprom file body always exists
[fw/altos]
/
altoslib
/
AltosEepromFile.java
diff --git
a/altoslib/AltosEepromFile.java
b/altoslib/AltosEepromFile.java
index bcc7171ee91a4c9dd77d00aae042fbaf91602ee9..082c23ca5149dee65e111d12b3c61308284d1249 100644
(file)
--- a/
altoslib/AltosEepromFile.java
+++ b/
altoslib/AltosEepromFile.java
@@
-57,6
+57,7
@@
public class AltosEepromFile extends AltosStateIterable {
AltosEepromIterable headers;
AltosEepromIterable body;
AltosEepromIterable headers;
AltosEepromIterable body;
+ AltosState start;
public void write_comments(PrintStream out) {
headers.write(out);
public void write_comments(PrintStream out) {
headers.write(out);
@@
-70,9
+71,10
@@
public class AltosEepromFile extends AltosStateIterable {
public AltosEepromFile(FileInputStream input) {
headers = new AltosEepromIterable(AltosEepromHeader.read(input));
public AltosEepromFile(FileInputStream input) {
headers = new AltosEepromIterable(AltosEepromHeader.read(input));
- AltosState state = headers.state();
+ start = headers.state();
+ start.set_state(AltosLib.ao_flight_pad);
- switch (sta
te
.log_format) {
+ switch (sta
rt
.log_format) {
case AltosLib.AO_LOG_FORMAT_FULL:
body = new AltosEepromIterable(AltosEepromTM.read(input));
break;
case AltosLib.AO_LOG_FORMAT_FULL:
body = new AltosEepromIterable(AltosEepromTM.read(input));
break;
@@
-80,32
+82,37
@@
public class AltosEepromFile extends AltosStateIterable {
case AltosLib.AO_LOG_FORMAT_TELEMETRY:
case AltosLib.AO_LOG_FORMAT_TELESCIENCE:
case AltosLib.AO_LOG_FORMAT_TELEMEGA:
case AltosLib.AO_LOG_FORMAT_TELEMETRY:
case AltosLib.AO_LOG_FORMAT_TELESCIENCE:
case AltosLib.AO_LOG_FORMAT_TELEMEGA:
+ body = new AltosEepromIterable(AltosEepromMega.read(input));
+ break;
+ case AltosLib.AO_LOG_FORMAT_TELEMETRUM:
+ body = new AltosEepromIterable(AltosEepromMetrum2.read(input));
break;
case AltosLib.AO_LOG_FORMAT_TELEMINI:
case AltosLib.AO_LOG_FORMAT_EASYMINI:
body = new AltosEepromIterable(AltosEepromMini.read(input));
break;
break;
case AltosLib.AO_LOG_FORMAT_TELEMINI:
case AltosLib.AO_LOG_FORMAT_EASYMINI:
body = new AltosEepromIterable(AltosEepromMini.read(input));
break;
+ default:
+ body = new AltosEepromIterable(new LinkedList<AltosEeprom>());
+ break;
}
}
- }
- int boost_tick (AltosState start) {
+ /* Find boost tick */
AltosState state = start.clone();
for (AltosEeprom eeprom : body) {
eeprom.update_state(state);
AltosState state = start.clone();
for (AltosEeprom eeprom : body) {
eeprom.update_state(state);
- if (state.state >= AltosLib.ao_flight_boost)
- return state.tick;
+ if (state.state >= AltosLib.ao_flight_boost) {
+ start.set_boost_tick(state.tick);
+ break;
+ }
}
}
- return 0;
}
public Iterator<AltosState> iterator() {
}
public Iterator<AltosState> iterator() {
-
- AltosState state = headers.state();
- Iterator<AltosEeprom> i = body.iterator();
+ AltosState state = start.clone();
+ Iterator<AltosEeprom> i = body.iterator();
while (i.hasNext() && !state.valid())
i.next().update_state(state);
while (i.hasNext() && !state.valid())
i.next().update_state(state);
- state.set_boost_tick(boost_tick(state));
return new AltosEepromIterator(state, i);
}
}
\ No newline at end of file
return new AltosEepromIterator(state, i);
}
}
\ No newline at end of file