projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Elide missing values from graphs
[fw/altos]
/
altosui
/
AltosTelemetryIterable.java
diff --git
a/altosui/AltosTelemetryIterable.java
b/altosui/AltosTelemetryIterable.java
index a71ab8726d0dce64bf1b746e0e13e61e444c84b3..90a08485c8301611ebd7e66d8d751f20d423d66e 100644
(file)
--- a/
altosui/AltosTelemetryIterable.java
+++ b/
altosui/AltosTelemetryIterable.java
@@
-28,11
+28,19
@@
public class AltosTelemetryIterable extends AltosRecordIterable {
return records.iterator();
}
return records.iterator();
}
+ boolean has_gps = false;
+ boolean has_accel = false;
+ boolean has_ignite = false;
+ public boolean has_gps() { return has_gps; }
+ public boolean has_accel() { return has_accel; }
+ public boolean has_ignite() { return has_ignite; };
+
public AltosTelemetryIterable (FileInputStream input) {
boolean saw_boost = false;
int current_tick = 0;
int boost_tick = 0;
public AltosTelemetryIterable (FileInputStream input) {
boolean saw_boost = false;
int current_tick = 0;
int boost_tick = 0;
+ AltosRecord previous = null;
records = new LinkedList<AltosRecord> ();
try {
records = new LinkedList<AltosRecord> ();
try {
@@
-42,9
+50,10
@@
public class AltosTelemetryIterable extends AltosRecordIterable {
break;
}
try {
break;
}
try {
- Altos
Telemetry record = new AltosTelemetry(line
);
+ Altos
Record record = AltosTelemetry.parse(line, previous
);
if (record == null)
break;
if (record == null)
break;
+ previous = record;
if (records.isEmpty()) {
current_tick = record.tick;
} else {
if (records.isEmpty()) {
current_tick = record.tick;
} else {
@@
-59,11
+68,16
@@
public class AltosTelemetryIterable extends AltosRecordIterable {
saw_boost = true;
boost_tick = record.tick;
}
saw_boost = true;
boost_tick = record.tick;
}
+ if (record.accel != AltosRecord.MISSING)
+ has_accel = true;
+ if (record.gps != null)
+ has_gps = true;
+ if (record.main != AltosRecord.MISSING)
+ has_ignite = true;
records.add(record);
} catch (ParseException pe) {
System.out.printf("parse exception %s\n", pe.getMessage());
} catch (AltosCRCException ce) {
records.add(record);
} catch (ParseException pe) {
System.out.printf("parse exception %s\n", pe.getMessage());
} catch (AltosCRCException ce) {
- System.out.printf("crc error\n");
}
}
} catch (IOException io) {
}
}
} catch (IOException io) {