projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update app to use Material Design Light theme
[fw/altos]
/
altoslib
/
AltosEepromRecordSet.java
diff --git
a/altoslib/AltosEepromRecordSet.java
b/altoslib/AltosEepromRecordSet.java
index df1aad9f54dea63c4ee76c4a531d5a24725b1ac8..5e2adba34c00ae9cf4e4a9915f52d8b531d75252 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
1
;
+package org.altusmetrum.altoslib_1
3
;
import java.io.*;
import java.util.*;
import java.io.*;
import java.util.*;
@@
-21,6
+21,7
@@
public class AltosEepromRecordSet implements AltosRecordSet {
AltosEeprom eeprom;
TreeSet<AltosEepromRecord> ordered;
AltosCalData cal_data;
AltosEeprom eeprom;
TreeSet<AltosEepromRecord> ordered;
AltosCalData cal_data;
+ boolean valid;
public AltosConfigData config_data() {
return eeprom.config_data();
public AltosConfigData config_data() {
return eeprom.config_data();
@@
-44,12
+45,18
@@
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 boolean valid() {
+ return valid;
+ }
+
public AltosEepromRecordSet(AltosEeprom eeprom) {
this.eeprom = eeprom;
public AltosEepromRecordSet(AltosEeprom eeprom) {
this.eeprom = eeprom;
@@
-67,7
+74,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:
@@
-85,17
+94,24
@@
public class AltosEepromRecordSet implements AltosRecordSet {
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;
}
}
+ 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;
-
for (;;)
{
+
do
{
int t = record.tick();
if (first) {
int t = record.tick();
if (first) {
@@
-108,10
+124,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 {