altos/test: Add dependencies in the Makefile for ao_flight_test

[fw/altos] / src / ao_config.c

diff --git a/src/ao_config.c b/src/ao_config.c
index e97b7eb121192a41d1876fa530e9188d828e75e5..cd56b47314a62d091bc7e311411a8e3ac11c5848 100644 (file)
--- a/src/ao_config.c
+++ b/src/ao_config.c
@@ -70,6 +70,7 @@ _ao_config_get(void)
                       sizeof(AO_CONFIG_DEFAULT_CALLSIGN) - 1);
                ao_config.apogee_delay = AO_CONFIG_DEFAULT_APOGEE_DELAY;
                ao_config.radio_cal = ao_radio_cal;
+               ao_config.flight_log_max = AO_CONFIG_DEFAULT_FLIGHT_LOG_MAX;
                ao_config_dirty = 1;
        }
        if (ao_config.minor < AO_CONFIG_MINOR) {
@@ -209,10 +210,10 @@ ao_config_accel_calibrate_auto(char *orientation) __reentrant
        puts("Calibrating..."); flush();
        i = ACCEL_CALIBRATE_SAMPLES;
        accel_total = 0;
-       cal_adc_ring = ao_adc_head;
+       cal_adc_ring = ao_flight_adc;
        while (i) {
-               ao_sleep(&ao_adc_ring);
-               while (i && cal_adc_ring != ao_adc_head) {
+               ao_sleep(DATA_TO_XDATA(&ao_flight_adc));
+               while (i && cal_adc_ring != ao_flight_adc) {
                        accel_total += (int32_t) ao_adc_ring[cal_adc_ring].accel;
                        cal_adc_ring = ao_adc_ring_next(cal_adc_ring);
                        i--;