projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Add timeout to RN4678 status message code
[fw/altos]
/
altoslib
/
AltosEepromRecordSet.java
diff --git
a/altoslib/AltosEepromRecordSet.java
b/altoslib/AltosEepromRecordSet.java
index 69159cdf905a02ab7945e1394b33bf1082c0ffee..1f10e677ee29540d9731c55749d73778eaf26d8d 100644
(file)
--- a/
altoslib/AltosEepromRecordSet.java
+++ b/
altoslib/AltosEepromRecordSet.java
@@
-33,6
+33,7
@@
public class AltosEepromRecordSet implements AltosRecordSet {
if (record.cmd() == AltosLib.AO_LOG_FLIGHT) {
cal_data.set_tick(record.tick());
cal_data.set_boost_tick();
if (record.cmd() == AltosLib.AO_LOG_FLIGHT) {
cal_data.set_tick(record.tick());
cal_data.set_boost_tick();
+ break;
}
}
}
}
}
}
@@
-41,9
+42,12
@@
public class AltosEepromRecordSet implements AltosRecordSet {
public void capture_series(AltosDataListener listener) {
AltosCalData cal_data = cal_data();
public void capture_series(AltosDataListener listener) {
AltosCalData cal_data = cal_data();
+
+ cal_data.reset();
for (AltosEepromRecord record : ordered) {
record.provide_data(listener, cal_data);
}
for (AltosEepromRecord record : ordered) {
record.provide_data(listener, cal_data);
}
+ listener.finish();
}
public AltosEepromRecordSet(AltosEepromNew eeprom) {
}
public AltosEepromRecordSet(AltosEepromNew eeprom) {
@@
-71,7
+75,8
@@
public class AltosEepromRecordSet implements AltosRecordSet {
break;
case AltosLib.AO_LOG_FORMAT_TELEMINI2:
case AltosLib.AO_LOG_FORMAT_TELEMINI3:
break;
case AltosLib.AO_LOG_FORMAT_TELEMINI2:
case AltosLib.AO_LOG_FORMAT_TELEMINI3:
- case AltosLib.AO_LOG_FORMAT_EASYMINI:
+ case AltosLib.AO_LOG_FORMAT_EASYMINI1:
+ case AltosLib.AO_LOG_FORMAT_EASYMINI2:
record = new AltosEepromRecordMini(eeprom);
break;
case AltosLib.AO_LOG_FORMAT_TELEGPS:
record = new AltosEepromRecordMini(eeprom);
break;
case AltosLib.AO_LOG_FORMAT_TELEGPS:
@@
-109,7
+114,7
@@
public class AltosEepromRecordSet implements AltosRecordSet {
}
}
}
}
- public AltosEepromRecordSet(
Reader
input) throws IOException {
+ public AltosEepromRecordSet(
InputStream
input) throws IOException {
this(new AltosEepromNew(input));
}
}
this(new AltosEepromNew(input));
}
}