altos: Shuffle LCO functions around, add telelco first cut

[fw/altos] / altoslib / AltosTelemetryIterable.java

diff --git a/altoslib/AltosTelemetryIterable.java b/altoslib/AltosTelemetryIterable.java
index f4b4029f176eabb8aa16ce0537cbb3a8c115ff17..e95c15e0b5026438a8f856ff3ff18b5d0cffd596 100644 (file)
--- a/altoslib/AltosTelemetryIterable.java
+++ b/altoslib/AltosTelemetryIterable.java
@@ -45,7 +45,7 @@ public class AltosTelemetryIterable extends AltosRecordIterable {
 
                try {
                        for (;;) {
-                               String line = AltosRecord.gets(input);
+                               String line = AltosLib.gets(input);
                                if (line == null) {
                                        break;
                                }
@@ -67,11 +67,11 @@ public class AltosTelemetryIterable extends AltosRecordIterable {
                                                saw_boost = true;
                                                boost_tick = record.tick;
                                        }
-                                       if (record.accel != AltosRecord.MISSING)
+                                       if (record.acceleration() != AltosRecord.MISSING)
                                                has_accel = true;
                                        if (record.gps != null)
                                                has_gps = true;
-                                       if (record.main != AltosRecord.MISSING)
+                                       if (record.main_voltage() != AltosRecord.MISSING)
                                                has_ignite = true;
                                        if (previous != null && previous.tick != record.tick)
                                                records.add(previous);