altos: Remove *_TO_DATA macros

[fw/altos] / altoslib / AltosEepromRecordTiny.java

diff --git a/altoslib/AltosEepromRecordTiny.java b/altoslib/AltosEepromRecordTiny.java
index 628e18c31dd8c106d88fe8eac9169bc615afbfe8..428a9fc59a8709fd8b1a06fa5a506d8a58bd59de 100644 (file)
--- a/altoslib/AltosEepromRecordTiny.java
+++ b/altoslib/AltosEepromRecordTiny.java
@@ -12,7 +12,7 @@
  * General Public License for more details.
  */
 
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_13;
 
 public class AltosEepromRecordTiny extends AltosEepromRecord implements AltosDataProvider {
        public static final int record_length = 2;
@@ -50,16 +50,15 @@ public class AltosEepromRecordTiny extends AltosEepromRecord implements AltosDat
                return tick;
        }
 
-       public void provide_data(AltosDataListener listener, AltosCalData cal_data) {
+       public void provide_data(AltosDataListener listener) {
                int value = data16(-header_length);
 
-               cal_data.set_tick(tick());
-               listener.set_time(cal_data.time());
+               listener.set_tick(tick());
                switch (cmd()) {
                case AltosLib.AO_LOG_FLIGHT:
                        listener.set_state(AltosLib.ao_flight_pad);
-                       cal_data.set_flight(value);
-                       cal_data.set_boost_tick();
+                       listener.cal_data().set_flight(value);
+                       listener.cal_data().set_boost_tick();
                        break;
                case AltosLib.AO_LOG_STATE:
                        listener.set_state(value & 0x7fff);