altos/telebt-4.0: Add dependency on RN4678 header

[fw/altos] / altoslib / AltosEeprom.java

diff --git a/altoslib/AltosEeprom.java b/altoslib/AltosEeprom.java
index 020590ebfc0a9f667d82c67fbbfe906ea0a954d5..dec7dd572ec87c6e0fe8dcc4bf01ffbc1aab9a3c 100644 (file)
--- a/altoslib/AltosEeprom.java
+++ b/altoslib/AltosEeprom.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,13 +16,13 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_4;
+package org.altusmetrum.altoslib_11;
 
 import java.io.*;
 import java.util.*;
 import java.text.*;
 
-public abstract class AltosEeprom implements AltosStateUpdate {
+public abstract class AltosEeprom implements AltosDataProvider {
        public int      cmd;
        public int      tick;
        public int      data8[];
@@ -51,11 +52,11 @@ public abstract class AltosEeprom implements AltosStateUpdate {
 
        public abstract int record_length();
 
-       public void update_state(AltosState state) {
+       public void provide_data(AltosDataListener listener, AltosCalData cal_data) {
+               cal_data.set_tick(tick);
                if (cmd == AltosLib.AO_LOG_FLIGHT)
-                       state.set_boost_tick(tick);
-               else
-                       state.set_tick(tick);
+                       cal_data.set_boost_tick();
+               listener.set_time(cal_data.time());
        }
 
        public void write(PrintStream out) {