altoslib: Do data analysis on raw values rather than AltosState

[fw/altos] / altoslib / AltosEepromRecordTiny.java

diff --git a/altoslib/AltosEepromRecordTiny.java b/altoslib/AltosEepromRecordTiny.java
index e70f8cdc58ee4f1da79cc7fb40ffa0c5f3089f80..705fbd9e63fcf1511ee5481d729c8b9c1085f9ff 100644 (file)
--- a/altoslib/AltosEepromRecordTiny.java
+++ b/altoslib/AltosEepromRecordTiny.java
@@ -14,7 +14,7 @@
 
 package org.altusmetrum.altoslib_11;
 
-public class AltosEepromRecordTiny extends AltosEepromRecord {
+public class AltosEepromRecordTiny extends AltosEepromRecord implements AltosDataProvider {
        public static final int record_length = 2;
 
        private int value() {
@@ -50,21 +50,21 @@ public class AltosEepromRecordTiny extends AltosEepromRecord {
                return tick;
        }
 
-       public void update_state(AltosFlightListener state) {
+       public void provide_data(AltosDataListener listener, AltosCalData cal_data) {
                int value = data16(-header_length);
 
-               state.set_tick(tick());
+               cal_data.set_tick(tick());
                switch (cmd()) {
                case AltosLib.AO_LOG_FLIGHT:
-                       state.set_state(AltosLib.ao_flight_pad);
-                       state.set_flight(value);
-                       state.set_boost_tick(0);
+                       listener.set_state(AltosLib.ao_flight_pad);
+                       cal_data.set_flight(value);
+                       cal_data.set_boost_tick();
                        break;
                case AltosLib.AO_LOG_STATE:
-                       state.set_state(value & 0x7fff);
+                       listener.set_state(value & 0x7fff);
                        break;
                case AltosLib.AO_LOG_SENSOR:
-                       state.set_pressure(AltosConvert.barometer_to_pressure(value));
+                       listener.set_pressure(AltosConvert.barometer_to_pressure(value));
                        break;
                }
        }