Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / altoslib / AltosEepromIterable.java

diff --git a/altoslib/AltosEepromIterable.java b/altoslib/AltosEepromIterable.java
index f1397c7bf5430136e92c6f241cdfa9c2ff6ae739..2ac10e85eb0d47cfa2c29066d174ce6f84b62d34 100644 (file)
--- a/altoslib/AltosEepromIterable.java
+++ b/altoslib/AltosEepromIterable.java
@@ -20,50 +20,6 @@ package org.altusmetrum.AltosLib;
 import java.io.*;
 import java.util.*;
 import java.text.*;
-import java.util.prefs.*;
-import java.util.concurrent.LinkedBlockingQueue;
-
-/*
- * AltosRecords with an index field so they can be sorted by tick while preserving
- * the original ordering for elements with matching ticks
- */
-class AltosOrderedRecord extends AltosEepromRecord implements Comparable<AltosOrderedRecord> {
-
-       public int      index;
-
-       public AltosOrderedRecord(String line, int in_index, int prev_tick, boolean prev_tick_valid)
-               throws ParseException {
-               super(line);
-               if (prev_tick_valid) {
-                       tick |= (prev_tick & ~0xffff);
-                       if (tick < prev_tick) {
-                               if (prev_tick - tick > 0x8000)
-                                       tick += 0x10000;
-                       } else {
-                               if (tick - prev_tick > 0x8000)
-                                       tick -= 0x10000;
-                       }
-               }
-               index = in_index;
-       }
-
-       public AltosOrderedRecord(int in_cmd, int in_tick, int in_a, int in_b, int in_index) {
-               super(in_cmd, in_tick, in_a, in_b);
-               index = in_index;
-       }
-
-       public String toString() {
-               return String.format("%d.%d %04x %04x %04x",
-                                    cmd, index, tick, a, b);
-       }
-
-       public int compareTo(AltosOrderedRecord o) {
-               int     tick_diff = tick - o.tick;
-               if (tick_diff != 0)
-                       return tick_diff;
-               return index - o.index;
-       }
-}
 
 public class AltosEepromIterable extends AltosRecordIterable {
 
@@ -104,7 +60,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,13 +193,14 @@ public class AltosEepromIterable extends AltosRecordIterable {
                LinkedList<AltosRecord>         list = new LinkedList<AltosRecord>();
                Iterator<AltosOrderedRecord>    iterator = records.iterator();
                AltosOrderedRecord              record = null;
-               AltosRecord                     state = new AltosRecord();
-               boolean                         last_reported = false;
+               AltosRecordTM                   state = new AltosRecordTM();
+               //boolean                               last_reported = false;
                EepromState                     eeprom = new EepromState();
 
                state.state = AltosLib.ao_flight_pad;
                state.accel_plus_g = 15758;
                state.accel_minus_g = 16294;
+               state.flight_vel = 0;
 
                /* Pull in static data from the flight and gps_date records */
                if (flight_record != null)
@@ -254,13 +211,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 +275,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,12 +356,10 @@ 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);
-                               if (record == null)
-                                       break;
                                if (record.cmd == AltosLib.AO_LOG_INVALID)
                                        continue;
                                prev_tick = record.tick;