altos: Remove *_TO_DATA macros
[fw/altos] / src / test / ao_flight_test.c
index bd7f2ff8196c2759af7d9adc9790bf71e6f816ea..0913e7ba96a3a99f4498f6a0c1820d215e232a1e 100644 (file)
@@ -25,6 +25,7 @@
 #include <string.h>
 #include <getopt.h>
 #include <math.h>
+#define log ao_log_data
 
 #define GRAVITY 9.80665
 
@@ -46,7 +47,7 @@
 
 int ao_gps_new;
 
-#if !defined(TELEMEGA) && !defined(TELEMETRUM_V2)
+#if !defined(TELEMEGA) && !defined(TELEMETRUM_V2) && !defined(EASYMINI)
 #define TELEMETRUM_V1 1
 #endif
 
@@ -58,6 +59,7 @@ int ao_gps_new;
 #define HAS_HMC5883            1
 #define HAS_BEEP               1
 #define AO_CONFIG_MAX_SIZE     1024
+#define AO_MMA655X_INVERT      0
 
 struct ao_adc {
        int16_t                 sense[AO_ADC_NUM_SENSE];
@@ -71,6 +73,7 @@ struct ao_adc {
 #define AO_ADC_NUM_SENSE       2
 #define HAS_MS5607             1
 #define HAS_MMA655X            1
+#define AO_MMA655X_INVERT      0
 #define HAS_BEEP               1
 #define AO_CONFIG_MAX_SIZE     1024
 
@@ -82,6 +85,18 @@ struct ao_adc {
 };
 #endif
 
+#if EASYMINI
+#define AO_ADC_NUM_SENSE       2
+#define HAS_MS5607             1
+#define HAS_BEEP               1
+#define AO_CONFIG_MAX_SIZE     1024
+
+struct ao_adc {
+       int16_t                 sense_a;
+       int16_t                 sense_m;
+       int16_t                 v_batt;
+};
+#endif
 
 #if TELEMETRUM_V1
 /*
@@ -177,7 +192,7 @@ ao_distance_from_pad(void)
        double  dist, bearing;
        if (!ao_gps_count)
                return 0;
-       
+
        cc_great_circle(ao_gps_first.latitude / 1e7,
                        ao_gps_first.longitude / 1e7,
                        ao_gps_static.latitude / 1e7,
@@ -250,6 +265,7 @@ double      main_time;
 int    tick_offset;
 
 static ao_k_t  ao_k_height;
+static double  simple_speed;
 
 int16_t
 ao_time(void)
@@ -289,10 +305,13 @@ struct ao_task {
 #define AO_MS_TO_TICKS(ms)     ((ms) / 10)
 #define AO_SEC_TO_TICKS(s)     ((s) * 100)
 
-#define AO_FLIGHT_TEST
+#define AO_FLIGHT_TEST 1
 
 int    ao_flight_debug;
 
+struct ao_eeprom       *eeprom;
+uint32_t               eeprom_offset;
+
 FILE *emulator_in;
 char *emulator_app;
 char *emulator_name;
@@ -306,7 +325,7 @@ ao_dump_state(void);
 void
 ao_sleep(void *wchan);
 
-const char const * const ao_state_names[] = {
+const char * const ao_state_names[] = {
        "startup", "idle", "pad", "boost", "fast",
        "coast", "drogue", "main", "landed", "invalid"
 };
@@ -321,25 +340,29 @@ struct ao_cmds {
 #define ao_xmemcmp(d,s,c) memcmp(d,s,c)
 
 #define AO_NEED_ALTITUDE_TO_PRES 1
-#if TELEMEGA || TELEMETRUM_V2
+#if TELEMEGA || TELEMETRUM_V2 || EASYMINI
 #include "ao_convert_pa.c"
 #include <ao_ms5607.h>
 struct ao_ms5607_prom  ao_ms5607_prom;
 #include "ao_ms5607_convert.c"
+#if TELEMEGA
 #define AO_PYRO_NUM    4
 #include <ao_pyro.h>
+#endif
 #else
 #include "ao_convert.c"
 #endif
 
 #include <ao_config.h>
 #include <ao_fake_flight.h>
+#include <ao_eeprom_read.h>
+#include <ao_log.h>
 
 #define ao_config_get()
 
 struct ao_config ao_config;
 
-#define DATA_TO_XDATA(x) (x)
+#define x (x)
 
 
 extern int16_t ao_ground_accel, ao_flight_accel;
@@ -347,6 +370,9 @@ extern int16_t ao_accel_2g;
 
 typedef int16_t        accel_t;
 
+uint16_t       ao_serial_number;
+int16_t                ao_flight_number;
+
 extern uint16_t        ao_sample_tick;
 
 extern alt_t   ao_sample_height;
@@ -373,6 +399,8 @@ uint16_t    prev_tick;
 #define AO_PYRO_2      2
 #define AO_PYRO_3      3
 
+#define PYRO_DBG       1
+
 static void
 ao_pyro_pin_set(uint8_t pin, uint8_t value)
 {
@@ -381,12 +409,16 @@ ao_pyro_pin_set(uint8_t pin, uint8_t value)
 
 #include "ao_pyro.c"
 #endif
+#include "ao_eeprom_read.c"
+#include "ao_eeprom_read_old.c"
 
 #define to_double(f)   ((f) / 65536.0)
 
 static int     ao_records_read = 0;
 static int     ao_eof_read = 0;
+#if !EASYMINI
 static int     ao_flight_ground_accel;
+#endif
 static int     ao_flight_started = 0;
 static int     ao_test_max_height;
 static double  ao_test_max_height_time;
@@ -398,6 +430,9 @@ static double       ao_test_landed_time;
 static int     landed_set;
 static double  landed_time;
 static double  landed_height;
+#if AO_PYRO_NUM
+static uint16_t        pyros_fired;
+#endif
 
 #if HAS_MPU6000
 static struct ao_mpu6000_sample        ao_ground_mpu6000;
@@ -463,31 +498,49 @@ ao_insert(void)
        double  time;
 
        ao_data_ring[ao_data_head] = ao_data_static;
-       ao_data_head = ao_data_ring_next(ao_data_head);
        if (ao_flight_state != ao_flight_startup) {
 #if HAS_ACCEL
-               double  accel = ((ao_flight_ground_accel - ao_data_accel_cook(&ao_data_static)) * GRAVITY * 2.0) /
+               double  accel = ((ao_flight_ground_accel - ao_data_accel(&ao_data_static)) * GRAVITY * 2.0) /
                        (ao_config.accel_minus_g - ao_config.accel_plus_g);
 #else
                double  accel = 0.0;
 #endif
-#if TELEMEGA || TELEMETRUM_V2
-               double  height;
-
-               ao_ms5607_convert(&ao_data_static.ms5607_raw, &ao_data_static.ms5607_cooked);
-               height = ao_pa_to_altitude(ao_data_static.ms5607_cooked.pres) - ao_ground_height;
-#else
-               double  height = ao_pres_to_altitude(ao_data_static.adc.pres_real) - ao_ground_height;
-#endif
 
                (void) accel;
                if (!tick_offset)
                        tick_offset = -ao_data_static.tick;
                if ((prev_tick - ao_data_static.tick) > 0x400)
                        tick_offset += 65536;
+               if (prev_tick) {
+                       int ticks = ao_data_static.tick - prev_tick;
+                       if (ticks < 0)
+                               ticks += 65536;
+                       simple_speed += accel * ticks / 100.0;
+               }
                prev_tick = ao_data_static.tick;
                time = (double) (ao_data_static.tick + tick_offset) / 100;
 
+#if TELEMEGA || TELEMETRUM_V2 || EASYMINI
+               ao_ms5607_convert(&ao_data_static.ms5607_raw, &ao_data_static.ms5607_cooked);
+               double height = ao_pa_to_altitude(ao_data_static.ms5607_cooked.pres) - ao_ground_height;
+
+               /* Hack to skip baro spike at accidental drogue charge
+                * firing in 2015-09-26-serial-2093-flight-0012.eeprom
+                * so we can test the kalman filter with this data. Just
+                * keep reporting the same baro value across the pressure spike
+                */
+               {
+                       static struct ao_ms5607_sample save;
+                       if (ao_serial_number == 2093 && ao_flight_number == 12 && 32.5 < time && time < 33.7) {
+                               ao_data_ring[ao_data_head].ms5607_raw = save;
+                       } else {
+                               save = ao_data_static.ms5607_raw;
+                       }
+               }
+#else
+               double  height = ao_pres_to_altitude(ao_data_static.adc.pres_real) - ao_ground_height;
+#endif
+
                if (ao_test_max_height < height) {
                        ao_test_max_height = height;
                        ao_test_max_height_time = time;
@@ -534,7 +587,7 @@ ao_insert(void)
 
                        ao_quaternion_normalize(&ao_mag, &ao_mag);
                        ao_quaternion_rotate(&ao_mag_rot, &ao_mag, &ao_rotation);
-                       
+
                        float                           ao_dot;
                        int                             ao_mag_angle;
 
@@ -600,17 +653,27 @@ ao_insert(void)
 #endif
 
 #if 1
-                       printf("%7.2f height %8.2f accel %8.3f "
-#if TELEMEGA && 1
-                              "angle %5d "
+                       printf("%7.2f height %8.2f accel %8.3f accel_speed %8.3f "
+                              "state %d k_height %8.2f k_speed %8.3f k_accel %8.3f avg_height %5d drogue %4d main %4d error %5d"
+#if TELEMEGA
+                              " angle %5d "
                               "accel_x %8.3f accel_y %8.3f accel_z %8.3f gyro_x %8.3f gyro_y %8.3f gyro_z %8.3f mag_x %8d mag_y %8d, mag_z %8d mag_angle %4d "
 #endif
-                              "state %-8.8s k_height %8.2f k_speed %8.3f k_accel %8.3f avg_height %5d drogue %4d main %4d error %5d\n",
+                              "\n",
                               time,
                               height,
                               accel,
-#if TELEMEGA && 1
-                              ao_sample_orient,
+                              simple_speed > -100.0 ? simple_speed : -100.0,
+                              ao_flight_state * 10,
+                              ao_k_height / 65536.0,
+                              ao_k_speed / 65536.0 / 16.0,
+                              ao_k_accel / 65536.0 / 16.0,
+                              ao_avg_height,
+                              drogue_height,
+                              main_height,
+                              ao_error_h_sq_avg
+#if TELEMEGA
+                              , ao_sample_orient,
 
                               ao_mpu6000_accel(ao_data_static.mpu6000.accel_x),
                               ao_mpu6000_accel(ao_data_static.mpu6000.accel_y),
@@ -621,22 +684,16 @@ ao_insert(void)
                               ao_data_static.hmc5883.x,
                               ao_data_static.hmc5883.y,
                               ao_data_static.hmc5883.z,
-                              ao_mag_angle,
+                              ao_mag_angle
 #endif
-                              ao_state_names[ao_flight_state],
-                              ao_k_height / 65536.0,
-                              ao_k_speed / 65536.0 / 16.0,
-                              ao_k_accel / 65536.0 / 16.0,
-                              ao_avg_height,
-                              drogue_height,
-                              main_height,
-                              ao_error_h_sq_avg);
+                               );
 #endif
-                       
+
 //                     if (ao_flight_state == ao_flight_landed)
 //                             ao_test_exit();
                }
        }
+       ao_data_head = ao_data_ring_next(ao_data_head);
 }
 
 
