altos: Shuffle LCO functions around, add telelco first cut

[fw/altos] / altoslib / AltosEepromIterable.java

diff --git a/altoslib/AltosEepromIterable.java b/altoslib/AltosEepromIterable.java
index f1397c7bf5430136e92c6f241cdfa9c2ff6ae739..f8acdc1685b45db38b71ef2fccfc1261d46c3761 100644 (file)
--- a/altoslib/AltosEepromIterable.java
+++ b/altoslib/AltosEepromIterable.java
@@ -104,7 +104,7 @@ public class AltosEepromIterable extends AltosRecordIterable {
                }
        }
 
-       void update_state(AltosRecord state, AltosEepromRecord record, EepromState eeprom) {
+       void update_state(AltosRecordTM state, AltosEepromRecord record, EepromState eeprom) {
                state.tick = record.tick;
                switch (record.cmd) {
                case AltosLib.AO_LOG_FLIGHT:
@@ -237,7 +237,7 @@ public class AltosEepromIterable extends AltosRecordIterable {
                LinkedList<AltosRecord>         list = new LinkedList<AltosRecord>();
                Iterator<AltosOrderedRecord>    iterator = records.iterator();
                AltosOrderedRecord              record = null;
-               AltosRecord                     state = new AltosRecord();
+               AltosRecordTM                   state = new AltosRecordTM();
                boolean                         last_reported = false;
                EepromState                     eeprom = new EepromState();
 
@@ -254,13 +254,13 @@ public class AltosEepromIterable extends AltosRecordIterable {
                while (iterator.hasNext()) {
                        record = iterator.next();
                        if ((eeprom.seen & seen_basic) == seen_basic && record.tick != state.tick) {
-                               AltosRecord r = new AltosRecord(state);
+                               AltosRecordTM r = state.clone();
                                r.time = (r.tick - eeprom.boost_tick) / 100.0;
                                list.add(r);
                        }
                        update_state(state, record, eeprom);
                }
-               AltosRecord r = new AltosRecord(state);
+               AltosRecordTM r = state.clone();
                r.time = (r.tick - eeprom.boost_tick) / 100.0;
                list.add(r);
        return list;
@@ -318,28 +318,28 @@ public class AltosEepromIterable extends AltosRecordIterable {
                        case AltosLib.AO_LOG_SOFTWARE_VERSION:
                                out.printf ("# Software version: %s\n", record.data);
                                break;
-                       case Altos.AO_LOG_BARO_RESERVED:
+                       case AltosLib.AO_LOG_BARO_RESERVED:
                                out.printf ("# Baro reserved: %d\n", record.a);
                                break;
-                       case Altos.AO_LOG_BARO_SENS:
+                       case AltosLib.AO_LOG_BARO_SENS:
                                out.printf ("# Baro sens: %d\n", record.a);
                                break;
-                       case Altos.AO_LOG_BARO_OFF:
+                       case AltosLib.AO_LOG_BARO_OFF:
                                out.printf ("# Baro off: %d\n", record.a);
                                break;
-                       case Altos.AO_LOG_BARO_TCS:
+                       case AltosLib.AO_LOG_BARO_TCS:
                                out.printf ("# Baro tcs: %d\n", record.a);
                                break;
-                       case Altos.AO_LOG_BARO_TCO:
+                       case AltosLib.AO_LOG_BARO_TCO:
                                out.printf ("# Baro tco: %d\n", record.a);
                                break;
-                       case Altos.AO_LOG_BARO_TREF:
+                       case AltosLib.AO_LOG_BARO_TREF:
                                out.printf ("# Baro tref: %d\n", record.a);
                                break;
-                       case Altos.AO_LOG_BARO_TEMPSENS:
+                       case AltosLib.AO_LOG_BARO_TEMPSENS:
                                out.printf ("# Baro tempsens: %d\n", record.a);
                                break;
-                       case Altos.AO_LOG_BARO_CRC:
+                       case AltosLib.AO_LOG_BARO_CRC:
                                out.printf ("# Baro crc: %d\n", record.a);
                                break;
                        }
@@ -399,7 +399,7 @@ public class AltosEepromIterable extends AltosRecordIterable {
 
                try {
                        for (;;) {
-                               String line = AltosRecord.gets(input);
+                               String line = AltosLib.gets(input);
                                if (line == null)
                                        break;
                                AltosOrderedRecord record = new AltosOrderedRecord(line, index++, prev_tick, prev_tick_valid);