altoslib/altosuilib/altosui: More work towards using AltosFlightSeries for analysis

[fw/altos] / altoslib / AltosEepromRecord.java

diff --git a/altoslib/AltosEepromRecord.java b/altoslib/AltosEepromRecord.java
index 1f6ade66d3e5841488ac7cc0e85ded7937b846d2..7dd3759233d888b12a989e5c8bd9cc4761fe35c8 100644 (file)
--- a/altoslib/AltosEepromRecord.java
+++ b/altoslib/AltosEepromRecord.java
@@ -81,17 +81,18 @@ public abstract class AltosEepromRecord implements Comparable<AltosEepromRecord>
                return start - o.start;
        }
 
-       public void update_state(AltosFlightListener listen) {
+       /* AltosDataProvider */
+       public void provide_data(AltosDataListener listener, AltosCalData cal_data) {
+               cal_data.set_tick(tick());
                if (cmd() == AltosLib.AO_LOG_FLIGHT)
-                       listen.set_boost_tick(tick());
-               else
-                       listen.set_tick(tick());
+                       cal_data.set_boost_tick();
+               listener.set_time(cal_data.time());
        }
 
        public int next_start() {
                int     s = start + length;
 
-               while (s + length < eeprom.data.size()) {
+               while (s + length <= eeprom.data.size()) {
                        if (valid(s))
                                return s;
                        s += length;