altoslib: Do data analysis on raw values rather than AltosState

[fw/altos] / altoslib / AltosEeprom.java

diff --git a/altoslib/AltosEeprom.java b/altoslib/AltosEeprom.java
index 6ed14d3abe576773100660fc29e0e67e72fd6742..dec7dd572ec87c6e0fe8dcc4bf01ffbc1aab9a3c 100644 (file)
--- a/altoslib/AltosEeprom.java
+++ b/altoslib/AltosEeprom.java
@@ -22,7 +22,7 @@ import java.io.*;
 import java.util.*;
 import java.text.*;
 
 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[];
        public int      cmd;
        public int      tick;
        public int      data8[];


@@ -52,11 +52,11 @@ public abstract class AltosEeprom implements AltosStateUpdate {
 
        public abstract int record_length();
 
 
        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)
                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) {
        }
 
        public void write(PrintStream out) {