projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Add new 'stateless' flight state for TeleGPS
[fw/altos]
/
altoslib
/
AltosEepromFile.java
diff --git
a/altoslib/AltosEepromFile.java
b/altoslib/AltosEepromFile.java
index 1664dc95ec5eac1df082b7a57b86e612c1a7839c..b7e446ce6a1627fbdd8b6d4637176bfe1f4351a6 100644
(file)
--- a/
altoslib/AltosEepromFile.java
+++ b/
altoslib/AltosEepromFile.java
@@
-72,7
+72,8
@@
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);
+ if (start.state != AltosLib.ao_flight_stateless)
+ start.set_state(AltosLib.ao_flight_pad);
if (start.log_format == AltosLib.MISSING) {
if (start.product != null) {
if (start.log_format == AltosLib.MISSING) {
if (start.product != null) {
@@
-102,6
+103,9
@@
public class AltosEepromFile extends AltosStateIterable {
case AltosLib.AO_LOG_FORMAT_EASYMINI:
body = new AltosEepromIterable(AltosEepromMini.read(input));
break;
case AltosLib.AO_LOG_FORMAT_EASYMINI:
body = new AltosEepromIterable(AltosEepromMini.read(input));
break;
+ case AltosLib.AO_LOG_FORMAT_TELEGPS:
+ body = new AltosEepromIterable(AltosEepromGPS.read(input));
+ break;
default:
body = new AltosEepromIterable(new LinkedList<AltosEeprom>());
break;
default:
body = new AltosEepromIterable(new LinkedList<AltosEeprom>());
break;