altosui: Support raw telemetry from TeleDongle

[fw/altos] / altosui / AltosTelemetryIterable.java

diff --git a/altosui/AltosTelemetryIterable.java b/altosui/AltosTelemetryIterable.java
index 14b5f27fc2c39e4ef142b82bdc09d604cc5fb7ca..90a08485c8301611ebd7e66d8d751f20d423d66e 100644 (file)
--- a/altosui/AltosTelemetryIterable.java
+++ b/altosui/AltosTelemetryIterable.java
@@ -28,11 +28,19 @@ public class AltosTelemetryIterable extends AltosRecordIterable {
                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;
 
+               AltosRecord     previous = null;
                records = new LinkedList<AltosRecord> ();
 
                try {
@@ -42,9 +50,10 @@ public class AltosTelemetryIterable extends AltosRecordIterable {
                                        break;
                                }
                                try {
-                                       AltosTelemetry record = new AltosTelemetry(line);
+                                       AltosRecord record = AltosTelemetry.parse(line, previous);
                                        if (record == null)
                                                break;
+                                       previous = record;
                                        if (records.isEmpty()) {
                                                current_tick = record.tick;
                                        } else {
@@ -59,6 +68,12 @@ public class AltosTelemetryIterable extends AltosRecordIterable {
                                                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());