projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/scheme: Add vectors
[fw/altos]
/
altoslib
/
AltosEepromRecordSet.java
diff --git
a/altoslib/AltosEepromRecordSet.java
b/altoslib/AltosEepromRecordSet.java
index 1f10e677ee29540d9731c55749d73778eaf26d8d..360759314d4bf9e123bf2e109271f66beb6375ff 100644
(file)
--- a/
altoslib/AltosEepromRecordSet.java
+++ b/
altoslib/AltosEepromRecordSet.java
@@
-12,13
+12,13
@@
* General Public License for more details.
*/
* General Public License for more details.
*/
-package org.altusmetrum.altoslib_1
1
;
+package org.altusmetrum.altoslib_1
2
;
import java.io.*;
import java.util.*;
public class AltosEepromRecordSet implements AltosRecordSet {
import java.io.*;
import java.util.*;
public class AltosEepromRecordSet implements AltosRecordSet {
- AltosEeprom
New
eeprom;
+ AltosEeprom
eeprom;
TreeSet<AltosEepromRecord> ordered;
AltosCalData cal_data;
TreeSet<AltosEepromRecord> ordered;
AltosCalData cal_data;
@@
-44,13
+44,15
@@
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);
}
listener.finish();
}
for (AltosEepromRecord record : ordered) {
record.provide_data(listener, cal_data);
}
listener.finish();
}
- public AltosEepromRecordSet(AltosEeprom
New
eeprom) {
+ public AltosEepromRecordSet(AltosEeprom eeprom) {
this.eeprom = eeprom;
AltosConfigData config_data = eeprom.config_data();
this.eeprom = eeprom;
AltosConfigData config_data = eeprom.config_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,13
+111,11
@@
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 {
- this(new AltosEeprom
New
(input));
+ this(new AltosEeprom(input));
}
}
}
}