projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Make HAS_ACCEL_DEBUG build again
[fw/altos]
/
altoslib
/
AltosEepromRecordSet.java
diff --git
a/altoslib/AltosEepromRecordSet.java
b/altoslib/AltosEepromRecordSet.java
index c019a092bbeb0c44d3652e1768e8fbea6de50c09..e26a1e00205d2c8980f38f08b1bf00948f045169 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
3
;
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;
@@
-42,13
+42,17
@@
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();
+ 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();
@@
-65,7
+69,9
@@
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:
case AltosLib.AO_LOG_FORMAT_TELEMEGA_OLD:
+ case AltosLib.AO_LOG_FORMAT_EASYMEGA_2:
record = new AltosEepromRecordMega(eeprom);
break;
case AltosLib.AO_LOG_FORMAT_TELEMETRUM:
record = new AltosEepromRecordMega(eeprom);
break;
case AltosLib.AO_LOG_FORMAT_TELEMETRUM:
@@
-73,7
+79,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:
@@
-92,7
+99,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) {
@@
-105,13
+112,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));
}
}
}
}