projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Update stm-demo-adc to work on telelco-v2.0 boards
[fw/altos]
/
altoslib
/
AltosEepromRecordSet.java
diff --git
a/altoslib/AltosEepromRecordSet.java
b/altoslib/AltosEepromRecordSet.java
index d91ae3ac1c1aba278cd21eedc03c3de3cad802a2..360759314d4bf9e123bf2e109271f66beb6375ff 100644
(file)
--- a/
altoslib/AltosEepromRecordSet.java
+++ b/
altoslib/AltosEepromRecordSet.java
@@
-69,6
+69,7
@@
public class AltosEepromRecordSet implements AltosRecordSet {
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:
+ case AltosLib.AO_LOG_FORMAT_TELEMEGA_3:
case AltosLib.AO_LOG_FORMAT_TELEMEGA_OLD:
record = new AltosEepromRecordMega(eeprom);
break;
case AltosLib.AO_LOG_FORMAT_TELEMEGA_OLD:
record = new AltosEepromRecordMega(eeprom);
break;
@@
-97,7
+98,7
@@
public class AltosEepromRecordSet implements AltosRecordSet {
int tick = 0;
boolean first = true;
int tick = 0;
boolean first = true;
-
for (;;)
{
+
do
{
int t = record.tick();
if (first) {
int t = record.tick();
if (first) {
@@
-110,10
+111,8
@@
public class AltosEepromRecordSet implements AltosRecordSet {
}
record.wide_tick = tick;
ordered.add(record);
}
record.wide_tick = tick;
ordered.add(record);
- if (!record.hasNext())
- break;
record = record.next();
record = record.next();
- }
+ }
while (record != null);
}
public AltosEepromRecordSet(InputStream input) throws IOException {
}
public AltosEepromRecordSet(InputStream input) throws IOException {