projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/ao_stdio: use uint8_t for stdio index
[fw/altos]
/
altoslib
/
AltosEepromRecordSet.java
diff --git
a/altoslib/AltosEepromRecordSet.java
b/altoslib/AltosEepromRecordSet.java
index 911b90b9f9f471f5c26167eeb8ad93a7cc347629..3b19ee682ff9b633884c45fdf33584f5447affa6 100644
(file)
--- a/
altoslib/AltosEepromRecordSet.java
+++ b/
altoslib/AltosEepromRecordSet.java
@@
-12,47
+12,60
@@
* General Public License for more details.
*/
* General Public License for more details.
*/
-package org.altusmetrum.altoslib_1
1
;
+package org.altusmetrum.altoslib_1
4
;
import java.io.*;
import java.util.*;
import java.io.*;
import java.util.*;
-public class AltosEepromRecordSet implements
Iterable<AltosState>
{
- AltosEeprom
New
eeprom;
+public class AltosEepromRecordSet implements
AltosRecordSet
{
+ AltosEeprom
eeprom;
TreeSet<AltosEepromRecord> ordered;
TreeSet<AltosEepromRecord> ordered;
- AltosState start_state;
+ AltosCalData cal_data;
+ boolean valid;
- class RecordIterator implements Iterator<AltosState> {
- Iterator<AltosEepromRecord> riterator;
- AltosState state;
- boolean started;
+ public AltosConfigData config_data() {
+ return eeprom.config_data();
+ }
- public boolean hasNext() {
- return state == null || riterator.hasNext();
+ private void init_cal_data() {
+ for (AltosEepromRecord record : ordered) {
+ if (record.cmd() == AltosLib.AO_LOG_FLIGHT) {
+ cal_data.set_tick(record.tick());
+ cal_data.set_boost_tick();
+ cal_data.set_state(AltosLib.ao_flight_pad);
+ break;
+ }
}
}
+ }
- public AltosState next() {
- if (state == null)
- state = start_state.clone();
- else {
- state = state.clone();
- AltosEepromRecord r = riterator.next();
- r.update_state(state);
- }
- return state;
+ public AltosCalData cal_data() {
+ if (cal_data == null) {
+ cal_data = new AltosCalData(config_data());
+ init_cal_data();
}
}
+ return cal_data;
+ }
+
+ public void capture_series(AltosDataListener listener) {
+ if (cal_data == null) {
+ cal_data();
+ } else {
+ cal_data.reset();
+ init_cal_data();
+ }
+ listener.set_log_format(config_data().log_format);
- public RecordIterator() {
- riterator = ordered.iterator();
- state = null;
+ for (AltosEepromRecord record : ordered) {
+ record.provide_data(listener, cal_data);
}
}
+ listener.finish();
}
}
- public
Iterator<AltosState> iterator
() {
- return
new RecordIterator()
;
+ public
boolean valid
() {
+ return
valid
;
}
}
- 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();
@@
-69,7
+82,11
@@
public class AltosEepromRecordSet implements Iterable<AltosState> {
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:
+ case AltosLib.AO_LOG_FORMAT_TELEMEGA_4:
+ case AltosLib.AO_LOG_FORMAT_TELEMEGA_5:
record = new AltosEepromRecordMega(eeprom);
break;
case AltosLib.AO_LOG_FORMAT_TELEMETRUM:
record = new AltosEepromRecordMega(eeprom);
break;
case AltosLib.AO_LOG_FORMAT_TELEMETRUM:
@@
-77,7
+94,8
@@
public class AltosEepromRecordSet implements Iterable<AltosState> {
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:
@@
-86,20
+104,27
@@
public class AltosEepromRecordSet implements Iterable<AltosState> {
case AltosLib.AO_LOG_FORMAT_TELEFIRETWO:
record = new AltosEepromRecordFireTwo(eeprom);
break;
case AltosLib.AO_LOG_FORMAT_TELEFIRETWO:
record = new AltosEepromRecordFireTwo(eeprom);
break;
+ case AltosLib.AO_LOG_FORMAT_MICROPEAK2:
+ record = new AltosEepromRecordMicroPeak2(eeprom);
+ break;
+ case AltosLib.AO_LOG_FORMAT_EASYMOTOR:
+ record = new AltosEepromRecordMotor(eeprom);
+ break;
}
}
+ ordered = new TreeSet<AltosEepromRecord>();
+
if (record == null) {
System.out.printf("failed to parse log format %d\n", config_data.log_format);
if (record == null) {
System.out.printf("failed to parse log format %d\n", config_data.log_format);
+ valid = false;
return;
}
return;
}
- ordered = new TreeSet<AltosEepromRecord>();
+ valid = true;
+
int tick = 0;
boolean first = true;
int tick = 0;
boolean first = true;
- start_state = new AltosState();
- start_state.set_config_data(record.eeprom.config_data());
-
- for (;;) {
+ do {
int t = record.tick();
if (first) {
int t = record.tick();
if (first) {
@@
-112,13
+137,11
@@
public class AltosEepromRecordSet implements Iterable<AltosState> {
}
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(
Reader
input) throws IOException {
- this(new AltosEeprom
New
(input));
+ public AltosEepromRecordSet(
InputStream
input) throws IOException {
+ this(new AltosEeprom(input));
}
}
}
}