altoslib/altosuilib/altosui: More work towards using AltosFlightSeries for analysis

[fw/altos] / altoslib / AltosEepromRecordFull.java

diff --git a/altoslib/AltosEepromRecordFull.java b/altoslib/AltosEepromRecordFull.java
index d240da283e131ffbe2db8c21715f0b88c507aec8..b49682209642794a9e2ca658db40806032ab1d35 100644 (file)
--- a/altoslib/AltosEepromRecordFull.java
+++ b/altoslib/AltosEepromRecordFull.java
@@ -19,12 +19,15 @@ public class AltosEepromRecordFull extends AltosEepromRecord {
 
        public static final int max_sat = 12;
 
-       public void update_state(AltosState state) {
-               super.update_state(state);
+       public static final int two_g_default = 16294 - 15758;
+
+       public void provide_data(AltosDataListener listener, AltosCalData cal_data) {
+
+               super.provide_data(listener, cal_data);
                AltosGPS        gps;
 
                /* Flush any pending GPS changes */
-               if (state.gps_pending) {
+               if (cal_data.gps_pending()) {
                        switch (cmd()) {
                        case AltosLib.AO_LOG_GPS_LAT:
                        case AltosLib.AO_LOG_GPS_LON:
@@ -33,37 +36,40 @@ public class AltosEepromRecordFull extends AltosEepromRecord {
                        case AltosLib.AO_LOG_GPS_DATE:
                                break;
                        default:
-                               state.set_temp_gps();
+                               listener.set_gps(cal_data.temp_gps());
+                               cal_data.reset_temp_gps();
                                break;
                        }
                }
 
                switch (cmd()) {
                case AltosLib.AO_LOG_FLIGHT:
-                       state.set_state(AltosLib.ao_flight_pad);
-                       state.set_ground_accel(data16(0));
-                       state.set_flight(data16(2));
+                       listener.set_state(AltosLib.ao_flight_pad);
+                       cal_data.set_ground_accel(data16(0));
+                       cal_data.set_flight(data16(2));
+                       if (cal_data.accel_plus_g == AltosLib.MISSING)
+                               cal_data.set_accel_plus_minus(data16(0), data16(0) + two_g_default);
                        break;
                case AltosLib.AO_LOG_SENSOR:
-                       state.set_accel(data16(0));
-                       state.set_pressure(AltosConvert.barometer_to_pressure(data16(2)));
+                       listener.set_acceleration(cal_data.acceleration(data16(0)));
+                       listener.set_pressure(AltosConvert.barometer_to_pressure(data16(2)));
                        break;
                case AltosLib.AO_LOG_PRESSURE:
-                       state.set_pressure(AltosConvert.barometer_to_pressure(data16(2)));
+                       listener.set_pressure(AltosConvert.barometer_to_pressure(data16(2)));
                        break;
                case AltosLib.AO_LOG_TEMP_VOLT:
-                       state.set_temperature(AltosConvert.thermometer_to_temperature(data16(0)));
-                       state.set_battery_voltage(AltosConvert.cc_battery_to_voltage(data16(2)));
+                       listener.set_temperature(AltosConvert.thermometer_to_temperature(data16(0)));
+                       listener.set_battery_voltage(AltosConvert.cc_battery_to_voltage(data16(2)));
                        break;
                case AltosLib.AO_LOG_DEPLOY:
-                       state.set_apogee_voltage(AltosConvert.cc_ignitor_to_voltage(data16(0)));
-                       state.set_main_voltage(AltosConvert.cc_ignitor_to_voltage(data16(2)));
+                       listener.set_apogee_voltage(AltosConvert.cc_igniter_to_voltage(data16(0)));
+                       listener.set_main_voltage(AltosConvert.cc_igniter_to_voltage(data16(2)));
                        break;
                case AltosLib.AO_LOG_STATE:
-                       state.set_state(data16(0));
+                       listener.set_state(data16(0));
                        break;
                case AltosLib.AO_LOG_GPS_TIME:
-                       gps = state.make_temp_gps(false);
+                       gps = cal_data.make_temp_gps(tick(),false);
 
                        gps.hour = data8(0);
                        gps.minute = data8(1);
@@ -77,29 +83,29 @@ public class AltosEepromRecordFull extends AltosEepromRecord {
                                AltosLib.AO_GPS_NUM_SAT_SHIFT;
                        break;
                case AltosLib.AO_LOG_GPS_LAT:
-                       gps = state.make_temp_gps(false);
+                       gps = cal_data.make_temp_gps(tick(),false);
 
                        int lat32 = data32(0);
                        gps.lat = (double) lat32 / 1e7;
                        break;
                case AltosLib.AO_LOG_GPS_LON:
-                       gps = state.make_temp_gps(false);
+                       gps = cal_data.make_temp_gps(tick(),false);
 
                        int lon32 = data32(0);
                        gps.lon = (double) lon32 / 1e7;
                        break;
                case AltosLib.AO_LOG_GPS_ALT:
-                       gps = state.make_temp_gps(false);
+                       gps = cal_data.make_temp_gps(tick(),false);
                        gps.alt = data16(0);
                        break;
                case AltosLib.AO_LOG_GPS_SAT:
-                       gps = state.make_temp_gps(true);
+                       gps = cal_data.make_temp_gps(tick(),true);
                        int svid = data16(0);
                        int c_n0 = data16(3);
                        gps.add_sat(svid, c_n0);
                        break;
                case AltosLib.AO_LOG_GPS_DATE:
-                       gps = state.make_temp_gps(false);
+                       gps = cal_data.make_temp_gps(tick(),false);
                        gps.year = data8(0) + 2000;
                        gps.month = data8(1);
                        gps.day = data8(2);
@@ -108,9 +114,10 @@ public class AltosEepromRecordFull extends AltosEepromRecord {
        }
 
        public AltosEepromRecord next() {
-               if (start + length + length < eeprom.data.size())
-                       return new AltosEepromRecordFull(eeprom, start + length);
-               return null;
+               int     s = next_start();
+               if (s < 0)
+                       return null;
+               return new AltosEepromRecordFull(eeprom, s);
        }
 
        public AltosEepromRecordFull(AltosEepromNew eeprom, int start) {