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 2f4c54d7d7fc3c4d61c29c18f0e55f1638aafb95..082c23ca5149dee65e111d12b3c61308284d1249 100644
(file)
--- a/
altoslib/AltosEepromFile.java
+++ b/
altoslib/AltosEepromFile.java
@@
-72,6
+72,7
@@
public class AltosEepromFile extends AltosStateIterable {
headers = new AltosEepromIterable(AltosEepromHeader.read(input));
start = headers.state();
headers = new AltosEepromIterable(AltosEepromHeader.read(input));
start = headers.state();
+ start.set_state(AltosLib.ao_flight_pad);
switch (start.log_format) {
case AltosLib.AO_LOG_FORMAT_FULL:
switch (start.log_format) {
case AltosLib.AO_LOG_FORMAT_FULL:
@@
-81,11
+82,18
@@
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;
}
/* Find boost tick */
}
/* Find boost tick */