@@ -666,23 +723,25 @@ int32(uint8_t *bytes, int off)
        return (int32_t) uint32(bytes, off);
 }
 
+uint32_t
+uint24(uint8_t *bytes, int off)
+{
+       return (uint32_t) bytes[off] | (((uint32_t) bytes[off+1]) << 8) |
+               (((uint32_t) bytes[off+2]) << 16);
+}
+
+int32_t
+int24(uint8_t *bytes, int off)
+{
+       return (int32_t) uint24(bytes, off);
+}
+
 static int log_format;
 
 void
 ao_sleep(void *wchan)
 {
        if (wchan == &ao_data_head) {
-               char            type = 0;
-               uint16_t        tick = 0;
-               uint16_t        a = 0, b = 0;
-               uint8_t         bytes[1024];
-               union ao_telemetry_all  telem;
-               char            line[1024];
-               char            *saveptr;
-               char            *l;
-               char            *words[64];
-               int             nword;
-
 #if TELEMEGA
                if (ao_flight_state >= ao_flight_boost && ao_flight_state < ao_flight_landed)
                        ao_pyro_check();
@@ -690,357 +749,195 @@ ao_sleep(void *wchan)
                for (;;) {
                        if (ao_records_read > 2 && ao_flight_state == ao_flight_startup)
                        {
+
 #if TELEMEGA
                                ao_data_static.mpu6000 = ao_ground_mpu6000;
 #endif
 #if TELEMETRUM_V1
                                ao_data_static.adc.accel = ao_flight_ground_accel;
 #endif
-                               ao_insert();
-                               return;
-                       }
 
-                       if (!fgets(line, sizeof (line), emulator_in)) {
-                               if (++ao_eof_read >= 1000) {
-                                       if (!ao_summary)
-                                               printf ("no more data, exiting simulation\n");
-                                       ao_test_exit();
-                               }
-                               ao_data_static.tick += 10;
                                ao_insert();
                                return;
                        }
-                       l = line;
-                       for (nword = 0; nword < 64; nword++) {
-                               words[nword] = strtok_r(l, " \t\n", &saveptr);
-                               l = NULL;
-                               if (words[nword] == NULL)
-                                       break;
-                       }
+
+                       if (eeprom) {
 #if TELEMEGA
-                       if ((log_format == AO_LOG_FORMAT_TELEMEGA_OLD || log_format == AO_LOG_FORMAT_TELEMEGA) && nword == 30 && strlen(words[0]) == 1) {
-                               int     i;
-                               struct ao_ms5607_value  value;
-
-                               type = words[0][0];
-                               tick = strtoul(words[1], NULL, 16);
-//                             printf ("%c %04x", type, tick);
-                               for (i = 2; i < nword; i++) {
-                                       bytes[i - 2] = strtoul(words[i], NULL, 16);
-//                                     printf(" %02x", bytes[i-2]);
-                               }
-//                             printf ("\n");
-                               switch (type) {
-                               case 'F':
-                                       ao_flight_ground_accel = int16(bytes, 2);
-                                       ao_flight_started = 1;
-                                       ao_ground_pres = int32(bytes, 4);
-                                       ao_ground_height = ao_pa_to_altitude(ao_ground_pres);
-                                       ao_ground_accel_along = int16(bytes, 8);
-                                       ao_ground_accel_across = int16(bytes, 10);
-                                       ao_ground_accel_through = int16(bytes, 12);
-                                       ao_ground_roll = int16(bytes, 14);
-                                       ao_ground_pitch = int16(bytes, 16);
-                                       ao_ground_yaw = int16(bytes, 18);
-                                       ao_ground_mpu6000.accel_x = ao_ground_accel_across;
-                                       ao_ground_mpu6000.accel_y = ao_ground_accel_along;
-                                       ao_ground_mpu6000.accel_z = ao_ground_accel_through;
-                                       ao_ground_mpu6000.gyro_x = ao_ground_pitch >> 9;
-                                       ao_ground_mpu6000.gyro_y = ao_ground_roll >> 9;
-                                       ao_ground_mpu6000.gyro_z = ao_ground_yaw >> 9;
-                                       break;
-                               case 'A':
-                                       ao_data_static.tick = tick;
-                                       ao_data_static.ms5607_raw.pres = int32(bytes, 0);
-                                       ao_data_static.ms5607_raw.temp = int32(bytes, 4);
-                                       ao_ms5607_convert(&ao_data_static.ms5607_raw, &value);
-                                       ao_data_static.mpu6000.accel_x = int16(bytes, 8);
-                                       ao_data_static.mpu6000.accel_y = int16(bytes, 10);
-                                       ao_data_static.mpu6000.accel_z = int16(bytes, 12);
-                                       ao_data_static.mpu6000.gyro_x = int16(bytes, 14);
-                                       ao_data_static.mpu6000.gyro_y = int16(bytes, 16);
-                                       ao_data_static.mpu6000.gyro_z = int16(bytes, 18);
-                                       ao_data_static.hmc5883.x = int16(bytes, 20);
-                                       ao_data_static.hmc5883.y = int16(bytes, 22);
-                                       ao_data_static.hmc5883.z = int16(bytes, 24);
-#if HAS_MMA655X
-                                       ao_data_static.mma655x = int16(bytes, 26);
-                                       if (ao_config.pad_orientation != AO_PAD_ORIENTATION_ANTENNA_UP)
-                                               ao_data_static.mma655x = ao_data_accel_invert(ao_data_static.mma655x);
+                               struct ao_log_mega      *log_mega;
+#endif
+#if TELEMETRUM_V2
+                               struct ao_log_metrum    *log_metrum;
+#endif
+#if EASYMINI
+                               struct ao_log_mini      *log_mini;
 #endif
-                                       ao_records_read++;
+#if TELEMETRUM_V1
+                               struct ao_log_record    *log_record;
+#endif
+
+                               if (eeprom_offset >= eeprom->len) {
+                                       if (++ao_eof_read >= 1000)
+                                               if (!ao_summary)
+                                                       printf ("no more data, exiting simulation\n");
+                                       ao_test_exit();
+                                       ao_data_static.tick += 10;
                                        ao_insert();
                                        return;
-                               case 'G':
-                                       ao_gps_prev = ao_gps_static;
-                                       ao_gps_static.tick = tick;
-                                       ao_gps_static.latitude = int32(bytes, 0);
-                                       ao_gps_static.longitude = int32(bytes, 4);
-                                       {
-                                               int32_t altitude = int32(bytes, 8);
-                                               AO_TELEMETRY_LOCATION_SET_ALTITUDE(&ao_gps_static, altitude);
-                                       }
-                                       ao_gps_static.flags = bytes[13];
-                                       if (!ao_gps_count)
-                                               ao_gps_first = ao_gps_static;
-                                       ao_gps_count++;
-                                       break;
                                }
-                               continue;
-                       } else if (nword == 3 && strcmp(words[0], "ms5607") == 0) {
-                               if (strcmp(words[1], "reserved:") == 0)
-                                       ao_ms5607_prom.reserved = strtoul(words[2], NULL, 10);
-                               else if (strcmp(words[1], "sens:") == 0)
-                                       ao_ms5607_prom.sens = strtoul(words[2], NULL, 10);
-                               else if (strcmp(words[1], "off:") == 0)
-                                       ao_ms5607_prom.off = strtoul(words[2], NULL, 10);
-                               else if (strcmp(words[1], "tcs:") == 0)
-                                       ao_ms5607_prom.tcs = strtoul(words[2], NULL, 10);
-                               else if (strcmp(words[1], "tco:") == 0)
-                                       ao_ms5607_prom.tco = strtoul(words[2], NULL, 10);
-                               else if (strcmp(words[1], "tref:") == 0)
-                                       ao_ms5607_prom.tref = strtoul(words[2], NULL, 10);
-                               else if (strcmp(words[1], "tempsens:") == 0)
-                                       ao_ms5607_prom.tempsens = strtoul(words[2], NULL, 10);
-                               else if (strcmp(words[1], "crc:") == 0)
-                                       ao_ms5607_prom.crc = strtoul(words[2], NULL, 10);
-                               continue;
-                       } else if (nword >= 3 && strcmp(words[0], "Pyro") == 0) {
-                               int     p = strtoul(words[1], NULL, 10);
-                               int     i, j;
-                               struct ao_pyro  *pyro = &ao_config.pyro[p];
-
-                               for (i = 2; i < nword; i++) {
-                                       for (j = 0; j < NUM_PYRO_VALUES; j++)
-                                               if (!strcmp (words[i], ao_pyro_values[j].name))
-                                                       break;
-                                       if (j == NUM_PYRO_VALUES)
-                                               continue;
-                                       pyro->flags |= ao_pyro_values[j].flag;
-                                       if (ao_pyro_values[j].offset != NO_VALUE && i + 1 < nword) {
-                                               int16_t val = strtoul(words[++i], NULL, 10);
-                                               printf("pyro %d condition %s value %d\n", p, words[i-1], val);
-                                               *((int16_t *) ((char *) pyro + ao_pyro_values[j].offset)) = val;
+                               switch (eeprom->log_format) {
+#if TELEMEGA
+                               case AO_LOG_FORMAT_TELEMEGA_OLD:
+                               case AO_LOG_FORMAT_TELEMEGA:
+                                       log_mega = (struct ao_log_mega *) &eeprom->data[eeprom_offset];
+                                       eeprom_offset += sizeof (*log_mega);
+                                       switch (log_mega->type) {
+                                       case AO_LOG_FLIGHT:
+                                               ao_flight_number = log_mega->u.flight.flight;
+                                               ao_flight_ground_accel = log_mega->u.flight.ground_accel;
+                                               ao_flight_started = 1;
+                                               ao_ground_pres = log_mega->u.flight.ground_pres;
+                                               ao_ground_height = ao_pa_to_altitude(ao_ground_pres);
+                                               ao_ground_accel_along = log_mega->u.flight.ground_accel_along;
+                                               ao_ground_accel_across = log_mega->u.flight.ground_accel_across;
+                                               ao_ground_accel_through = log_mega->u.flight.ground_accel_through;
+                                               ao_ground_roll = log_mega->u.flight.ground_roll;
+                                               ao_ground_pitch = log_mega->u.flight.ground_pitch;
+                                               ao_ground_yaw = log_mega->u.flight.ground_yaw;
+                                               ao_ground_mpu6000.accel_x = ao_ground_accel_across;
+                                               ao_ground_mpu6000.accel_y = ao_ground_accel_along;
+                                               ao_ground_mpu6000.accel_z = ao_ground_accel_through;
+                                               ao_ground_mpu6000.gyro_x = ao_ground_pitch >> 9;
+                                               ao_ground_mpu6000.gyro_y = ao_ground_roll >> 9;
+                                               ao_ground_mpu6000.gyro_z = ao_ground_yaw >> 9;
+                                               break;
+                                       case AO_LOG_STATE:
+                                               break;
+                                       case AO_LOG_SENSOR:
+                                               ao_data_static.tick = log_mega->tick;
+                                               ao_data_static.ms5607_raw.pres = log_mega->u.sensor.pres;
+                                               ao_data_static.ms5607_raw.temp = log_mega->u.sensor.temp;
+                                               ao_data_static.mpu6000.accel_x = log_mega->u.sensor.accel_x;
+                                               ao_data_static.mpu6000.accel_y = log_mega->u.sensor.accel_y;
+                                               ao_data_static.mpu6000.accel_z = log_mega->u.sensor.accel_z;
+                                               ao_data_static.mpu6000.gyro_x = log_mega->u.sensor.gyro_x;
+                                               ao_data_static.mpu6000.gyro_y = log_mega->u.sensor.gyro_y;
+                                               ao_data_static.mpu6000.gyro_z = log_mega->u.sensor.gyro_z;
+                                               ao_data_static.hmc5883.x = log_mega->u.sensor.mag_x;
+                                               ao_data_static.hmc5883.y = log_mega->u.sensor.mag_y;
+                                               ao_data_static.hmc5883.z = log_mega->u.sensor.mag_z;
+                                               ao_data_static.mma655x = log_mega->u.sensor.accel;
+                                               if (ao_config.pad_orientation != AO_PAD_ORIENTATION_ANTENNA_UP)
+                                                       ao_data_static.mma655x = ao_data_accel_invert(ao_data_static.mma655x);
+                                               ao_records_read++;
+                                               ao_insert();
+                                               return;
+                                       case AO_LOG_TEMP_VOLT:
+                                               if (pyros_fired != log_mega->u.volt.pyro) {
+                                                       printf("pyro changed %x -> %x\n", pyros_fired, log_mega->u.volt.pyro);
+                                                       pyros_fired = log_mega->u.volt.pyro;
+                                               }
+                                               break;
+                                       case AO_LOG_GPS_TIME:
+                                               ao_gps_prev = ao_gps_static;
+                                               ao_gps_static.tick = log_mega->tick;
+                                               ao_gps_static.latitude = log_mega->u.gps.latitude;
+                                               ao_gps_static.longitude = log_mega->u.gps.longitude;
+                                               {
+                                                       int16_t altitude_low = log_mega->u.gps.altitude_low;
+                                                       int16_t altitude_high = log_mega->u.gps.altitude_high;
+                                                       int32_t altitude = altitude_low | ((int32_t) altitude_high << 16);
+
+                                                       AO_TELEMETRY_LOCATION_SET_ALTITUDE(&ao_gps_static, altitude);
+                                               }
+                                               ao_gps_static.flags = log_mega->u.gps.flags;
+                                               if (!ao_gps_count)
+                                                       ao_gps_first = ao_gps_static;
+                                               ao_gps_count++;
+                                               break;
+                                       case AO_LOG_GPS_SAT:
+                                               break;
                                        }
-                               }
-                       }
+                                       break;
 #endif
 #if TELEMETRUM_V2
-                       if (log_format == AO_LOG_FORMAT_TELEMETRUM && nword == 14 && strlen(words[0]) == 1) {
-                               int     i;
-                               struct ao_ms5607_value  value;
-
-                               type = words[0][0];
-                               tick = strtoul(words[1], NULL, 16);
-//                             printf ("%c %04x", type, tick);
-                               for (i = 2; i < nword; i++) {
-                                       bytes[i - 2] = strtoul(words[i], NULL, 16);
-//                                     printf(" %02x", bytes[i-2]);
-                               }
-//                             printf ("\n");
-                               switch (type) {
-                               case 'F':
-                                       ao_flight_ground_accel = int16(bytes, 2);
-                                       ao_flight_started = 1;
-                                       ao_ground_pres = int32(bytes, 4);
-                                       ao_ground_height = ao_pa_to_altitude(ao_ground_pres);
+                               case AO_LOG_FORMAT_TELEMETRUM:
+                                       log_metrum = (struct ao_log_metrum *) &eeprom->data[eeprom_offset];
+                                       eeprom_offset += sizeof (*log_metrum);
+                                       switch (log_metrum->type) {
+                                       case AO_LOG_FLIGHT:
+                                               ao_flight_started = 1;
+                                               ao_flight_number = log_metrum->u.flight.flight;
+                                               ao_flight_ground_accel = log_metrum->u.flight.ground_accel;
+                                               ao_ground_pres = log_metrum->u.flight.ground_pres;
+                                               ao_ground_height = ao_pa_to_altitude(ao_ground_pres);
+                                               break;
+                                       case AO_LOG_SENSOR:
+                                               ao_data_static.tick = log_metrum->tick;
+                                               ao_data_static.ms5607_raw.pres = log_metrum->u.sensor.pres;
+                                               ao_data_static.ms5607_raw.temp = log_metrum->u.sensor.temp;
+                                               ao_data_static.mma655x = log_metrum->u.sensor.accel;
+                                               ao_records_read++;
+                                               ao_insert();
+                                               return;
+                                       }
                                        break;
-                               case 'A':
-                                       ao_data_static.tick = tick;
-                                       ao_data_static.ms5607_raw.pres = int32(bytes, 0);
-                                       ao_data_static.ms5607_raw.temp = int32(bytes, 4);
-                                       ao_ms5607_convert(&ao_data_static.ms5607_raw, &value);
-                                       ao_data_static.mma655x = int16(bytes, 8);
-                                       ao_records_read++;
-                                       ao_insert();
-                                       return;
-                               }
-                               continue;
-                       } else if (nword == 3 && strcmp(words[0], "ms5607") == 0) {
-                               if (strcmp(words[1], "reserved:") == 0)
-                                       ao_ms5607_prom.reserved = strtoul(words[2], NULL, 10);
-                               else if (strcmp(words[1], "sens:") == 0)
-                                       ao_ms5607_prom.sens = strtoul(words[2], NULL, 10);
-                               else if (strcmp(words[1], "off:") == 0)
-                                       ao_ms5607_prom.off = strtoul(words[2], NULL, 10);
-                               else if (strcmp(words[1], "tcs:") == 0)
-                                       ao_ms5607_prom.tcs = strtoul(words[2], NULL, 10);
-                               else if (strcmp(words[1], "tco:") == 0)
-                                       ao_ms5607_prom.tco = strtoul(words[2], NULL, 10);
-                               else if (strcmp(words[1], "tref:") == 0)
-                                       ao_ms5607_prom.tref = strtoul(words[2], NULL, 10);
-                               else if (strcmp(words[1], "tempsens:") == 0)
-                                       ao_ms5607_prom.tempsens = strtoul(words[2], NULL, 10);
-                               else if (strcmp(words[1], "crc:") == 0)
-                                       ao_ms5607_prom.crc = strtoul(words[2], NULL, 10);
-                               continue;
-                       }
-#endif
-#if TELEMETRUM_V1
-                       if (nword == 4 && log_format != AO_LOG_FORMAT_TELEMEGA) {
-                               type = words[0][0];
-                               tick = strtoul(words[1], NULL, 16);
-                               a = strtoul(words[2], NULL, 16);
-                               b = strtoul(words[3], NULL, 16);
-                               if (type == 'P')
-                                       type = 'A';
-                       }
 #endif
-                       else if (nword == 2 && strcmp(words[0], "log-format") == 0) {
-                               log_format = strtoul(words[1], NULL, 10);
-                       } else if (nword >= 6 && strcmp(words[0], "Accel") == 0) {
-                               ao_config.accel_plus_g = atoi(words[3]);
-                               ao_config.accel_minus_g = atoi(words[5]);
-#ifdef TELEMEGA
-                       } else if (nword >= 8 && strcmp(words[0], "IMU") == 0) {
-                               ao_config.accel_zero_along = atoi(words[3]);
-                               ao_config.accel_zero_across = atoi(words[5]);
-                               ao_config.accel_zero_through = atoi(words[7]);
+#if EASYMINI
+                               case AO_LOG_FORMAT_EASYMINI1:
+                               case AO_LOG_FORMAT_EASYMINI2:
+                               case AO_LOG_FORMAT_TELEMINI3:
+                                       log_mini = (struct ao_log_mini *) &eeprom->data[eeprom_offset];
+                                       eeprom_offset += sizeof (*log_mini);
+                                       switch (log_mini->type) {
+                                       case AO_LOG_FLIGHT:
+                                               ao_flight_started = 1;
+                                               ao_flight_number = log_mini->u.flight.flight;
+                                               ao_ground_pres = log_mini->u.flight.ground_pres;
+                                               ao_ground_height = ao_pa_to_altitude(ao_ground_pres);
+                                               break;
+                                       case AO_LOG_SENSOR:
+                                               ao_data_static.tick = log_mini->tick;
+                                               ao_data_static.ms5607_raw.pres = int24(log_mini->u.sensor.pres, 0);
+                                               ao_data_static.ms5607_raw.temp = int24(log_mini->u.sensor.temp, 0);
+                                               ao_records_read++;
+                                               ao_insert();
+                                               return;
+                                       }
+                                       break;
 #endif
-                       } else if (nword >= 4 && strcmp(words[0], "Main") == 0) {
-                               ao_config.main_deploy = atoi(words[2]);
-                       } else if (nword >= 3 && strcmp(words[0], "Apogee") == 0 &&
-                                  strcmp(words[1], "lockout:") == 0) {
-                               ao_config.apogee_lockout = atoi(words[2]);
-                       } else if (nword >= 3 && strcmp(words[0], "Pad") == 0 &&
-                                  strcmp(words[1], "orientation:") == 0) {
-                               ao_config.pad_orientation = atoi(words[2]);
-                       } else if (nword >= 36 && strcmp(words[0], "CALL") == 0) {
-                               tick = atoi(words[10]);
-                               if (!ao_flight_started) {
-                                       type = 'F';
-                                       a = atoi(words[26]);
-                                       ao_flight_started = 1;
-                               } else {
-                                       type = 'A';
-                                       a = atoi(words[12]);
-                                       b = atoi(words[14]);
-                               }
-                       } else if (nword == 3 && strcmp(words[0], "BARO") == 0) {
-                               tick = strtol(words[1], NULL, 16);
-                               a = 16384 - 328;
-                               b = strtol(words[2], NULL, 10);
-                               type = 'A';
-                               if (!ao_flight_started) {
-                                       ao_flight_ground_accel = 16384 - 328;
-                                       ao_config.accel_plus_g = 16384 - 328;
-                                       ao_config.accel_minus_g = 16384 + 328;
-                                       ao_flight_started = 1;
-                               }
-                       } else if (nword == 2 && strcmp(words[0], "TELEM") == 0) {
-                               __xdata char    *hex = words[1];
-                               char    elt[3];
-                               int     i, len;
-                               uint8_t sum;
-
-                               len = strlen(hex);
-                               if (len > sizeof (bytes) * 2) {
-                                       len = sizeof (bytes)*2;
-                                       hex[len] = '\0';
-                               }
-                               for (i = 0; i < len; i += 2) {
-                                       elt[0] = hex[i];
-                                       elt[1] = hex[i+1];
-                                       elt[2] = '\0';
-                                       bytes[i/2] = (uint8_t) strtol(elt, NULL, 16);
-                               }
-                               len = i/2;
-                               if (bytes[0] != len - 2) {
-                                       printf ("bad length %d != %d\n", bytes[0], len - 2);
-                                       continue;
-                               }
-                               sum = 0x5a;
-                               for (i = 1; i < len-1; i++)
-                                       sum += bytes[i];
-                               if (sum != bytes[len-1]) {
-                                       printf ("bad checksum\n");
-                                       continue;
-                               }
-                               if ((bytes[len-2] & 0x80) == 0) {
-                                       continue;
-                               }
-                               if (len == 36) {
-                                       ao_xmemcpy(&telem, bytes + 1, 32);
-                                       tick = telem.generic.tick;
-                                       switch (telem.generic.type) {
-                                       case AO_TELEMETRY_SENSOR_TELEMETRUM:
-                                       case AO_TELEMETRY_SENSOR_TELEMINI:
-                                       case AO_TELEMETRY_SENSOR_TELENANO:
-                                               if (!ao_flight_started) {
-                                                       ao_flight_ground_accel = telem.sensor.ground_accel;
-                                                       ao_config.accel_plus_g = telem.sensor.accel_plus_g;
-                                                       ao_config.accel_minus_g = telem.sensor.accel_minus_g;
-                                                       ao_flight_started = 1;
-                                               }
-                                               type = 'A';
-                                               a = telem.sensor.accel;
-                                               b = telem.sensor.pres;
+#if TELEMETRUM_V1
+                               case AO_LOG_FORMAT_FULL:
+                               case AO_LOG_FORMAT_TINY:
+                                       log_record = (struct ao_log_record *) &eeprom->data[eeprom_offset];
+                                       eeprom_offset += sizeof (*log_record);
+                                       switch (log_record->type) {
+                                       case AO_LOG_FLIGHT:
+                                               ao_flight_started = 1;
+                                               ao_flight_ground_accel = log_record->u.flight.ground_accel;
+                                               ao_flight_number = log_record->u.flight.flight;
+                                               break;
+                                       case AO_LOG_SENSOR:
+                                       case 'P':       /* ancient telemini */
+                                               ao_data_static.tick = log_record->tick;
+                                               ao_data_static.adc.accel = log_record->u.sensor.accel;
+                                               ao_data_static.adc.pres_real = log_record->u.sensor.pres;
+                                               ao_data_static.adc.pres = log_record->u.sensor.pres;
+                                               ao_records_read++;
+                                               ao_insert();
+                                               return;
+                                       case AO_LOG_TEMP_VOLT:
+                                               ao_data_static.tick = log_record->tick;;
+                                               ao_data_static.adc.temp = log_record->u.temp_volt.temp;
+                                               ao_data_static.adc.v_batt = log_record->u.temp_volt.v_batt;
                                                break;
                                        }
-                               } else if (len == 99) {
-                                       ao_flight_started = 1;
-                                       tick = uint16(bytes+1, 21);
-                                       ao_flight_ground_accel = int16(bytes+1, 7);
-                                       ao_config.accel_plus_g = int16(bytes+1, 17);
-                                       ao_config.accel_minus_g = int16(bytes+1, 19);
-                                       type = 'A';
-                                       a = int16(bytes+1, 23);
-                                       b = int16(bytes+1, 25);
-                               } else if (len == 98) {
-                                       ao_flight_started = 1;
-                                       tick = uint16(bytes+1, 20);
-                                       ao_flight_ground_accel = int16(bytes+1, 6);
-                                       ao_config.accel_plus_g = int16(bytes+1, 16);
-                                       ao_config.accel_minus_g = int16(bytes+1, 18);
-                                       type = 'A';
-                                       a = int16(bytes+1, 22);
-                                       b = int16(bytes+1, 24);
-                               } else {
-                                       printf("unknown len %d\n", len);
-                                       continue;
-                               }
-                       }
-                       if (type != 'F' && !ao_flight_started)
-                               continue;
-
-#if TELEMEGA || TELEMETRUM_V2
-                       (void) a;
-                       (void) b;
-#else
-                       switch (type) {
-                       case 'F':
-                               ao_flight_ground_accel = a;
-                               if (ao_config.accel_plus_g == 0) {
-                                       ao_config.accel_plus_g = a;
-                                       ao_config.accel_minus_g = a + 530;
+                                       break;
+#endif
+                               default:
+                                       printf ("invalid log format %d\n", log_format);
+                                       ao_test_exit();
                                }
-                               if (ao_config.main_deploy == 0)
-                                       ao_config.main_deploy = 250;
-                               ao_flight_started = 1;
-                               break;
-                       case 'S':
-                               break;
-                       case 'A':
-                               ao_data_static.tick = tick;
-                               ao_data_static.adc.accel = a;
-                               ao_data_static.adc.pres_real = b;
-                               ao_data_static.adc.pres = b;
-                               ao_records_read++;
-                               ao_insert();
-                               return;
-                       case 'T':
-                               ao_data_static.tick = tick;
-                               ao_data_static.adc.temp = a;
-                               ao_data_static.adc.v_batt = b;
-                               break;
-                       case 'D':
-                       case 'G':
-                       case 'N':
-                       case 'W':
-                       case 'H':
-                               break;
                        }
-#endif
                }
 
        }
@@ -1066,6 +963,26 @@ void run_flight_fixed(char *name, FILE *f, int summary, char *info)
        emulator_info = info;
        ao_summary = summary;
 
+       if (strstr(name, ".eeprom") != NULL) {
+               char    c;
+
+               c = getc(f);
+               ungetc(c, f);
+               if (c == '{')
+                       eeprom = ao_eeprom_read(f);
+               else
+                       eeprom = ao_eeprom_read_old(f);
+
+               if (eeprom) {
+#if HAS_MS5607
+                       ao_ms5607_prom = eeprom->ms5607_prom;
+#endif
+                       ao_config = eeprom->config;
+                       ao_serial_number = eeprom->serial_number;
+                       log_format = eeprom->log_format;
+               }
+       }
+
        ao_flight_init();
        ao_flight();
 }
@@ -1083,7 +1000,7 @@ main (int argc, char **argv)
 #else
        emulator_app="baro";
 #endif
-       while ((c = getopt_long(argc, argv, "sdi:", options, NULL)) != -1) {
+       while ((c = getopt_long(argc, argv, "sdpi:", options, NULL)) != -1) {
                switch (c) {
                case 's':
                        summary = 1;
@@ -1091,6 +1008,11 @@ main (int argc, char **argv)
                case 'd':
                        ao_flight_debug = 1;
                        break;
+               case 'p':
+#if PYRO_DBG
+                       pyro_dbg = 1;
+#endif
+                       break;
                case 'i':
                        info = optarg;
                        break;