projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
map-server: Add maps proxy server
[fw/altos]
/
altoslib
/
AltosEepromRecordSet.java
diff --git
a/altoslib/AltosEepromRecordSet.java
b/altoslib/AltosEepromRecordSet.java
index 48e90c055e0269be6136385ac50935e411d4505e..27f81df6d31f86bfdf094d0cc97898ff861810e6 100644
(file)
--- a/
altoslib/AltosEepromRecordSet.java
+++ b/
altoslib/AltosEepromRecordSet.java
@@
-12,7
+12,7
@@
* General Public License for more details.
*/
* General Public License for more details.
*/
-package org.altusmetrum.altoslib_1
2
;
+package org.altusmetrum.altoslib_1
3
;
import java.io.*;
import java.util.*;
import java.io.*;
import java.util.*;
@@
-44,6
+44,8
@@
public class AltosEepromRecordSet implements AltosRecordSet {
AltosCalData cal_data = cal_data();
cal_data.reset();
AltosCalData cal_data = cal_data();
cal_data.reset();
+ listener.set_log_format(config_data().log_format);
+
for (AltosEepromRecord record : ordered) {
record.provide_data(listener, cal_data);
}
for (AltosEepromRecord record : ordered) {
record.provide_data(listener, cal_data);
}
@@
-67,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;
@@
-95,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) {
@@
-108,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 {