altoslib: Create data file open helper in AltosLib

[fw/altos] / altoslib / AltosEepromRecordFireTwo.java

diff --git a/altoslib/AltosEepromRecordFireTwo.java b/altoslib/AltosEepromRecordFireTwo.java
index 809247c798e5ed2699e1c8b27e58c875809abd4a..713d0bb71fc182ba45ef9cf11b0cb32d8bfb17ce 100644 (file)
--- a/altoslib/AltosEepromRecordFireTwo.java
+++ b/altoslib/AltosEepromRecordFireTwo.java
@@ -57,7 +57,7 @@ public class AltosEepromRecordFireTwo extends AltosEepromRecord {
                if (v < 0.5) v = 0.5;
                if (v > 4.5) v = 4.5;
 
-               double  psi = (v - 0.5) / 4.0 * 1600.0;
+               double  psi = (v - 0.5) / 4.0 * 2500.0;
                return AltosConvert.psi_to_pa(psi);
        }
 
@@ -68,21 +68,19 @@ public class AltosEepromRecordFireTwo extends AltosEepromRecord {
                return AltosConvert.lb_to_n(v * 298 * 9.807);
        }
 
-       public void update_state(AltosState state) {
-               super.update_state(state);
+       public void provide_data(AltosDataListener listener, AltosCalData cal_data) {
+               super.provide_data(listener, cal_data);
 
                switch (cmd()) {
                case AltosLib.AO_LOG_FLIGHT:
-                       state.set_flight(flight());
-                       state.set_ground_pressure(0.0);
-                       state.set_accel_g(0, -1);
+                       cal_data.set_flight(flight());
                        break;
                case AltosLib.AO_LOG_STATE:
-                       state.set_state(state());
+                       listener.set_state(state());
                        break;
                case AltosLib.AO_LOG_SENSOR:
-                       state.set_pressure(adc_to_pa(pres()));
-                       state.set_accel(adc_to_n(thrust()));
+                       listener.set_pressure(adc_to_pa(pres()));
+                       listener.set_thrust(adc_to_n(thrust()));
                        break;
                }
        }